From 16fe7229354456f9f1063c9d790cc1b5c02d9e10 Mon Sep 17 00:00:00 2001
From: 17146 <1714673995@qq.com>
Date: Sat, 25 May 2024 00:01:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=84=8F=E5=A4=96=E5=81=9C?=
 =?UTF-8?q?=E6=AD=A2=E9=9F=B3=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../net/mcreator/target/event/LivingEventHandler.java | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/main/java/net/mcreator/target/event/LivingEventHandler.java b/src/main/java/net/mcreator/target/event/LivingEventHandler.java
index 79f79c3b0..466b1c7cd 100644
--- a/src/main/java/net/mcreator/target/event/LivingEventHandler.java
+++ b/src/main/java/net/mcreator/target/event/LivingEventHandler.java
@@ -13,7 +13,6 @@ import net.mcreator.target.network.message.PlayerGunKillMessage;
 import net.mcreator.target.tools.SoundTool;
 import net.minecraft.network.protocol.game.ClientboundStopSoundPacket;
 import net.minecraft.resources.ResourceKey;
-import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.sounds.SoundSource;
 import net.minecraft.world.damagesource.DamageSource;
@@ -155,14 +154,14 @@ public class LivingEventHandler {
     @SubscribeEvent
     public static void handleChangeSlot(LivingEquipmentChangeEvent event) {
         if (event.getEntity() instanceof Player player && event.getSlot() == EquipmentSlot.MAINHAND) {
-            if (player.level().isClientSide || player.level().getServer() == null) {
+            if (player.level().isClientSide) {
                 return;
             }
 
             ItemStack oldStack = event.getFrom();
             ItemStack newStack = event.getTo();
 
-            if (player.level() instanceof ServerLevel serverLevel) {
+            if (player instanceof ServerPlayer serverPlayer) {
                 var newTag = newStack.getTag();
                 var oldTag = oldStack.getTag();
 
@@ -176,7 +175,7 @@ public class LivingEventHandler {
                     }
 
                     if (oldStack.getItem() instanceof GunItem oldGun) {
-                        stopGunReloadSound(serverLevel, oldGun);
+                        stopGunReloadSound(serverPlayer, oldGun);
                     }
 
                     player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
@@ -195,10 +194,10 @@ public class LivingEventHandler {
         }
     }
 
-    private static void stopGunReloadSound(ServerLevel server, GunItem gun) {
+    private static void stopGunReloadSound(ServerPlayer player, GunItem gun) {
         gun.getReloadSound().forEach(sound -> {
             var clientboundstopsoundpacket = new ClientboundStopSoundPacket(sound.getLocation(), SoundSource.PLAYERS);
-            server.players().forEach(p -> p.connection.send(clientboundstopsoundpacket));
+            player.connection.send(clientboundstopsoundpacket);
         });
     }