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

Need to merge this

Browse Source
This commit is contained in:
Pieter-Jan Briers
2020-03-25 11:16:57 +01:00
parent 42814fcfe7
commit 705aeceba6
7 changed files with 104 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,6 +2,7 @@
using System.Reflection;
using Content.Shared.GameObjects;
using Robust.Server.Interfaces.Player;
using Robust.Shared.GameObjects;
using Robust.Shared.GameObjects.Systems;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.IoC;
@@ -13,7 +14,6 @@ namespace Content.Server.GameObjects.EntitySystems
{
#pragma warning disable 649
[Dependency] private readonly IEntityManager _entityManager;
[Dependency] private readonly IPlayerManager _playerManager;
#pragma warning restore 649
public override void Initialize()
@@ -26,18 +26,14 @@ namespace Content.Server.GameObjects.EntitySystems
IoCManager.InjectDependencies(this);
}
private void UseVerb(UseVerbMessage use)
private void UseVerb(UseVerbMessage use, EntitySessionEventArgs eventArgs)
{
var channel = use.NetChannel;
if(channel == null)
return;
if (!_entityManager.TryGetEntity(use.EntityUid, out var entity))
{
return;
}
var session = _playerManager.GetSessionByChannel(channel);
var session = eventArgs.SenderSession;
var userEntity = session.AttachedEntity;
foreach (var (component, verb) in VerbUtility.GetVerbs(entity))
@@ -83,19 +79,16 @@ namespace Content.Server.GameObjects.EntitySystems
}
}
private void RequestVerbs(RequestVerbsMessage req)
private void RequestVerbs(RequestVerbsMessage req, EntitySessionEventArgs eventArgs)
{
var channel = req.NetChannel;
if (channel == null)
return;
var player = (IPlayerSession) eventArgs.SenderSession;
if (!_entityManager.TryGetEntity(req.EntityUid, out var entity))
{
return;
}
var session = _playerManager.GetSessionByChannel(channel);
var userEntity = session.AttachedEntity;
var userEntity = player.AttachedEntity;
var data = new List<VerbsResponseMessage.VerbData>();
//Get verbs, component dependent.
@@ -125,7 +118,7 @@ namespace Content.Server.GameObjects.EntitySystems
}
var response = new VerbsResponseMessage(data, req.EntityUid);
RaiseNetworkEvent(response, channel);
RaiseNetworkEvent(response, player.ConnectedClient);
}
}
}