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

Fix Hands Crash (#122)

Browse Source 
* Fixed sprite issues with construction system (Thanks PJB!).

* Storage and Hands Systems now subscribe to Transform Parent changes, and will keep their containers in sync.

* Add check in Interaction System to prevent processing client-side entities on the server.
This commit is contained in:
Acruid
2018-11-11 11:32:05 -08:00
committed by Pieter-Jan Briers
parent 4720182cf4
commit 8038ebe37d
11 changed files with 108 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Content.Server/GameObjects/EntitySystems/HandsSystem.cs
View File

@@ -1,7 +1,7 @@
using System;
using Content.Server.GameObjects.Components;
using Content.Server.GameObjects.Components.Projectiles;
using Content.Server.GameObjects.Components.Stack;
using Content.Server.Interfaces.GameObjects;
using Content.Shared.Input;
using Content.Shared.Physics;
using SS14.Server.GameObjects;
@@ -11,7 +11,6 @@ using SS14.Shared.GameObjects;
using SS14.Shared.GameObjects.EntitySystemMessages;
using SS14.Shared.GameObjects.Systems;
using SS14.Shared.Input;
using SS14.Shared.Interfaces.GameObjects;
using SS14.Shared.Interfaces.GameObjects.Components;
using SS14.Shared.Interfaces.Timing;
using SS14.Shared.IoC;
@@ -61,11 +60,18 @@ namespace Content.Server.GameObjects.EntitySystems
{
var msg = (EntParentChangedMessage) args;
// entity is no longer a child of OldParent, therefore it cannot be in the hand of the parent
if (msg.OldParent != null && msg.OldParent.IsValid() && msg.OldParent.TryGetComponent(out IHandsComponent handsComp))
{
handsComp.RemoveHandEntity(msg.Entity);
}
// deleted entities will not pass this test
if (!msg.Entity.TryGetComponent(out ITransformComponent transform))
return;
// if item is in a container
if(transform.IsMapTransform)
if (transform.IsMapTransform)
return;
if(!msg.Entity.TryGetComponent(out PhysicsComponent physics))