From 337708ac0633c9bea9573871eed33f3da8047d4a Mon Sep 17 00:00:00 2001
From: 17146 <1714673995@qq.com>
Date: Sun, 19 May 2024 20:35:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E7=9E=84=E5=87=86=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mcreator/target/event/AimingHandler.java  | 23 -------------------
 .../target/event/PlayerEventHandler.java      | 12 ++++++++++
 2 files changed, 12 insertions(+), 23 deletions(-)
 delete mode 100644 src/main/java/net/mcreator/target/event/AimingHandler.java

diff --git a/src/main/java/net/mcreator/target/event/AimingHandler.java b/src/main/java/net/mcreator/target/event/AimingHandler.java
deleted file mode 100644
index 789352eea..000000000
--- a/src/main/java/net/mcreator/target/event/AimingHandler.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package net.mcreator.target.event;
-
-import net.mcreator.target.init.TargetModTags;
-import net.mcreator.target.network.TargetModVariables;
-import net.minecraft.world.item.ItemStack;
-import net.minecraftforge.event.TickEvent;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
-import net.minecraftforge.fml.common.Mod;
-
-@Mod.EventBusSubscriber
-public class AimingHandler {
-
-    @SubscribeEvent
-    public static void onPlayerTick(TickEvent.PlayerTickEvent event) {
-        if (event.phase == TickEvent.Phase.END && event.player != null) {
-            ItemStack itemstack = event.player.getMainHandItem();
-
-            if (itemstack.is(TargetModTags.Items.GUN)) {
-                itemstack.getOrCreateTag().putBoolean("aiming", event.player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables()).zooming);
-            }
-        }
-    }
-}
diff --git a/src/main/java/net/mcreator/target/event/PlayerEventHandler.java b/src/main/java/net/mcreator/target/event/PlayerEventHandler.java
index 377453b2e..376cd1386 100644
--- a/src/main/java/net/mcreator/target/event/PlayerEventHandler.java
+++ b/src/main/java/net/mcreator/target/event/PlayerEventHandler.java
@@ -54,6 +54,7 @@ public class PlayerEventHandler {
         }
 
         if (event.phase == TickEvent.Phase.END) {
+            handleAiming(player);
             handlePlayerProne(player);
             handlePlayerSprint(player);
             handleWeaponLevel(player);
@@ -72,6 +73,17 @@ public class PlayerEventHandler {
         }
     }
 
+    /**
+     * 判断玩家是否瞄准
+     */
+    private static void handleAiming(Player player) {
+        ItemStack itemstack = player.getMainHandItem();
+
+        if (itemstack.is(TargetModTags.Items.GUN)) {
+            itemstack.getOrCreateTag().putBoolean("aiming", player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables()).zooming);
+        }
+    }
+
     /**
      * 判断玩家是否趴下
      */