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

Interaction System Messages (#202)

Browse Source 
* Adds entity messages to the InteractionSystem.

* Changed Handled check formatting to match the rest of the codebase.
This commit is contained in:
Acruid
2019-04-20 16:18:16 -07:00
committed by Pieter-Jan Briers
parent 88d099a571
commit 50f42d71a2
2 changed files with 257 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Content.Server/GameObjects/Components/GUI/ServerHandsComponent.cs
View File

@@ -25,6 +25,8 @@ namespace Content.Server.GameObjects
{
public class HandsComponent : SharedHandsComponent, IHandsComponent
{
[Dependency] private readonly IEntitySystemManager _entitySystemManager;
private string activeIndex;
[ViewVariables(VVAccess.ReadWrite)]
@@ -436,7 +438,8 @@ namespace Content.Server.GameObjects
var used = GetActiveHand?.Owner;
if (used != null)
{
InteractionSystem.TryUseInteraction(Owner, used);
var interactionSystem = _entitySystemManager.GetEntitySystem<InteractionSystem>();
interactionSystem.TryUseInteraction(Owner, used);
}
}
@@ -474,7 +477,8 @@ namespace Content.Server.GameObjects
if (playerEntity == Owner && used != null)
{
InteractionSystem.Interaction(Owner, used, slot.ContainedEntity,
var interactionSystem = _entitySystemManager.GetEntitySystem<InteractionSystem>();
interactionSystem.Interaction(Owner, used, slot.ContainedEntity,
GridCoordinates.Nullspace);
}
@@ -490,7 +494,8 @@ namespace Content.Server.GameObjects
if (playerEntity == Owner && used != null)
{
InteractionSystem.TryUseInteraction(Owner, used);
var interactionSystem = _entitySystemManager.GetEntitySystem<InteractionSystem>();
interactionSystem.TryUseInteraction(Owner, used);
}
break;