Remove most IEntity usages from explosions (#5240)
* Remove most IEntity usages from Destructible and Explosions * Perform a minute amount of cleanup * Fix build
This commit is contained in:
committed by
GitHub
parent
3a4186f6f6
commit
42aaba9a5d
@@ -1,6 +1,7 @@
|
||||
using System;
|
||||
using System.Diagnostics.CodeAnalysis;
|
||||
using System.Threading.Tasks;
|
||||
using Content.Server.Explosion.EntitySystems;
|
||||
using Content.Server.Flash.Components;
|
||||
using Content.Server.Throwing;
|
||||
using Content.Shared.Explosion;
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
using Content.Server.Explosion.EntitySystems;
|
||||
using Robust.Shared.GameObjects;
|
||||
|
||||
namespace Content.Server.Explosion.Components
|
||||
|
||||
@@ -15,7 +15,7 @@ namespace Content.Server.Explosion.Components
|
||||
return;
|
||||
|
||||
var sourceLocation = eventArgs.Source;
|
||||
var targetLocation = eventArgs.Target.Transform.Coordinates;
|
||||
var targetLocation = Owner.EntityManager.GetComponent<TransformComponent>(eventArgs.Target).Coordinates;
|
||||
|
||||
if (sourceLocation.Equals(targetLocation)) return;
|
||||
|
||||
@@ -27,7 +27,7 @@ namespace Content.Server.Explosion.Components
|
||||
ExplosionSeverity.Light => 20,
|
||||
_ => 0,
|
||||
};
|
||||
|
||||
|
||||
Owner.TryThrow(direction, throwForce);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
using System;
|
||||
using Content.Server.Explosion.EntitySystems;
|
||||
using Content.Shared.Interaction;
|
||||
using Content.Shared.Trigger;
|
||||
using Robust.Server.GameObjects;
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
using Content.Server.Explosion.EntitySystems;
|
||||
using Content.Shared.Sound;
|
||||
using Robust.Shared.GameObjects;
|
||||
using Robust.Shared.Serialization.Manager.Attributes;
|
||||
|
||||
Reference in New Issue
Block a user