From 4db8d97bc692c4dee9e411ce7263d19ce50cb266 Mon Sep 17 00:00:00 2001
From: Atsuihsio <842960157@qq.com>
Date: Sun, 7 Jul 2024 18:27:48 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=96=B0=E6=B7=BB=E5=8A=A0=E5=BC=B9?=
 =?UTF-8?q?=E5=8C=A3=E4=B8=BA=E7=A9=BA=E5=B7=A6=E9=94=AE=E7=9B=B4=E6=8E=A5?=
 =?UTF-8?q?=E6=8D=A2=E5=BC=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mcreator/target/event/ClientEventHandler.java    | 12 ++----------
 .../mcreator/target/network/message/FireMessage.java |  7 +++++++
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/main/java/net/mcreator/target/event/ClientEventHandler.java b/src/main/java/net/mcreator/target/event/ClientEventHandler.java
index b65f9c261..b0ad1b860 100644
--- a/src/main/java/net/mcreator/target/event/ClientEventHandler.java
+++ b/src/main/java/net/mcreator/target/event/ClientEventHandler.java
@@ -206,19 +206,11 @@ public class ClientEventHandler {
 
             if (-0.8 < velocity + 0.078 && velocity + 0.078 < 0.8) {
                 if (data.getDouble("vy") < entity.getDeltaMovement().y() + 0.078) {
-                    data.putDouble("vy",
-                            ((data.getDouble("vy") + 0.35 * Math.pow((velocity + 0.078) - data.getDouble("vy"), 2)) * (1 - 0.3 * data.getDouble("zoom_time"))));
+                    data.putDouble("vy",Mth.clamp(((data.getDouble("vy") + 0.35 * Math.pow((velocity + 0.078) - data.getDouble("vy"), 2)) * (1 - 0.8 * data.getDouble("zoom_time"))),-0.8,0.8));
                 } else {
-                    data.putDouble("vy",
-                            ((data.getDouble("vy") - 0.35 * Math.pow((velocity + 0.078) - data.getDouble("vy"), 2)) * (1 - 0.3 * data.getDouble("zoom_time"))));
+                    data.putDouble("vy",Mth.clamp(((data.getDouble("vy") - 0.35 * Math.pow((velocity + 0.078) - data.getDouble("vy"), 2)) * (1 - 0.8 * data.getDouble("zoom_time"))),-0.8,0.8));
                 }
             }
-            if (data.getDouble("vy") > 0.8) {
-                data.putDouble("vy", 0.8);
-            }
-            if (data.getDouble("vy") < -0.8) {
-                data.putDouble("vy", (-0.8));
-            }
         }
     }
 
diff --git a/src/main/java/net/mcreator/target/network/message/FireMessage.java b/src/main/java/net/mcreator/target/network/message/FireMessage.java
index 46de87990..a311d9147 100644
--- a/src/main/java/net/mcreator/target/network/message/FireMessage.java
+++ b/src/main/java/net/mcreator/target/network/message/FireMessage.java
@@ -1,5 +1,6 @@
 package net.mcreator.target.network.message;
 
+import net.mcreator.target.TargetMod;
 import net.mcreator.target.entity.*;
 import net.mcreator.target.event.GunEventHandler;
 import net.mcreator.target.init.*;
@@ -48,6 +49,8 @@ public class FireMessage {
         context.setPacketHandled(true);
     }
 
+
+
     public static void pressAction(Player player, int type) {
         Level world = player.level();
 
@@ -80,6 +83,10 @@ public class FireMessage {
 
         var tag = handItem.getOrCreateTag();
 
+        if (tag.getInt("ammo") == 0) {
+            TargetMod.PACKET_HANDLER.sendToServer(new ReloadMessage(0));
+        }
+
         if (handItem.getItem() == TargetModItems.TASER.get()) {
             handleTaserFire(player);
         }