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; }