Build 0.18.7.0

2022-06-08 21:52:38 +09:00
parent 5a10b444ee
commit 4f5a3bf8b9
56 changed files with 401 additions and 245 deletions
@@ -230,7 +230,7 @@ namespace Barotrauma
                    if (!matchingCharacterData.HasSpawned) { continue; }
                    characterInfo ??= matchingCharacterData.CharacterInfo;
                }
-                if (characterInfo == null) { continue; }
+                if (characterInfo == null || characterInfo.Discarded) { continue; }
                //reduce skills if the character has died
                if (characterInfo.CauseOfDeath != null && characterInfo.CauseOfDeath.Type != CauseOfDeathType.Disconnected)
                {
@@ -420,6 +420,8 @@ namespace Barotrauma
                    {
                        discardedCharacters.Add(data);
                    }
+                    DebugConsole.Log($"Client \"{client}\" discarded the character ({data.Name})");
+                    data.CharacterInfo.Discarded = true;
                    characterData.Remove(data);
                    IncrementLastUpdateIdForFlag(NetFlags.CharacterInfo);
                }