Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Action bugfixes (#21321)

Browse Source
This commit is contained in:
Leon Friedrich
2023-10-29 19:10:30 +11:00
committed by GitHub
parent f2bc0ff128
commit 6e49331e4d
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Shared/Actions/ActionContainerSystem.cs
View File

@@ -213,6 +213,9 @@ public sealed class ActionContainerSystem : EntitySystem
private void OnShutdown(EntityUid uid, ActionsContainerComponent component, ComponentShutdown args) private void OnShutdown(EntityUid uid, ActionsContainerComponent component, ComponentShutdown args)
{ {
if (_timing.ApplyingState && component.NetSyncEnabled)
return; // The game state should handle the container removal & action deletion.
component.Container.Shutdown(); component.Container.Shutdown();
} }

13
Content.Shared/Actions/SharedActionsSystem.cs
View File

@@ -36,6 +36,8 @@ public abstract class SharedActionsSystem : EntitySystem
SubscribeLocalEvent<ActionsComponent, DidUnequipEvent>(OnDidUnequip); SubscribeLocalEvent<ActionsComponent, DidUnequipEvent>(OnDidUnequip);
SubscribeLocalEvent<ActionsComponent, DidUnequipHandEvent>(OnHandUnequipped); SubscribeLocalEvent<ActionsComponent, DidUnequipHandEvent>(OnHandUnequipped);
SubscribeLocalEvent<ActionsComponent, ComponentShutdown>(OnShutdown);
SubscribeLocalEvent<ActionsComponent, ComponentGetState>(OnActionsGetState); SubscribeLocalEvent<ActionsComponent, ComponentGetState>(OnActionsGetState);
SubscribeLocalEvent<InstantActionComponent, ComponentGetState>(OnInstantGetState); SubscribeLocalEvent<InstantActionComponent, ComponentGetState>(OnInstantGetState);
@@ -49,6 +51,14 @@ public abstract class SharedActionsSystem : EntitySystem
SubscribeAllEvent<RequestPerformActionEvent>(OnActionRequest); SubscribeAllEvent<RequestPerformActionEvent>(OnActionRequest);
} }
private void OnShutdown(EntityUid uid, ActionsComponent component, ComponentShutdown args)
{
foreach (var act in component.Actions)
{
RemoveAction(uid, act, component);
}
}
private void OnInstantGetState(EntityUid uid, InstantActionComponent component, ref ComponentGetState args) private void OnInstantGetState(EntityUid uid, InstantActionComponent component, ref ComponentGetState args)
{ {
args.State = new InstantActionComponentState(component, EntityManager); args.State = new InstantActionComponentState(component, EntityManager);
@@ -611,6 +621,9 @@ public abstract class SharedActionsSystem : EntitySystem
if (action.AttachedEntity != performer) if (action.AttachedEntity != performer)
{ {
DebugTools.Assert(!Resolve(performer, ref comp, false) || !comp.Actions.Contains(actionId.Value));
if (!GameTiming.ApplyingState)
Log.Error($"Attempted to remove an action {ToPrettyString(actionId)} from an entity that it was never attached to: {ToPrettyString(performer)}"); Log.Error($"Attempted to remove an action {ToPrettyString(actionId)} from an entity that it was never attached to: {ToPrettyString(performer)}");
return; return;
} }