juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

InputSystem Messages (#37)

Browse Source 
* Misc Cleanup.

* Removed BoundKeyChangeEventArgs.

* Nothing uses EntityEventArgs now.

* Rebase fixes.

* Updated Engine.
Fixed .gitmodules file.
This commit is contained in:
Acruid
2018-03-03 18:07:09 -08:00
committed by Pieter-Jan Briers
parent b005d661f8
commit 3f89f3f0f7
4 changed files with 29 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Content.Server/GameObjects/EntitySystems/InteractionSystem.cs
View File

@@ -3,11 +3,9 @@ using SS14.Server.Interfaces.GameObjects;
using SS14.Shared.GameObjects;
using SS14.Shared.GameObjects.System;
using SS14.Shared.Interfaces.GameObjects;
using SS14.Shared.Interfaces.GameObjects.Components;
using SS14.Shared.IoC;
using System.Collections.Generic;
using System.Linq;
using SS14.Shared.Enums;
using SS14.Shared.Input;
namespace Content.Server.GameObjects.EntitySystems
{
@@ -44,17 +42,17 @@ namespace Content.Server.GameObjects.EntitySystems
{
base.Initialize();
SubscribeEvent<ClickedOnEntityEventArgs>(UserInteraction, this);
SubscribeEvent<ClickedOnEntityMessage>(UserInteraction);
}
public void UserInteraction(object sender, EntityEventArgs arg)
private void UserInteraction(object sender, EntityEventArgs arg)
{
ClickedOnEntityEventArgs e = (ClickedOnEntityEventArgs)arg;
var e = (ClickedOnEntityMessage)arg;
if (e.MouseButton != ClickType.Left)
return;
IEntity user = EntityManager.GetEntity(e.Clicker);
IEntity attacked = EntityManager.GetEntity(e.Clicked);
var user = EntityManager.GetEntity(e.Owner);
var attacked = EntityManager.GetEntity(e.Clicked);
if (!user.TryGetComponent<IServerTransformComponent>(out var userTransform))
{