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

Some more logging to help diagnose #278, a potential workaround to remove items/characters that Entity.RemoveAll failed to remove for some reason.

Browse Source
This commit is contained in:
Joonas Rikkonen
2018-04-20 16:50:10 +03:00
parent 395ca3c5c2
commit 177f31d538
3 changed files with 47 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Barotrauma/BarotraumaShared/Source/Characters/Animation/Ragdoll.cs
View File

@@ -24,7 +24,7 @@ namespace Barotrauma
{
if (limbs == null)
{
DebugConsole.ThrowError("Attempted to access a potentially removed ragdoll. Character: " + character.Name + ", id: " + character.ID + ", removed: " + character.Removed);
DebugConsole.ThrowError("Attempted to access a potentially removed ragdoll. Character: " + character.Name + ", id: " + character.ID + ", removed: " + character.Removed + ", ragdoll removed: " + !list.Contains(this));
return new Limb[0];
}
return limbs;

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

@@ -133,6 +133,51 @@ namespace Barotrauma
DebugConsole.ThrowError(" - " + e.ToString() + "(ID " + e.id + ")");
}
}
if (Item.ItemList.Count > 0)
{
DebugConsole.ThrowError("Some items were not removed in Entity.RemoveAll:");
foreach (Item item in Item.ItemList)
{
DebugConsole.ThrowError(" - " + item.Name + "(ID " + item.id + ")");
}
var items = new List<Item>(Item.ItemList);
foreach (Item item in items)
{
try
{
item.Remove();
}
catch (Exception exception)
{
DebugConsole.ThrowError("Error while removing entity \"" + item.ToString() + "\"", exception);
}
}
Item.ItemList.Clear();
}
if (Character.CharacterList.Count > 0)
{
DebugConsole.ThrowError("Some characters were not removed in Entity.RemoveAll:");
foreach (Character character in Character.CharacterList)
{
DebugConsole.ThrowError(" - " + character.Name + "(ID " + character.id + ")");
}
var characters = new List<Character>(Character.CharacterList);
foreach (Character character in characters)
{
try
{
character.Remove();
}
catch (Exception exception)
{
DebugConsole.ThrowError("Error while removing entity \"" + character.ToString() + "\"", exception);
}
}
Character.CharacterList.Clear();
}
dictionary.Clear();
}

2
Barotrauma/BarotraumaShared/Source/Map/Submarine.cs
View File

@@ -1249,7 +1249,7 @@ namespace Barotrauma
List<Item> items = new List<Item>(Item.ItemList);
foreach (Item item in items)
{
DebugConsole.ThrowError("Error while unloading submarines - item \""+item.Name+"\" not removed");
DebugConsole.ThrowError("Error while unloading submarines - item \"" + item.Name + "\" (ID:" + item.ID + ") not removed");
try
{
item.Remove();