tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

StatusEffects ignore components that are not there anymore, when removing effects

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-10-16 00:52:35 +02:00
parent a4c5d96b5e
commit 6f63e5a888
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Shared/StatusEffect/StatusEffectsSystem.cs
View File

@@ -216,7 +216,13 @@ namespace Content.Shared.StatusEffect
if (state.RelevantComponent != null) if (state.RelevantComponent != null)
{ {
var type = _componentFactory.GetRegistration(state.RelevantComponent).Type; var type = _componentFactory.GetRegistration(state.RelevantComponent).Type;
EntityManager.RemoveComponent(uid, type);
// Make sure the component is actually there first.
// Maybe a badmin badminned the component away,
// or perhaps, on the client, the component deletion sync
// was faster than prediction could predict. Either way, let's not assume the component exists.
if(EntityManager.HasComponent(uid, type))
EntityManager.RemoveComponent(uid, type);
} }
if (proto.Alert != null && alerts != null) if (proto.Alert != null && alerts != null)