From eecf61168ab15351690c6528d2cdb2a487837ab4 Mon Sep 17 00:00:00 2001 From: Atsuihsio <842960157@qq.com> Date: Mon, 21 Oct 2024 05:26:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=A0=E6=B3=95=E8=B0=83?= =?UTF-8?q?=E8=8A=82=E8=87=AA=E5=AE=9A=E4=B9=89=E7=BC=A9=E6=94=BE=E5=80=8D?= =?UTF-8?q?=E7=8E=87BUG=EF=BC=8C=E4=BF=AE=E5=A4=8D=E6=8D=A2=E5=BC=B9?= =?UTF-8?q?=E5=8A=A8=E7=94=BBBUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/net/mcreator/superbwarfare/client/ClickHandler.java | 2 +- .../net/mcreator/superbwarfare/item/gun/rifle/AK12Item.java | 2 +- .../superbwarfare/network/message/AdjustZoomFovMessage.java | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/mcreator/superbwarfare/client/ClickHandler.java b/src/main/java/net/mcreator/superbwarfare/client/ClickHandler.java index f6d414c76..3d8bf5da8 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/ClickHandler.java +++ b/src/main/java/net/mcreator/superbwarfare/client/ClickHandler.java @@ -131,7 +131,7 @@ public class ClickHandler { if (stack.is(ModTags.Items.GUN) && player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables()).zoom) { var tag = stack.getOrCreateTag(); - if (tag.getDouble("min_zoom") != 0 && tag.getDouble("max_zoom") != 0) { + if (tag.getBoolean("CanAdjustZoomFov")) { ModUtils.PACKET_HANDLER.sendToServer(new AdjustZoomFovMessage(scroll)); } event.setCanceled(true); diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/AK12Item.java b/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/AK12Item.java index 0d472bef8..60fb65bc3 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/AK12Item.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/AK12Item.java @@ -90,7 +90,7 @@ public class AK12Item extends GunItem implements GeoItem, AnimatedItem { } if (stack.getOrCreateTag().getBoolean("is_normal_reloading")) { - if (stack.getOrCreateTag().getInt("magazine_type") == 2) { + if (GunsTool.getAttachmentType(stack, GunsTool.AttachmentType.MAGAZINE) == 2) { return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak12.reload_normal_drum")); } else { return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak12.reload_normal")); diff --git a/src/main/java/net/mcreator/superbwarfare/network/message/AdjustZoomFovMessage.java b/src/main/java/net/mcreator/superbwarfare/network/message/AdjustZoomFovMessage.java index 2a45e3edc..537f6ed1c 100644 --- a/src/main/java/net/mcreator/superbwarfare/network/message/AdjustZoomFovMessage.java +++ b/src/main/java/net/mcreator/superbwarfare/network/message/AdjustZoomFovMessage.java @@ -39,7 +39,6 @@ public class AdjustZoomFovMessage { } var tag = stack.getOrCreateTag(); - if (!tag.getBoolean("CanAdjustZoomFov")) return; double min_zoom = tag.getDouble("MinZoom") - 1.25; double max_zoom = tag.getDouble("MaxZoom") - 1.25;