diff --git a/Content.Server/Administration/AdminVerbSystem.cs b/Content.Server/Administration/AdminVerbSystem.cs index 9844983ca5..038e1d2482 100644 --- a/Content.Server/Administration/AdminVerbSystem.cs +++ b/Content.Server/Administration/AdminVerbSystem.cs @@ -124,9 +124,9 @@ namespace Content.Server.Administration verb.Category = VerbCategory.Debug; verb.Act = () => { - var coords = EntityManager.GetComponent(args.Target).Coordinates; - Timer.Spawn(_gameTiming.TickPeriod, () => _explosions.SpawnExplosion(coords, 0, 1, 2, 1, args.Target), CancellationToken.None); - if (EntityManager.TryGetComponent(args.Target, out SharedBodyComponent? body)) + var coords = Transform(args.Target).Coordinates; + Timer.Spawn(_gameTiming.TickPeriod, () => _explosions.SpawnExplosion(coords, 0, 1, 2, 1), CancellationToken.None); + if (TryComp(args.Target, out SharedBodyComponent? body)) { body.Gib(); } diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs index ebe85c615d..3fc09a587a 100644 --- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs +++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs @@ -344,19 +344,19 @@ namespace Content.Server.Explosion.EntitySystems // logging var text = $"{epicenter} with range {devastationRange}/{heavyImpactRange}/{lightImpactRange}/{flashRange}"; - if (entity == null) + if (entity == null || !entity.Value.IsValid()) { _logSystem.Add(LogType.Explosion, LogImpact.High, $"Explosion spawned at {text}"); } - else if (user == null) + else if (user == null || !user.Value.IsValid()) { _logSystem.Add(LogType.Explosion, LogImpact.High, - $"{entity.Value} exploded at {text}"); + $"{ToPrettyString(entity.Value)} exploded at {text}"); } else { _logSystem.Add(LogType.Explosion, LogImpact.High, - $"{user.Value} caused {entity.Value} to explode at {text}"); + $"{ToPrettyString(user.Value)} caused {ToPrettyString(entity.Value)} to explode at {text}"); } var maxRange = MathHelper.Max(devastationRange, heavyImpactRange, lightImpactRange, 0);