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

Examine fixes (#6831)

Browse Source
This commit is contained in:
mirrorcult
2022-02-20 20:42:16 -07:00
committed by GitHub
parent b87806f7ed
commit e88f179b5f
4 changed files with 33 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Content.Server/Examine/ExamineSystem.cs
View File

@@ -1,4 +1,7 @@
using System.Linq;
using Content.Server.Verbs;
using Content.Shared.Examine;
using Content.Shared.Verbs;
using JetBrains.Annotations;
using Robust.Server.GameObjects;
using Robust.Server.Player;
@@ -11,6 +14,8 @@ namespace Content.Server.Examine
[UsedImplicitly]
public sealed class ExamineSystem : ExamineSystemShared
{
[Dependency] private readonly VerbSystem _verbSystem = default!;
private static readonly FormattedMessage _entityNotFoundMessage;
static ExamineSystem()
@@ -33,8 +38,12 @@ namespace Content.Server.Examine
var session = actor.PlayerSession;
SortedSet<Verb>? verbs = null;
if (getVerbs)
verbs = _verbSystem.GetLocalVerbs(target, player, typeof(ExamineVerb));
var ev = new ExamineSystemMessages.ExamineInfoResponseMessage(
target, message, getVerbs, centerAtCursor
target, message, verbs?.ToList(), centerAtCursor
);
RaiseNetworkEvent(ev, session.ConnectedClient);
@@ -51,12 +60,16 @@ namespace Content.Server.Examine
|| !CanExamine(playerEnt, request.EntityUid))
{
RaiseNetworkEvent(new ExamineSystemMessages.ExamineInfoResponseMessage(
request.EntityUid, _entityNotFoundMessage, request.GetVerbs), channel);
request.EntityUid, _entityNotFoundMessage), channel);
return;
}
SortedSet<Verb>? verbs = null;
if (request.GetVerbs)
verbs = _verbSystem.GetLocalVerbs(request.EntityUid, playerEnt, typeof(ExamineVerb));
var text = GetExamineText(request.EntityUid, player.AttachedEntity);
RaiseNetworkEvent(new ExamineSystemMessages.ExamineInfoResponseMessage(request.EntityUid, text, request.GetVerbs), channel);
RaiseNetworkEvent(new ExamineSystemMessages.ExamineInfoResponseMessage(request.EntityUid, text, verbs?.ToList()), channel);
}
}
}