Merge branch 'master' into new-netcode

2017-01-25 20:30:26 +02:00
parent e27fa1c7ee 282c2b75d4
commit 15b3dd31a8
17 changed files with 966 additions and 136 deletions
@@ -470,6 +470,9 @@ namespace Barotrauma
                    edge.site2 = null;
                }
            }
+            
+            //initialize MapEntities that aren't in any sub (e.g. items inside ruins)
+            MapEntity.MapLoaded(null);

            //initialize MapEntities that aren't in any sub (e.g. items inside ruins)
            MapEntity.MapLoaded(null);