OBT/1.2.0(Spring Update)

Sync with Upstream

Barotrauma/BarotraumaShared/SharedSource/Items/Components/Holdable/Holdable.cs

@@ -739,6 +739,12 @@ namespace Barotrauma.Items.Components
                 {
                     picker.Inventory.FlashAllowedSlots(item, Color.Red);
                 }
+                else
+                {
+                    //normally this would be done in the base.OnPicked method, but clients don't call it, 
+                    //but instead rely on the server telling them to put the item in the inventory
+                    SoundPlayer.PlayUISound(GUISoundType.PickItem);
+                }
                 return false;
             }
 #endif

Barotrauma/BarotraumaShared/SharedSource/Items/Components/Holdable/MeleeWeapon.cs

@@ -1,4 +1,5 @@
-using FarseerPhysics;
+using Barotrauma.LuaCs.Events;
+using FarseerPhysics;
 using FarseerPhysics.Dynamics;
 using FarseerPhysics.Dynamics.Contacts;
 using Microsoft.Xna.Framework;
@@ -347,18 +348,9 @@ namespace Barotrauma.Items.Components
             }
             else if (f2.Body.UserData is Character targetCharacter)
             {
-                if (targetCharacter == picker || targetCharacter == User) { return false; }
-                if (targetCharacter.IgnoreMeleeWeapons) { return false; }
-                if (HitFriendlyTarget(targetCharacter)) { return false; }
-                if (AllowHitMultiple)
-                {
-                    if (hitTargets.Contains(targetCharacter)) { return false; }
-                }
-                else
-                {
-                    if (hitTargets.Any(t => t is Character)) { return false; }
-                }
-                hitTargets.Add(targetCharacter);
+                //only allow hitting limbs, not the main collider
+                //otherwise it's difficult to make certain parts of the ragdoll not take hits by making them ignore collisions or melee weapons
+                return false;
             }
             else if (!HitOnlyCharacters)
             {
@@ -435,7 +427,7 @@ namespace Barotrauma.Items.Components
             Structure targetStructure = target.UserData as Structure ?? targetFixture.UserData as Structure;
             Item targetItem = target.UserData is Holdable h ? h.Item : target.UserData as Item ?? targetFixture.UserData as Item;
             Entity targetEntity = targetCharacter ?? targetStructure ?? targetItem ?? target.UserData as Entity;
-            GameMain.LuaCs.Hook.Call("meleeWeapon.handleImpact", this, target);
+            LuaCsSetup.Instance.EventService.PublishEvent<IEventMeleeWeaponHandleImpact>(x => x.OnMeleeWeaponHandleImpact(this, target));
 
             if (Attack != null)
             {