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

Fix comparing by name and not ID for entity prototype updates (#1578)

Browse Source
This commit is contained in:
DrSmugleaf
2021-02-20 02:41:51 +01:00
committed by GitHub
parent 68b0d7bf2e
commit e2a4dcdff1
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Robust.Shared/Prototypes/EntityPrototype.cs
View File

@@ -441,9 +441,9 @@ namespace Robust.Shared.Prototypes
return component == (Component) currentComponent;
}
if (Name != entity.Prototype?.Name)
if (ID != entity.Prototype?.ID)
{
Logger.Error($"Reloaded prototype used to update entity did not match entity's existing prototype: Expected '{entity.Prototype?.Name}', got '{Name}'");
Logger.Error($"Reloaded prototype used to update entity did not match entity's existing prototype: Expected '{ID}', got '{entity.Prototype?.ID}'");
return;
}
@@ -469,11 +469,12 @@ namespace Robust.Shared.Prototypes
factory) && Components.Keys.Contains(name))
{
ignoredComponents.Add(name);
Logger.Debug(name);
continue;
}
componentManager.RemoveComponent(entity.Uid, type);
}
componentManager.CullRemovedComponents();
// Add new components