Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Remove most IEntity usages from explosions (#5240)

Browse Source 
* Remove most IEntity usages from Destructible and Explosions

* Perform a minute amount of cleanup

* Fix build
This commit is contained in:
Javier Guardia Fernández
2021-11-09 21:24:35 +01:00
committed by GitHub
parent 3a4186f6f6
commit 42aaba9a5d
28 changed files with 294 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Shared/Acts/ActSystem.cs
View File

@@ -46,7 +46,7 @@ namespace Content.Shared.Acts
public class ExplosionEventArgs : EventArgs
{
public EntityCoordinates Source { get; set; }
public IEntity Target { get; set; } = default!;
public EntityUid Target { get; set; }
public ExplosionSeverity Severity { get; set; }
}
@@ -70,7 +70,7 @@ namespace Content.Shared.Acts
EntityManager.QueueDeleteEntity(owner);
}
public void HandleExplosion(EntityCoordinates source, IEntity target, ExplosionSeverity severity)
public void HandleExplosion(EntityCoordinates source, EntityUid target, ExplosionSeverity severity)
{
var eventArgs = new ExplosionEventArgs
{
@@ -78,7 +78,7 @@ namespace Content.Shared.Acts
Target = target,
Severity = severity
};
var exActs = target.GetAllComponents<IExAct>().ToList();
var exActs = EntityManager.GetComponents<IExAct>(target).ToList();
foreach (var exAct in exActs)
{