Merge remote-tracking branch 'upstream/master' into develop

2026-04-09 09:12:16 -03:00
parent ef66d27ffe a4607dffad
commit 790378d2a5
198 changed files with 5587 additions and 3462 deletions
@@ -348,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)
            {