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

remove usages of obsolete EntityUid method variants (#35106)

Browse Source 
eughhhhh
This commit is contained in:
Milon
2025-02-16 03:06:23 +01:00
committed by GitHub
parent 831dbef591
commit e97d6870cc
6 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/Beam/BeamSystem.cs
View File

@@ -96,7 +96,7 @@ public sealed class BeamSystem : SharedBeamSystem
_physics.SetBodyType(ent, BodyType.Dynamic, manager: manager, body: physics); _physics.SetBodyType(ent, BodyType.Dynamic, manager: manager, body: physics);
_physics.SetCanCollide(ent, true, manager: manager, body: physics); _physics.SetCanCollide(ent, true, manager: manager, body: physics);
_broadphase.RegenerateContacts(ent, physics, manager); _broadphase.RegenerateContacts((ent, physics, manager));
var distanceLength = distanceCorrection.Length(); var distanceLength = distanceCorrection.Length();

2
Content.Server/Explosion/EntitySystems/TriggerSystem.Proximity.cs
View File

@@ -36,7 +36,7 @@ public sealed partial class TriggerSystem
// Re-check for contacts as we cleared them. // Re-check for contacts as we cleared them.
else if (TryComp<PhysicsComponent>(uid, out var body)) else if (TryComp<PhysicsComponent>(uid, out var body))
{ {
_broadphase.RegenerateContacts(uid, body); _broadphase.RegenerateContacts((uid, body));
} }
} }

2
Content.Server/Fluids/EntitySystems/SmokeSystem.cs
View File

@@ -228,7 +228,7 @@ public sealed class SmokeSystem : EntitySystem
var xform = Transform(uid); var xform = Transform(uid);
_physics.SetBodyType(uid, BodyType.Dynamic, fixtures, body, xform); _physics.SetBodyType(uid, BodyType.Dynamic, fixtures, body, xform);
_physics.SetCanCollide(uid, true, manager: fixtures, body: body); _physics.SetCanCollide(uid, true, manager: fixtures, body: body);
_broadphase.RegenerateContacts(uid, body, fixtures, xform); _broadphase.RegenerateContacts((uid, body, fixtures, xform));
} }
var timer = EnsureComp<TimedDespawnComponent>(uid); var timer = EnsureComp<TimedDespawnComponent>(uid);

2
Content.Server/Physics/Controllers/ConveyorController.cs
View File

@@ -109,7 +109,7 @@ public sealed class ConveyorController : SharedConveyorController
component.State = state; component.State = state;
if (TryComp<PhysicsComponent>(uid, out var physics)) if (TryComp<PhysicsComponent>(uid, out var physics))
_broadphase.RegenerateContacts(uid, physics); _broadphase.RegenerateContacts((uid, physics));
UpdateAppearance(uid, component); UpdateAppearance(uid, component);
Dirty(uid, component); Dirty(uid, component);

2
Content.Shared/Stunnable/SharedStunSystem.cs
View File

@@ -116,7 +116,7 @@ public abstract class SharedStunSystem : EntitySystem
private void OnStunOnContactStartup(Entity<StunOnContactComponent> ent, ref ComponentStartup args) private void OnStunOnContactStartup(Entity<StunOnContactComponent> ent, ref ComponentStartup args)
{ {
if (TryComp<PhysicsComponent>(ent, out var body)) if (TryComp<PhysicsComponent>(ent, out var body))
_broadphase.RegenerateContacts(ent, body); _broadphase.RegenerateContacts((ent, body));
} }
private void OnStunOnContactCollide(Entity<StunOnContactComponent> ent, ref StartCollideEvent args) private void OnStunOnContactCollide(Entity<StunOnContactComponent> ent, ref StartCollideEvent args)

4
Content.Shared/Throwing/ThrownItemSystem.cs
View File

@@ -95,7 +95,7 @@ namespace Content.Shared.Throwing
_physics.SetBodyStatus(uid, physics, BodyStatus.OnGround); _physics.SetBodyStatus(uid, physics, BodyStatus.OnGround);
if (physics.Awake) if (physics.Awake)
_broadphase.RegenerateContacts(uid, physics); _broadphase.RegenerateContacts((uid, physics));
} }
if (EntityManager.TryGetComponent(uid, out FixturesComponent? manager)) if (EntityManager.TryGetComponent(uid, out FixturesComponent? manager))
@@ -123,7 +123,7 @@ namespace Content.Shared.Throwing
if (thrownItem.Thrower is not null) if (thrownItem.Thrower is not null)
_adminLogger.Add(LogType.Landed, LogImpact.Low, $"{ToPrettyString(uid):entity} thrown by {ToPrettyString(thrownItem.Thrower.Value):thrower} landed."); _adminLogger.Add(LogType.Landed, LogImpact.Low, $"{ToPrettyString(uid):entity} thrown by {ToPrettyString(thrownItem.Thrower.Value):thrower} landed.");
_broadphase.RegenerateContacts(uid, physics); _broadphase.RegenerateContacts((uid, physics));
var landEvent = new LandEvent(thrownItem.Thrower, playSound); var landEvent = new LandEvent(thrownItem.Thrower, playSound);
RaiseLocalEvent(uid, ref landEvent); RaiseLocalEvent(uid, ref landEvent);
} }