From 677a82142fd9a0a87788c34e83da562384ee6e2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A4seToatz?= <airfryerkipcorn@gmail.com>
Date: Mon, 15 Jul 2024 23:28:53 +0200
Subject: [PATCH] fix some bugs

---
 gradle.properties                                     |  2 +-
 .../tridenthacks/mixin/ClientConnectionMixin.java     |  3 ++-
 .../tridenthacks/mixin/TridentItemMixin.java          | 11 +++++++----
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 04287f8..933a71e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx1G
 	loader_version=0.16.0
 
 # Mod Properties
-	mod_version = 1.2.2
+	mod_version = 1.2.3
 	maven_group = com.kasetoatz
 	archives_base_name = TridentHacks
 
diff --git a/src/main/java/com/kasetoatz/tridenthacks/mixin/ClientConnectionMixin.java b/src/main/java/com/kasetoatz/tridenthacks/mixin/ClientConnectionMixin.java
index 162597a..e8e5d60 100644
--- a/src/main/java/com/kasetoatz/tridenthacks/mixin/ClientConnectionMixin.java
+++ b/src/main/java/com/kasetoatz/tridenthacks/mixin/ClientConnectionMixin.java
@@ -3,6 +3,7 @@ package com.kasetoatz.tridenthacks.mixin;
 import com.kasetoatz.tridenthacks.config.Config;
 import com.kasetoatz.tridenthacks.TridentHacks;
 import net.minecraft.client.network.ClientPlayerEntity;
+import net.minecraft.item.Items;
 import net.minecraft.network.ClientConnection;
 import net.minecraft.network.packet.Packet;
 import net.minecraft.network.packet.c2s.play.PlayerActionC2SPacket;
@@ -22,7 +23,7 @@ public abstract class ClientConnectionMixin {
             ClientPlayerEntity player = TridentHacks.client.player;
             if (player != null)
             {
-                if (packet instanceof PlayerActionC2SPacket && TridentHacks.noNormalRiptide() && ((PlayerActionC2SPacket)packet).getAction() == PlayerActionC2SPacket.Action.RELEASE_USE_ITEM)
+                if (player.getActiveItem().getItem() == Items.TRIDENT && player.isUsingItem() && packet instanceof PlayerActionC2SPacket && TridentHacks.noNormalRiptide() && ((PlayerActionC2SPacket)packet).getAction() == PlayerActionC2SPacket.Action.RELEASE_USE_ITEM)
                 {
                     ci.cancel();
                 }
diff --git a/src/main/java/com/kasetoatz/tridenthacks/mixin/TridentItemMixin.java b/src/main/java/com/kasetoatz/tridenthacks/mixin/TridentItemMixin.java
index 58554ca..5efbe1d 100644
--- a/src/main/java/com/kasetoatz/tridenthacks/mixin/TridentItemMixin.java
+++ b/src/main/java/com/kasetoatz/tridenthacks/mixin/TridentItemMixin.java
@@ -25,12 +25,15 @@ public class TridentItemMixin {
         if (Config.toggleRiptide)
         {
             PlayerEntity player = TridentHacks.client.player;
-            if (TridentHacks.noNormalRiptide() && user == player && user.getItemUseTime() > 10)
+            if (user == player && user.getItemUseTime() > 10)
             {
-                world.playSoundFromEntity(player, SoundEvents.ITEM_TRIDENT_RIPTIDE_3.value(), SoundCategory.PLAYERS, 1.F, 1.F);
+                if (TridentHacks.noNormalRiptide())
+                {
+                    world.playSoundFromEntity(player, SoundEvents.ITEM_TRIDENT_RIPTIDE_3.value(), SoundCategory.PLAYERS, 1.F, 1.F);
+                    TridentHacks.lastTridentUse = System.currentTimeMillis();
+                }
+                TridentHacks.onGround = false;
             }
-            TridentHacks.lastTridentUse = System.currentTimeMillis();
-            TridentHacks.onGround = false;
         }
         else if (Config.returnToSameSlot && !TridentHacks.hasRiptide)
         {