Merge branch 'master' of https://gitlab.com/poe.regalis/barotrauma

2016-11-15 22:26:46 -03:00
parent d2c17274fe 184c6858cd
commit 5922fc972d
9 changed files with 59 additions and 35 deletions
--- a/Subsurface/Source/Networking/RespawnManager.cs
+++ b/Subsurface/Source/Networking/RespawnManager.cs
@@ -416,6 +416,7 @@ namespace Barotrauma.Networking
                bool myCharacter = i >= clients.Count;

                var character = Character.Create(characterInfos[i], shuttleSpawnPoints[i].WorldPosition, !myCharacter, false);
+                character.TeamID = 1;

                if (myCharacter)
                {