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

10
Content.Shared/RCD/Systems/RCDSystem.cs
View File

@@ -95,7 +95,7 @@ public sealed class RCDSystem : EntitySystem
return;
}
var doAfterArgs = new DoAfterArgs(user, comp.Delay, new RCDDoAfterEvent(location, comp.Mode), uid, target: args.Target, used: uid)
var doAfterArgs = new DoAfterArgs(EntityManager, user, comp.Delay, new RCDDoAfterEvent(GetNetCoordinates(location), comp.Mode), uid, target: args.Target, used: uid)
{
BreakOnDamage = true,
NeedHand = true,
@@ -115,7 +115,7 @@ public sealed class RCDSystem : EntitySystem
if (args.Event?.DoAfter?.Args == null)
return;
var location = args.Event.Location;
var location = GetCoordinates(args.Event.Location);
var gridId = location.GetGridUid(EntityManager);
if (!HasComp<MapGridComponent>(gridId))
@@ -140,7 +140,7 @@ public sealed class RCDSystem : EntitySystem
return;
var user = args.User;
var location = args.Location;
var location = GetCoordinates(args.Location);
var gridId = location.GetGridUid(EntityManager);
if (!HasComp<MapGridComponent>(gridId))
@@ -316,7 +316,7 @@ public sealed class RCDSystem : EntitySystem
public sealed partial class RCDDoAfterEvent : DoAfterEvent
{
[DataField("location", required: true)]
public EntityCoordinates Location = default!;
public NetCoordinates Location = default!;
[DataField("startingMode", required: true)]
public RcdMode StartingMode = default!;
@@ -325,7 +325,7 @@ public sealed partial class RCDDoAfterEvent : DoAfterEvent
{
}
public RCDDoAfterEvent(EntityCoordinates location, RcdMode startingMode)
public RCDDoAfterEvent(NetCoordinates location, RcdMode startingMode)
{
Location = location;
StartingMode = startingMode;