f8b0295...0671290

2019-03-18 22:59:45 +02:00
parent 23687fbf2f
commit 63eb4d64e5
103 changed files with 1378 additions and 4692 deletions
@@ -363,7 +363,7 @@ namespace Barotrauma
                character.ID = id;
                character.TeamID = (TeamType)teamID;

-                if (configPath == HumanConfigFile)
+                if (configPath == HumanConfigFile && character.TeamID != TeamType.FriendlyNPC)
                {
                    CharacterInfo duplicateCharacterInfo = GameMain.GameSession.CrewManager.GetCharacterInfos().FirstOrDefault(c => c.ID == info.ID);
                    GameMain.GameSession.CrewManager.RemoveCharacterInfo(duplicateCharacterInfo);