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

Content update for NetEntities (#18935)

Browse Source
This commit is contained in:
metalgearsloth
2023-09-11 09:42:41 +10:00
committed by GitHub
parent 389c8d1a2c
commit 5a0fc68be2
526 changed files with 3058 additions and 2215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Content.Shared/Tools/Systems/SharedToolSystem.cs
View File

@@ -29,7 +29,7 @@ public abstract partial class SharedToolSystem : EntitySystem
ev.DoAfter = args.DoAfter;
if (args.OriginalTarget != null)
RaiseLocalEvent(args.OriginalTarget.Value, (object) ev);
RaiseLocalEvent(GetEntity(args.OriginalTarget.Value), (object) ev);
else
RaiseLocalEvent((object) ev);
}
@@ -108,8 +108,8 @@ public abstract partial class SharedToolSystem : EntitySystem
if (!CanStartToolUse(tool, user, target, toolQualitiesNeeded, toolComponent))
return false;
var toolEvent = new ToolDoAfterEvent(doAfterEv, target);
var doAfterArgs = new DoAfterArgs(user, delay / toolComponent.SpeedModifier, toolEvent, tool, target: target, used: tool)
var toolEvent = new ToolDoAfterEvent(doAfterEv, GetNetEntity(target));
var doAfterArgs = new DoAfterArgs(EntityManager, user, delay / toolComponent.SpeedModifier, toolEvent, tool, target: target, used: tool)
{
BreakOnDamage = true,
BreakOnTargetMove = true,
@@ -214,7 +214,7 @@ public abstract partial class SharedToolSystem : EntitySystem
/// Entity that the wrapped do after event will get directed at. If null, event will be broadcast.
/// </summary>
[DataField("target")]
public EntityUid? OriginalTarget;
public NetEntity? OriginalTarget;
[DataField("wrappedEvent")]
public DoAfterEvent WrappedEvent = default!;
@@ -223,7 +223,7 @@ public abstract partial class SharedToolSystem : EntitySystem
{
}
public ToolDoAfterEvent(DoAfterEvent wrappedEvent, EntityUid? originalTarget)
public ToolDoAfterEvent(DoAfterEvent wrappedEvent, NetEntity? originalTarget)
{
DebugTools.Assert(wrappedEvent.GetType().HasCustomAttribute<NetSerializableAttribute>(), "Tool event is not serializable");
@@ -247,13 +247,13 @@ public abstract partial class SharedToolSystem : EntitySystem
protected sealed partial class LatticeCuttingCompleteEvent : DoAfterEvent
{
[DataField("coordinates", required:true)]
public EntityCoordinates Coordinates;
public NetCoordinates Coordinates;
private LatticeCuttingCompleteEvent()
{
}
public LatticeCuttingCompleteEvent(EntityCoordinates coordinates)
public LatticeCuttingCompleteEvent(NetCoordinates coordinates)
{
Coordinates = coordinates;
}
@@ -264,14 +264,14 @@ public abstract partial class SharedToolSystem : EntitySystem
[Serializable, NetSerializable]
protected sealed partial class TilePryingDoAfterEvent : DoAfterEvent
{
[DataField("coordinates", required:true)]
public EntityCoordinates Coordinates;
[DataField("coordinates", required: true)]
public NetCoordinates Coordinates;
private TilePryingDoAfterEvent()
{
}
public TilePryingDoAfterEvent(EntityCoordinates coordinates)
public TilePryingDoAfterEvent(NetCoordinates coordinates)
{
Coordinates = coordinates;
}