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

Meteor Fix (#5717)

Browse Source
This commit is contained in:
Leon Friedrich
2021-12-10 04:34:38 +13:00
committed by GitHub
parent cd1b5f44e8
commit 896f80831b
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Server/Administration/AdminVerbSystem.cs
View File

@@ -124,9 +124,9 @@ namespace Content.Server.Administration
verb.Category = VerbCategory.Debug;
verb.Act = () =>
{
var coords = EntityManager.GetComponent<TransformComponent>(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();
}

8
Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
View File

@@ -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);