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

Update content repo and RobustToolbox

Browse Source
This commit is contained in:
Jackson Lewis
2020-04-20 10:36:02 +01:00
parent bb9ee66db4
commit 6a22f2629b
27 changed files with 187 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Content.Server/GameObjects/Components/Weapon/Ranged/RangedWeapon.cs
View File

@@ -9,6 +9,7 @@ using Robust.Shared.Interfaces.Network;
using Robust.Shared.Interfaces.Timing;
using Robust.Shared.IoC;
using Robust.Shared.Map;
using Robust.Shared.Players;
using Robust.Shared.Timers;
namespace Content.Server.GameObjects.Components.Weapon.Ranged
@@ -40,16 +41,18 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged
FireHandler?.Invoke(user, clickLocation);
}
public override void HandleMessage(ComponentMessage message, INetChannel netChannel = null,
IComponent component = null)
public override void HandleNetworkMessage(ComponentMessage message, INetChannel channel, ICommonSession session = null)
{
base.HandleMessage(message, netChannel, component);
base.HandleNetworkMessage(message, channel, session);
if (session == null)
{
throw new ArgumentNullException(nameof(session));
}
switch (message)
{
case SyncFirePosMessage msg:
var playerMgr = IoCManager.Resolve<IPlayerManager>();
var session = playerMgr.GetSessionByChannel(netChannel);
var user = session.AttachedEntity;
if (user == null)
{