From 15a4091c0e12ead101633c8d1d0850385e89a735 Mon Sep 17 00:00:00 2001 From: Light_Quanta Date: Tue, 18 Mar 2025 22:33:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9E=AA=E6=A2=B0=E7=AC=AC?= =?UTF-8?q?=E4=B8=89=E4=BA=BA=E7=A7=B0=E8=A7=86=E8=A7=92=E7=BC=A9=E6=94=BE?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/atsuishio/superbwarfare/mixins/CameraMixin.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/atsuishio/superbwarfare/mixins/CameraMixin.java b/src/main/java/com/atsuishio/superbwarfare/mixins/CameraMixin.java index 07d8e7891..5eb930cfa 100644 --- a/src/main/java/com/atsuishio/superbwarfare/mixins/CameraMixin.java +++ b/src/main/java/com/atsuishio/superbwarfare/mixins/CameraMixin.java @@ -27,8 +27,6 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import static com.atsuishio.superbwarfare.event.ClientEventHandler.zoom; - @Mixin(Camera.class) public abstract class CameraMixin { @@ -150,7 +148,11 @@ public abstract class CameraMixin { @Inject(method = "setup", at = @At("TAIL")) public void superbWarfare$setup(BlockGetter area, Entity entity, boolean thirdPerson, boolean inverseView, float tickDelta, CallbackInfo ci) { - if (Minecraft.getInstance().options.getCameraType() == CameraType.THIRD_PERSON_BACK && entity instanceof Player player && player.getMainHandItem().is(ModTags.Items.GUN) && zoom) { + if (Minecraft.getInstance().options.getCameraType() == CameraType.THIRD_PERSON_BACK + && entity instanceof Player player + && player.getMainHandItem().is(ModTags.Items.GUN) + && Math.max(ClientEventHandler.pullPos, ClientEventHandler.zoomPos) > 0 + ) { move(-getMaxZoom(-2.9 * Math.max(ClientEventHandler.pullPos, ClientEventHandler.zoomPos)), 0, -ClientEventHandler.cameraLocation * Math.max(ClientEventHandler.pullPos, ClientEventHandler.zoomPos)); return; }