From 2cc7362d22c1675ff27266d73b03e098493d9a53 Mon Sep 17 00:00:00 2001
From: Atsuihsio <842960157@qq.com>
Date: Sun, 22 Sep 2024 17:10:56 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E6=88=98=E6=9C=AF=E5=86=B2?=
 =?UTF-8?q?=E5=88=BA=E7=AC=AC=E4=B8=89=E4=BA=BA=E7=A7=B0=E5=8A=A8=E7=94=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../superbwarfare/event/PlayerEventHandler.java    | 14 +++++++-------
 .../net/mcreator/superbwarfare/tools/PoseTool.java |  7 +------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/main/java/net/mcreator/superbwarfare/event/PlayerEventHandler.java b/src/main/java/net/mcreator/superbwarfare/event/PlayerEventHandler.java
index 1bf698596..f57833d31 100644
--- a/src/main/java/net/mcreator/superbwarfare/event/PlayerEventHandler.java
+++ b/src/main/java/net/mcreator/superbwarfare/event/PlayerEventHandler.java
@@ -46,6 +46,13 @@ public class PlayerEventHandler {
             return;
         }
 
+        player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
+            capability.zoom = false;
+            capability.tacticalSprintExhaustion = false;
+            capability.tacticalSprintTime = 600;
+            capability.syncPlayerVariables(player);
+        });
+
         if (!ModVariables.MapVariables.get(player.level()).pvpMode) {
             return;
         }
@@ -55,13 +62,6 @@ public class PlayerEventHandler {
                 stack.getOrCreateTag().putInt("ammo", stack.getOrCreateTag().getInt("mag"));
             }
         }
-
-        player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
-            capability.zoom = false;
-            capability.tacticalSprintExhaustion = false;
-            capability.tacticalSprintTime = 600;
-            capability.syncPlayerVariables(player);
-        });
     }
 
     @SubscribeEvent
diff --git a/src/main/java/net/mcreator/superbwarfare/tools/PoseTool.java b/src/main/java/net/mcreator/superbwarfare/tools/PoseTool.java
index f67b47daa..848864280 100644
--- a/src/main/java/net/mcreator/superbwarfare/tools/PoseTool.java
+++ b/src/main/java/net/mcreator/superbwarfare/tools/PoseTool.java
@@ -2,7 +2,6 @@ package net.mcreator.superbwarfare.tools;
 
 import net.minecraft.client.model.HumanoidModel;
 import net.minecraft.world.InteractionHand;
-import net.minecraft.world.effect.MobEffects;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.item.ItemStack;
 import net.minecraftforge.api.distmarker.Dist;
@@ -18,11 +17,7 @@ public class PoseTool {
                 || stack.getOrCreateTag().getBoolean("sentinel_is_charging")) {
             return HumanoidModel.ArmPose.CROSSBOW_CHARGE;
         } else if (entityLiving.isSprinting() && entityLiving.onGround() && entityLiving.getPersistentData().getDouble("noRun") == 0) {
-            if (entityLiving.hasEffect(MobEffects.MOVEMENT_SPEED)) {
-                return HumanoidModel.ArmPose.THROW_SPEAR;
-            } else {
-                return HumanoidModel.ArmPose.CROSSBOW_CHARGE;
-            }
+            return HumanoidModel.ArmPose.CROSSBOW_CHARGE;
         } else {
             return HumanoidModel.ArmPose.BOW_AND_ARROW;
         }