vlad.os/LuaCsForBarotraumaEP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed some entities occasionally not being removed at the end of a round. CargoMission removed the cargo items at the end of a round without checking if the items have already been removed, which could cause another entity to be removed from the entity dictionary if it's taken the ID of the cargo item. This prevented the new entity from being removed in Entity.RemoveAll, causing errors during the next round. Closes #278

Browse Source
This commit is contained in:
Joonas Rikkonen
2018-04-23 13:55:08 +03:00
parent e61dc5ae5f
commit ceaba2f5ca
6 changed files with 35 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Barotrauma/BarotraumaShared/Source/Characters/Character.cs
View File

@@ -2025,7 +2025,9 @@ namespace Barotrauma
if (Removed)
{
DebugConsole.ThrowError("Attempting to remove an already removed character\n" + Environment.StackTrace);
return;
}
DebugConsole.Log("Removing character " + Name + " (ID: " + ID + ")");
base.Remove();

7
Barotrauma/BarotraumaShared/Source/Events/Missions/CargoMission.cs
View File

@@ -96,7 +96,7 @@ namespace Barotrauma
{
if (Submarine.MainSub != null && Submarine.MainSub.AtEndPosition)
{
int deliveredItemCount = items.Count(i => i.CurrentHull != null && i.Condition > 0.0f);
int deliveredItemCount = items.Count(i => i.CurrentHull != null && !i.Removed && i.Condition > 0.0f);
if (deliveredItemCount >= requiredDeliveryAmount)
{
@@ -106,7 +106,10 @@ namespace Barotrauma
}
}
items.ForEach(i => i.Remove());
foreach (Item item in items)
{
if (!item.Removed) item.Remove();
}
}
}
}

2
Barotrauma/BarotraumaShared/Source/Items/Components/ItemContainer.cs
View File

@@ -219,7 +219,7 @@ namespace Barotrauma.Items.Components
foreach (Item item in Inventory.Items)
{
if (item == null) continue;
item.Remove();
item.Drop();
}
}

7
Barotrauma/BarotraumaShared/Source/Items/Item.cs
View File

@@ -1860,6 +1860,13 @@ namespace Barotrauma
public override void Remove()
{
if (Removed)
{
DebugConsole.ThrowError("Attempting to remove an already removed item\n" + Environment.StackTrace);
return;
}
DebugConsole.Log("Removing item " + Name + " (ID: " + ID + ")");
base.Remove();
foreach (Character character in Character.CharacterList)

20
Barotrauma/BarotraumaShared/Source/Map/Entity.cs
View File

@@ -42,10 +42,13 @@ namespace Barotrauma
Entity existingEntity;
if (dictionary.TryGetValue(value, out existingEntity))
{
System.Diagnostics.Debug.WriteLine(existingEntity+" had the same ID as "+this);
System.Diagnostics.Debug.WriteLine(existingEntity + " had the same ID as " + this + " (" + value + ")");
DebugConsole.Log(existingEntity + " had the same ID as " + this + " (" + value + ")");
dictionary.Remove(value);
dictionary.Add(id, existingEntity);
existingEntity.id = id;
DebugConsole.Log("The id of " + existingEntity + " is now " + id);
DebugConsole.Log("The id of " + this + " is now " + value);
}
id = value;
@@ -183,6 +186,21 @@ namespace Barotrauma
public virtual void Remove()
{
DebugConsole.Log("Removing entity " + this.ToString() + " (" + ID + ") from entity dictionary.");
Entity existingEntity;
if (!dictionary.TryGetValue(ID, out existingEntity))
{
DebugConsole.Log("Entity " + this.ToString() + " (" + ID + ") not present in entity dictionary.");
}
else if (existingEntity != this)
{
DebugConsole.Log("Entity ID mismatch in entity dictionary. Entity " + existingEntity + " had the ID " + ID);
foreach (var keyValuePair in dictionary.Where(kvp => kvp.Value == this).ToList())
{
dictionary.Remove(keyValuePair.Key);
}
}
dictionary.Remove(ID);
Removed = true;
}

2
Barotrauma/BarotraumaShared/Source/Networking/EntitySpawner.cs
View File

@@ -196,7 +196,7 @@ namespace Barotrauma
else if (entities.Entity is Character)
{
message.Write((byte)SpawnableType.Character);
DebugConsole.NewMessage("WRITING CHARACTER DATA: " + (entities.Entity).ToString(),Color.Cyan);
DebugConsole.NewMessage("WRITING CHARACTER DATA: " + (entities.Entity).ToString() + " (ID: " + entities.Entity.ID + ")", Color.Cyan);
((Character)entities.Entity).WriteSpawnData(message);
}
}