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

Fix and reclassify existing anchor logs (#12926)

Browse Source
This commit is contained in:
Chief-Engineer
2022-12-08 19:17:56 -06:00
committed by GitHub
parent 75ab0a1127
commit 3d003fdd02
1 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Content.Server/Construction/AnchorableSystem.cs
View File

@@ -58,7 +58,7 @@ namespace Content.Server.Construction
_popup.PopupEntity(Loc.GetString("anchorable-unanchored"), uid, Filter.Pvs(uid, entityManager: EntityManager)); _popup.PopupEntity(Loc.GetString("anchorable-unanchored"), uid, Filter.Pvs(uid, entityManager: EntityManager));
_adminLogger.Add( _adminLogger.Add(
LogType.Action, LogType.Unanchor,
LogImpact.Low, LogImpact.Low,
$"{EntityManager.ToPrettyString(args.User):user} unanchored {EntityManager.ToPrettyString(uid):anchored} using {EntityManager.ToPrettyString(args.Using):using}" $"{EntityManager.ToPrettyString(args.User):user} unanchored {EntityManager.ToPrettyString(uid):anchored} using {EntityManager.ToPrettyString(args.Using):using}"
); );
@@ -100,7 +100,7 @@ namespace Content.Server.Construction
_popup.PopupEntity(Loc.GetString("anchorable-anchored"), uid, Filter.Pvs(uid, entityManager: EntityManager)); _popup.PopupEntity(Loc.GetString("anchorable-anchored"), uid, Filter.Pvs(uid, entityManager: EntityManager));
_adminLogger.Add( _adminLogger.Add(
LogType.Action, LogType.Anchor,
LogImpact.Low, LogImpact.Low,
$"{EntityManager.ToPrettyString(args.User):user} anchored {EntityManager.ToPrettyString(uid):anchored} using {EntityManager.ToPrettyString(args.Using):using}" $"{EntityManager.ToPrettyString(args.User):user} anchored {EntityManager.ToPrettyString(uid):anchored} using {EntityManager.ToPrettyString(args.Using):using}"
); );
@@ -196,7 +196,7 @@ namespace Content.Server.Construction
anchorable.CancelToken = new CancellationTokenSource(); anchorable.CancelToken = new CancellationTokenSource();
_tool.UseTool(usingUid, userUid, uid, 0f, anchorable.Delay, usingTool.Qualities, _tool.UseTool(usingUid, userUid, uid, 0f, anchorable.Delay, usingTool.Qualities,
new TryAnchorCompletedEvent(), new TryAnchorCancelledEvent(), uid, cancelToken: anchorable.CancelToken.Token); new TryAnchorCompletedEvent(userUid, usingUid), new TryAnchorCancelledEvent(userUid, usingUid), uid, cancelToken: anchorable.CancelToken.Token);
} }
/// <summary> /// <summary>
@@ -219,7 +219,7 @@ namespace Content.Server.Construction
anchorable.CancelToken = new CancellationTokenSource(); anchorable.CancelToken = new CancellationTokenSource();
_tool.UseTool(usingUid, userUid, uid, 0f, anchorable.Delay, usingTool.Qualities, _tool.UseTool(usingUid, userUid, uid, 0f, anchorable.Delay, usingTool.Qualities,
new TryUnanchorCompletedEvent(), new TryUnanchorCancelledEvent(), uid, cancelToken: anchorable.CancelToken.Token); new TryUnanchorCompletedEvent(userUid, usingUid), new TryUnanchorCancelledEvent(userUid, usingUid), uid, cancelToken: anchorable.CancelToken.Token);
} }
/// <summary> /// <summary>
@@ -249,26 +249,40 @@ namespace Content.Server.Construction
{ {
public EntityUid User; public EntityUid User;
public EntityUid Using; public EntityUid Using;
protected AnchorEvent(EntityUid userUid, EntityUid usingUid)
{
User = userUid;
Using = usingUid;
}
} }
private sealed class TryUnanchorCompletedEvent : AnchorEvent private sealed class TryUnanchorCompletedEvent : AnchorEvent
{ {
public TryUnanchorCompletedEvent(EntityUid userUid, EntityUid usingUid) : base(userUid, usingUid)
{
}
} }
private sealed class TryUnanchorCancelledEvent : AnchorEvent private sealed class TryUnanchorCancelledEvent : AnchorEvent
{ {
public TryUnanchorCancelledEvent(EntityUid userUid, EntityUid usingUid) : base(userUid, usingUid)
{
}
} }
private sealed class TryAnchorCompletedEvent : AnchorEvent private sealed class TryAnchorCompletedEvent : AnchorEvent
{ {
public TryAnchorCompletedEvent(EntityUid userUid, EntityUid usingUid) : base(userUid, usingUid)
{
}
} }
private sealed class TryAnchorCancelledEvent : AnchorEvent private sealed class TryAnchorCancelledEvent : AnchorEvent
{ {
public TryAnchorCancelledEvent(EntityUid userUid, EntityUid usingUid) : base(userUid, usingUid)
{
}
} }
} }
} }