diff --git a/patches/server/Send-attack-SoundEffects-only-to-players-who-can-see.patch b/patches/server/Send-attack-SoundEffects-only-to-players-who-can-see.patch
index 40318ea913..e953a29f9c 100644
--- a/patches/server/Send-attack-SoundEffects-only-to-players-who-can-see.patch
+++ b/patches/server/Send-attack-SoundEffects-only-to-players-who-can-see.patch
@@ -23,80 +23,47 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
                              }
  
 -                            this.level().playSound((Player) null, this.getX(), this.getY(), this.getZ(), SoundEvents.PLAYER_ATTACK_SWEEP, this.getSoundSource(), 1.0F, 1.0F);
--                            this.sweepAttack();
--                        }
-+                                sendSoundEffect(this, this.getX(), this.getY(), this.getZ(), SoundEvents.PLAYER_ATTACK_SWEEP, this.getSoundSource(), 1.0F, 1.0F); // Paper - send while respecting visibility
-+                                this.sweepAttack();
-+                            }
- 
-                         if (target instanceof ServerPlayer && target.hurtMarked) {
-                             // CraftBukkit start - Add Velocity Event
-@@ -0,0 +0,0 @@ public abstract class Player extends LivingEntity {
-                             // CraftBukkit end
++                            sendSoundEffect(this, this.getX(), this.getY(), this.getZ(), SoundEvents.PLAYER_ATTACK_SWEEP, this.getSoundSource(), 1.0F, 1.0F); // Paper - send while respecting visibility
+                             this.sweepAttack();
                          }
  
--                        if (flag2) {
+@@ -0,0 +0,0 @@ public abstract class Player extends LivingEntity {
+                         }
+ 
+                         if (flag2) {
 -                            this.level().playSound((Player) null, this.getX(), this.getY(), this.getZ(), SoundEvents.PLAYER_ATTACK_CRIT, this.getSoundSource(), 1.0F, 1.0F);
--                            this.crit(target);
--                        }
-+                            if (flag2) {
-+                                sendSoundEffect(this, this.getX(), this.getY(), this.getZ(), SoundEvents.PLAYER_ATTACK_CRIT, this.getSoundSource(), 1.0F, 1.0F); // Paper - send while respecting visibility
-+                                this.crit(target);
-+                            }
++                            sendSoundEffect(this, this.getX(), this.getY(), this.getZ(), SoundEvents.PLAYER_ATTACK_CRIT, this.getSoundSource(), 1.0F, 1.0F); // Paper - send while respecting visibility
+                             this.crit(target);
+                         }
  
--                        if (!flag2 && !flag3) {
--                            if (flag) {
+                         if (!flag2 && !flag3) {
+                             if (flag) {
 -                                this.level().playSound((Player) null, this.getX(), this.getY(), this.getZ(), SoundEvents.PLAYER_ATTACK_STRONG, this.getSoundSource(), 1.0F, 1.0F);
--                            } else {
++                                sendSoundEffect(this, this.getX(), this.getY(), this.getZ(), SoundEvents.PLAYER_ATTACK_STRONG, this.getSoundSource(), 1.0F, 1.0F); // Paper - send while respecting visibility
+                             } else {
 -                                this.level().playSound((Player) null, this.getX(), this.getY(), this.getZ(), SoundEvents.PLAYER_ATTACK_WEAK, this.getSoundSource(), 1.0F, 1.0F);
-+                            if (!flag2 && !flag3) {
-+                                if (flag) {
-+                                    sendSoundEffect(this, this.getX(), this.getY(), this.getZ(), SoundEvents.PLAYER_ATTACK_STRONG, this.getSoundSource(), 1.0F, 1.0F); // Paper - send while respecting visibility
-+                                } else {
-+                                    sendSoundEffect(this, this.getX(), this.getY(), this.getZ(), SoundEvents.PLAYER_ATTACK_WEAK, this.getSoundSource(), 1.0F, 1.0F); // Paper - send while respecting visibility
-+                                }
++                                sendSoundEffect(this, this.getX(), this.getY(), this.getZ(), SoundEvents.PLAYER_ATTACK_WEAK, this.getSoundSource(), 1.0F, 1.0F); // Paper - send while respecting visibility
                              }
--                        }
+                         }
  
-                         if (f1 > 0.0F) {
-                             this.magicCrit(target);
 @@ -0,0 +0,0 @@ public abstract class Player extends LivingEntity {
-                             }
-                         }
  
--                        this.causeFoodExhaustion(this.level().spigotConfig.combatExhaustion, EntityExhaustionEvent.ExhaustionReason.ATTACK); // CraftBukkit - EntityExhaustionEvent // Spigot - Change to use configurable value
--                    } else {
+                         this.causeFoodExhaustion(this.level().spigotConfig.combatExhaustion, EntityExhaustionEvent.ExhaustionReason.ATTACK); // CraftBukkit - EntityExhaustionEvent // Spigot - Change to use configurable value
+                     } else {
 -                        this.level().playSound((Player) null, this.getX(), this.getY(), this.getZ(), SoundEvents.PLAYER_ATTACK_NODAMAGE, this.getSoundSource(), 1.0F, 1.0F);
--                        // CraftBukkit start - resync on cancelled event
--                        if (this instanceof ServerPlayer) {
--                            ((ServerPlayer) this).getBukkitEntity().updateInventory();
-+                            this.causeFoodExhaustion(this.level().spigotConfig.combatExhaustion, EntityExhaustionEvent.ExhaustionReason.ATTACK); // CraftBukkit - EntityExhaustionEvent // Spigot - Change to use configurable value
-+                        } else {
-+                            sendSoundEffect(this, this.getX(), this.getY(), this.getZ(), SoundEvents.PLAYER_ATTACK_NODAMAGE, this.getSoundSource(), 1.0F, 1.0F); // Paper - send while respecting visibility
-+                            if (flag4) {
-+                                target.clearFire();
-+                            }
-+                            // CraftBukkit start - resync on cancelled event
-+                            if (this instanceof ServerPlayer) {
-+                                ((ServerPlayer) this).getBukkitEntity().updateInventory();
-+                            }
-+                            // CraftBukkit end
-                         }
--                        // CraftBukkit end
-                     }
--                }
- 
-             }
-         }
++                        sendSoundEffect(this, this.getX(), this.getY(), this.getZ(), SoundEvents.PLAYER_ATTACK_NODAMAGE, this.getSoundSource(), 1.0F, 1.0F); // Paper - send while respecting visibility
+                         // CraftBukkit start - resync on cancelled event
+                         if (this instanceof ServerPlayer) {
+                             ((ServerPlayer) this).getBukkitEntity().updateInventory();
 @@ -0,0 +0,0 @@ public abstract class Player extends LivingEntity {
      public int getXpNeededForNextLevel() {
          return this.experienceLevel >= 30 ? 112 + (this.experienceLevel - 30) * 9 : (this.experienceLevel >= 15 ? 37 + (this.experienceLevel - 15) * 5 : 7 + this.experienceLevel * 2);
      }
 +    // Paper start - send while respecting visibility
 +    private static void sendSoundEffect(Player fromEntity, double x, double y, double z, SoundEvent soundEffect, SoundSource soundCategory, float volume, float pitch) {
-+        fromEntity.level().playSound(fromEntity, x, y, z, soundEffect, soundCategory, volume, pitch); // This will not send the effect to the entity himself
-+        if (fromEntity instanceof ServerPlayer) {
-+            ((ServerPlayer) fromEntity).connection.send(new net.minecraft.network.protocol.game.ClientboundSoundPacket(net.minecraft.core.registries.BuiltInRegistries.SOUND_EVENT.wrapAsHolder(soundEffect), soundCategory, x, y, z, volume, pitch, fromEntity.random.nextLong()));
++        fromEntity.level().playSound(fromEntity, x, y, z, soundEffect, soundCategory, volume, pitch); // This will not send the effect to the entity itself
++        if (fromEntity instanceof ServerPlayer serverPlayer) {
++            serverPlayer.connection.send(new net.minecraft.network.protocol.game.ClientboundSoundPacket(net.minecraft.core.registries.BuiltInRegistries.SOUND_EVENT.wrapAsHolder(soundEffect), soundCategory, x, y, z, volume, pitch, fromEntity.random.nextLong()));
 +        }
 +    }
 +    // Paper end - send while respecting visibility