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

improve SpecialRespawn logs and add admin alert (#15784)

Browse Source
This commit is contained in:
Chief-Engineer
2023-04-25 08:19:14 -05:00
committed by GitHub
parent 4e83f3569d
commit 554eb830f5
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Content.Server/Respawn/SpecialRespawnSystem.cs
View File

@@ -1,5 +1,6 @@
using Content.Server.Administration.Logs; using Content.Server.Administration.Logs;
using Content.Server.Atmos.EntitySystems; using Content.Server.Atmos.EntitySystems;
using Content.Server.Chat.Managers;
using Content.Server.GameTicking; using Content.Server.GameTicking;
using Content.Server.Station.Components; using Content.Server.Station.Components;
using Content.Server.Station.Systems; using Content.Server.Station.Systems;
@@ -19,6 +20,7 @@ public sealed class SpecialRespawnSystem : SharedSpecialRespawnSystem
[Dependency] private readonly AtmosphereSystem _atmosphere = default!; [Dependency] private readonly AtmosphereSystem _atmosphere = default!;
[Dependency] private readonly IRobustRandom _random = default!; [Dependency] private readonly IRobustRandom _random = default!;
[Dependency] private readonly StationSystem _stationSystem = default!; [Dependency] private readonly StationSystem _stationSystem = default!;
[Dependency] private readonly IChatManager _chat = default!;
public override void Initialize() public override void Initialize()
{ {
@@ -84,7 +86,7 @@ public sealed class SpecialRespawnSystem : SharedSpecialRespawnSystem
return; return;
if (TryFindRandomTile(entityGridUid.Value, entityMapUid.Value, 10, out var coords)) if (TryFindRandomTile(entityGridUid.Value, entityMapUid.Value, 10, out var coords))
Respawn(component.Prototype, coords); Respawn(uid, component.Prototype, coords);
//If the above fails, spawn at the center of the grid on the station //If the above fails, spawn at the center of the grid on the station
else else
@@ -108,20 +110,21 @@ public sealed class SpecialRespawnSystem : SharedSpecialRespawnSystem
break; break;
} }
Respawn(component.Prototype, pos); Respawn(uid, component.Prototype, pos);
} }
} }
/// <summary> /// <summary>
/// Respawn the entity and log it. /// Respawn the entity and log it.
/// </summary> /// </summary>
/// <param name="oldEntity">The entity being deleted</param>
/// <param name="prototype">The prototype being spawned</param> /// <param name="prototype">The prototype being spawned</param>
/// <param name="coords">The place where it will be spawned</param> /// <param name="coords">The place where it will be spawned</param>
private void Respawn(string prototype, EntityCoordinates coords) private void Respawn(EntityUid oldEntity, string prototype, EntityCoordinates coords)
{ {
var entity = Spawn(prototype, coords); var entity = Spawn(prototype, coords);
var name = MetaData(entity).EntityName; _adminLog.Add(LogType.Respawn, LogImpact.High, $"{ToPrettyString(oldEntity)} was deleted and was respawned at {coords.ToMap(EntityManager)} as {ToPrettyString(entity)}");
_adminLog.Add(LogType.Respawn, LogImpact.High, $"{name} was deleted and was respawned at {coords.ToMap(EntityManager)}"); _chat.SendAdminAlert($"{MetaData(oldEntity).EntityName} was deleted and was respawned as {ToPrettyString(entity)}");
} }
/// <summary> /// <summary>