From d7493c0fdea8845c1d523d9cc157eda7636001ac Mon Sep 17 00:00:00 2001
From: Atsuihsio <842960157@qq.com>
Date: Sun, 29 Sep 2024 14:02:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=BC=B9=E9=81=93=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=EF=BC=8C=E6=9B=B4=E6=94=B9=E5=85=B3=E9=97=AD=E8=A7=86?=
 =?UTF-8?q?=E8=A7=92=E6=91=87=E6=99=83=E9=85=8D=E7=BD=AE=E7=9A=84=E7=9B=AE?=
 =?UTF-8?q?=E6=A0=87=E8=8C=83=E5=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../event/ClientEventHandler.java              | 18 ++++++++----------
 .../geo/projectile_entity.geo.json             |  2 +-
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/main/java/net/mcreator/superbwarfare/event/ClientEventHandler.java b/src/main/java/net/mcreator/superbwarfare/event/ClientEventHandler.java
index 15f174ef7..58e6fc4f2 100644
--- a/src/main/java/net/mcreator/superbwarfare/event/ClientEventHandler.java
+++ b/src/main/java/net/mcreator/superbwarfare/event/ClientEventHandler.java
@@ -537,17 +537,15 @@ public class ClientEventHandler {
             angle = Math.atan(0.6 / (lookDistance + 2.9)) * Mth.RAD_TO_DEG;
         }
 
-        if (DisplayConfig.CAMERA_ROTATE.get()) {
-            if (player.getMainHandItem().is(ModTags.Items.GUN) || (player.getVehicle() != null && (player.getVehicle() instanceof ICannonEntity))) {
-                event.setPitch((float) (pitch + cameraRot[0] + 0.2 * turnRot[0] + 3 * velocityY));
-                if (Minecraft.getInstance().options.getCameraType() == CameraType.THIRD_PERSON_BACK) {
-                    event.setYaw((float) (yaw + cameraRot[1] + 0.8 * turnRot[1] - angle * zoomPos));
-                } else {
-                    event.setYaw((float) (yaw + cameraRot[1] + 0.8 * turnRot[1]));
-                }
-
-                event.setRoll((float) (roll + cameraRot[2] + 0.35 * turnRot[2]));
+        if (player.getMainHandItem().is(ModTags.Items.GUN) || (player.getVehicle() != null && (player.getVehicle() instanceof ICannonEntity))) {
+            event.setPitch((float) (pitch + cameraRot[0] + (DisplayConfig.CAMERA_ROTATE.get() ? 0.2 : 0) * turnRot[0] + 3 * velocityY));
+            if (Minecraft.getInstance().options.getCameraType() == CameraType.THIRD_PERSON_BACK) {
+                event.setYaw((float) (yaw + cameraRot[1] + (DisplayConfig.CAMERA_ROTATE.get() ? 0.8 : 0) * turnRot[1] - angle * zoomPos));
+            } else {
+                event.setYaw((float) (yaw + cameraRot[1] + (DisplayConfig.CAMERA_ROTATE.get() ? 0.8 : 0) * turnRot[1]));
             }
+
+            event.setRoll((float) (roll + cameraRot[2] + (DisplayConfig.CAMERA_ROTATE.get() ? 0.35 : 0) * turnRot[2]));
         }
     }
 
diff --git a/src/main/resources/assets/superbwarfare/geo/projectile_entity.geo.json b/src/main/resources/assets/superbwarfare/geo/projectile_entity.geo.json
index 98ec7da86..17c1fac35 100644
--- a/src/main/resources/assets/superbwarfare/geo/projectile_entity.geo.json
+++ b/src/main/resources/assets/superbwarfare/geo/projectile_entity.geo.json
@@ -19,7 +19,7 @@
 					"name": "bone2",
 					"parent": "bone",
 					"pivot": [-0.16703, -30.85427, 0],
-					"rotation": [-90, 0, -3.75],
+					"rotation": [-90, 0, 0],
 					"cubes": [
 						{
 							"origin": [-2.34303, -33.03027, 10.5525],