juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

action refactor proper ecs edition (#27422)

Browse Source
This commit is contained in:
deltanedas
2025-05-28 19:52:11 +00:00
committed by GitHub
parent a9f7cfbcb6
commit b3825dce97
111 changed files with 1995 additions and 2901 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/NPC/Components/NPCUseActionOnTargetComponent.cs
View File

@@ -1,5 +1,5 @@
using Content.Server.NPC.Systems;
using Content.Shared.Actions;
using Content.Shared.Actions.Components;
using Robust.Shared.Prototypes;
namespace Content.Server.NPC.Components;
@@ -20,7 +20,7 @@ public sealed partial class NPCUseActionOnTargetComponent : Component
/// Action that's going to attempt to be used.
/// </summary>
[DataField(required: true)]
public EntProtoId<EntityWorldTargetActionComponent> ActionId;
public EntProtoId<TargetActionComponent> ActionId;
[DataField]
public EntityUid? ActionEnt;

16
Content.Server/NPC/Systems/NPCUseActionOnTargetSystem.cs
View File

@@ -28,24 +28,16 @@ public sealed class NPCUseActionOnTargetSystem : EntitySystem
if (!Resolve(user, ref user.Comp, false))
return false;
if (!TryComp<EntityWorldTargetActionComponent>(user.Comp.ActionEnt, out var action))
if (_actions.GetAction(user.Comp.ActionEnt) is not {} action)
return false;
if (!_actions.ValidAction(action))
return false;
if (action.Event != null)
{
action.Event.Coords = Transform(target).Coordinates;
}
_actions.SetEventTarget(action, target);
_actions.PerformAction(user,
null,
user.Comp.ActionEnt.Value,
action,
action.BaseEvent,
_timing.CurTime,
false);
// NPC is serverside, no prediction :(
_actions.PerformAction(user.Owner, action, predicted: false);
return true;
}