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

Fix verb menu not working for clientside entities (#1400)

Browse Source 
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
This commit is contained in:
DrSmugleaf
2020-07-23 00:56:30 +02:00
committed by GitHub
parent a80bcda75b
commit 46f13da26d
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Client/GameObjects/EntitySystems/VerbSystem.cs
View File

@@ -94,8 +94,11 @@ namespace Content.Client.GameObjects.EntitySystems
_userInterfaceManager.ModalRoot.AddChild(_currentVerbListRoot); _userInterfaceManager.ModalRoot.AddChild(_currentVerbListRoot);
_currentVerbListRoot.OnPopupHide += CloseVerbMenu; _currentVerbListRoot.OnPopupHide += CloseVerbMenu;
if (!entity.Uid.IsClientSide())
{
_currentVerbListRoot.List.AddChild(new Label {Text = "Waiting on Server..."}); _currentVerbListRoot.List.AddChild(new Label {Text = "Waiting on Server..."});
RaiseNetworkEvent(new VerbSystemMessages.RequestVerbsMessage(_currentEntity)); RaiseNetworkEvent(new VerbSystemMessages.RequestVerbsMessage(_currentEntity));
}
var box = UIBox2.FromDimensions(screenCoordinates.Position, (1, 1)); var box = UIBox2.FromDimensions(screenCoordinates.Position, (1, 1));
_currentVerbListRoot.Open(box); _currentVerbListRoot.Open(box);

2
Content.Server/GameObjects/EntitySystems/VerbSystem.cs
View File

@@ -7,6 +7,7 @@ using Robust.Shared.GameObjects.Systems;
using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.IoC; using Robust.Shared.IoC;
using static Content.Shared.GameObjects.EntitySystemMessages.VerbSystemMessages; using static Content.Shared.GameObjects.EntitySystemMessages.VerbSystemMessages;
using Logger = Robust.Shared.Log.Logger;
namespace Content.Server.Interfaces.GameObjects.Components.Interaction namespace Content.Server.Interfaces.GameObjects.Components.Interaction
{ {
@@ -85,6 +86,7 @@ namespace Content.Server.Interfaces.GameObjects.Components.Interaction
if (!_entityManager.TryGetEntity(req.EntityUid, out var entity)) if (!_entityManager.TryGetEntity(req.EntityUid, out var entity))
{ {
Logger.Warning($"{nameof(RequestVerbs)} called on a nonexistant entity with id {req.EntityUid} by player {player}.");
return; return;
} }