diff --git a/Content.Server/GameObjects/Components/Doors/ServerDoorComponent.cs b/Content.Server/GameObjects/Components/Doors/ServerDoorComponent.cs index 9cd26b6e40..01bae87af6 100644 --- a/Content.Server/GameObjects/Components/Doors/ServerDoorComponent.cs +++ b/Content.Server/GameObjects/Components/Doors/ServerDoorComponent.cs @@ -10,6 +10,7 @@ using SS14.Shared.Maths; using SS14.Shared.IoC; using Content.Server.GameObjects.EntitySystems; using SS14.Shared.Serialization; +using SS14.Shared.Interfaces.Network; namespace Content.Server.GameObjects { @@ -39,15 +40,15 @@ namespace Content.Server.GameObjects base.Initialize(); collidableComponent = Owner.GetComponent(); - collidableComponent.OnBump += OnBump; spriteComponent = Owner.GetComponent(); } public override void OnRemove() { - collidableComponent.OnBump -= OnBump; collidableComponent = null; spriteComponent = null; + + base.OnRemove(); } public bool Attackhand(IEntity user) @@ -63,15 +64,21 @@ namespace Content.Server.GameObjects return true; } - private void OnBump(object sender, BumpEventArgs args) + public override void HandleMessage(ComponentMessage message, INetChannel netChannel = null, IComponent component = null) { - Logger.Info("Bump!"); - if (Opened) - { - return; - } + base.HandleMessage(message, netChannel, component); - Open(); + switch (message) + { + case BumpedEntMsg msg: + if (Opened) + { + return; + } + + Open(); + break; + } } public void Open() diff --git a/engine b/engine index bceda76bf8..696bf486a6 160000 --- a/engine +++ b/engine @@ -1 +1 @@ -Subproject commit bceda76bf870c6b4dc4bd8ae7d94e4adb45bcae8 +Subproject commit 696bf486a67ebe953a69fe81e227c1e957bb2ca6