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

Examine fixes (#13696)

Browse Source
This commit is contained in:
Jacob Tong
2023-01-27 18:15:39 -05:00
committed by GitHub
parent ce3bb0e859
commit 6de75669d1
3 changed files with 33 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,7 +45,7 @@ namespace Content.Server.Examine
verbs = _verbSystem.GetLocalVerbs(target, player, typeof(ExamineVerb));
var ev = new ExamineSystemMessages.ExamineInfoResponseMessage(
target, message, verbs?.ToList(), centerAtCursor
target, 0, message, verbs?.ToList(), centerAtCursor
);
RaiseNetworkEvent(ev, session.ConnectedClient);
@@ -61,14 +61,14 @@ namespace Content.Server.Examine
|| !EntityManager.EntityExists(request.EntityUid))
{
RaiseNetworkEvent(new ExamineSystemMessages.ExamineInfoResponseMessage(
request.EntityUid, _entityNotFoundMessage), channel);
request.EntityUid, request.Id, _entityNotFoundMessage), channel);
return;
}
if (!CanExamine(playerEnt, request.EntityUid))
{
RaiseNetworkEvent(new ExamineSystemMessages.ExamineInfoResponseMessage(
request.EntityUid, _entityOutOfRangeMessage, knowTarget: false), channel);
request.EntityUid, request.Id, _entityOutOfRangeMessage, knowTarget: false), channel);
return;
}
@@ -77,7 +77,8 @@ namespace Content.Server.Examine
verbs = _verbSystem.GetLocalVerbs(request.EntityUid, playerEnt, typeof(ExamineVerb));
var text = GetExamineText(request.EntityUid, player.AttachedEntity);
RaiseNetworkEvent(new ExamineSystemMessages.ExamineInfoResponseMessage(request.EntityUid, text, verbs?.ToList()), channel);
RaiseNetworkEvent(new ExamineSystemMessages.ExamineInfoResponseMessage(
request.EntityUid, request.Id, text, verbs?.ToList()), channel);
}
}
}