space-wizards/RobustToolbox
1
0
Fork 0
mirror of https://github.com/space-wizards/RobustToolbox.git synced 2026-02-15 03:30:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Extra-graceful entity deletions. (#3405)

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2022-10-29 18:10:19 +02:00
committed by GitHub
parent 601feb7cc0
commit 467d391ec8
4 changed files with 98 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Robust.Shared/GameObjects/EntityManager.Components.cs
View File

@@ -459,7 +459,14 @@ namespace Robust.Shared.GameObjects
{
foreach (var comp in InSafeOrder(_entCompIndex[uid]))
{
RemoveComponentImmediate(comp, uid, true);
try
{
RemoveComponentImmediate(comp, uid, true);
}
catch (Exception e)
{
Logger.Error($"Caught exception while trying to remove component from entity '{ToPrettyString(uid)}'");
}
}
// DisposeComponents means the entity is getting deleted.
@@ -507,7 +514,8 @@ namespace Robust.Shared.GameObjects
private void RemoveComponentImmediate(Component component, EntityUid uid, bool terminating)
{
if (component == null) throw new ArgumentNullException(nameof(component));
if (component == null)
throw new ArgumentNullException(nameof(component));
if (component.Owner != uid)
throw new InvalidOperationException("Component is not owned by entity.");