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

add decal logs (#18710)

Browse Source
This commit is contained in:
Chief-Engineer
2023-08-05 15:53:02 -05:00
committed by GitHub
parent 8a02bb5cda
commit 1b5ec34a7a
1 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Content.Server/Decals/DecalSystem.cs
View File

@@ -2,9 +2,11 @@ using System.Diagnostics.CodeAnalysis;
using System.Linq; using System.Linq;
using System.Numerics; using System.Numerics;
using System.Threading.Tasks; using System.Threading.Tasks;
using Content.Server.Administration.Logs;
using Content.Server.Administration.Managers; using Content.Server.Administration.Managers;
using Content.Shared.Administration; using Content.Shared.Administration;
using Content.Shared.Chunking; using Content.Shared.Chunking;
using Content.Shared.Database;
using Content.Shared.Decals; using Content.Shared.Decals;
using Content.Shared.Maps; using Content.Shared.Maps;
using Microsoft.Extensions.ObjectPool; using Microsoft.Extensions.ObjectPool;
@@ -30,6 +32,7 @@ namespace Content.Server.Decals
[Dependency] private readonly ChunkingSystem _chunking = default!; [Dependency] private readonly ChunkingSystem _chunking = default!;
[Dependency] private readonly IConfigurationManager _conf = default!; [Dependency] private readonly IConfigurationManager _conf = default!;
[Dependency] private readonly IGameTiming _timing = default!; [Dependency] private readonly IGameTiming _timing = default!;
[Dependency] private readonly IAdminLogManager _adminLogger = default!;
private readonly Dictionary<EntityUid, HashSet<Vector2i>> _dirtyChunks = new(); private readonly Dictionary<EntityUid, HashSet<Vector2i>> _dirtyChunks = new();
private readonly Dictionary<IPlayerSession, Dictionary<EntityUid, HashSet<Vector2i>>> _previousSentChunks = new(); private readonly Dictionary<IPlayerSession, Dictionary<EntityUid, HashSet<Vector2i>>> _previousSentChunks = new();
@@ -203,7 +206,19 @@ namespace Content.Server.Decals
if (!ev.Coordinates.IsValid(EntityManager)) if (!ev.Coordinates.IsValid(EntityManager))
return; return;
TryAddDecal(ev.Decal, ev.Coordinates, out _); if (!TryAddDecal(ev.Decal, ev.Coordinates, out _))
return;
if (eventArgs.SenderSession.AttachedEntity != null)
{
_adminLogger.Add(LogType.CrayonDraw, LogImpact.High,
$"{ToPrettyString(eventArgs.SenderSession.AttachedEntity.Value):actor} drew a {ev.Decal.Color} {ev.Decal.Id} at {ev.Coordinates}");
}
else
{
_adminLogger.Add(LogType.CrayonDraw, LogImpact.High,
$"{eventArgs.SenderSession.Name} drew a {ev.Decal.Color} {ev.Decal.Id} at {ev.Coordinates}");
}
} }
private void OnDecalRemovalRequest(RequestDecalRemovalEvent ev, EntitySessionEventArgs eventArgs) private void OnDecalRemovalRequest(RequestDecalRemovalEvent ev, EntitySessionEventArgs eventArgs)
@@ -224,8 +239,19 @@ namespace Content.Server.Decals
return; return;
// remove all decals on the same tile // remove all decals on the same tile
foreach (var (decalId, _) in GetDecalsInRange(gridId.Value, ev.Coordinates.Position)) foreach (var (decalId, decal) in GetDecalsInRange(gridId.Value, ev.Coordinates.Position))
{ {
if (eventArgs.SenderSession.AttachedEntity != null)
{
_adminLogger.Add(LogType.CrayonDraw, LogImpact.High,
$"{ToPrettyString(eventArgs.SenderSession.AttachedEntity.Value):actor} removed a {decal.Color} {decal.Id} at {ev.Coordinates}");
}
else
{
_adminLogger.Add(LogType.CrayonDraw, LogImpact.High,
$"{eventArgs.SenderSession.Name} removed a {decal.Color} {decal.Id} at {ev.Coordinates}");
}
RemoveDecal(gridId.Value, decalId); RemoveDecal(gridId.Value, decalId);
} }
} }