Adjust interaction ordering & interaction conditions (#6387)

2022-02-05 15:39:01 +13:00
parent 442d7dbf8e
commit dd61fb46ea
28 changed files with 88 additions and 167 deletions
--- a/Content.Server/Weapon/Melee/MeleeWeaponSystem.cs
+++ b/Content.Server/Weapon/Melee/MeleeWeaponSystem.cs
@@ -215,7 +215,7 @@ namespace Content.Server.Weapon.Melee
        /// </summary>
        private void OnAfterInteract(EntityUid owner, MeleeWeaponComponent comp, AfterInteractEvent args)
        {
-            if (!args.CanReach)
+            if (args.Handled || !args.CanReach)
                return;

            var curTime = _gameTiming.CurTime;