Attempt to fix a false positive in the TotemProcessor

Bram1903 · Nov 4, 2024 · 8d69822 · 8d69822
1 parent 5a4e266
commit 8d69822
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -94,17 +94,17 @@ tasks {
     // 1.17           = Java 16
     // 1.18 - 1.20.4  = Java 17
     // 1-20.5+        = Java 21
-    val version = "1.21.1"
+    val version = "1.21.3"
     val javaVersion = JavaLanguageVersion.of(21)
 
     val jvmArgsExternal = listOf(
         "-Dcom.mojang.eula.agree=true"
     )
 
     val sharedPlugins = runPaper.downloadPluginsSpec {
-        url("https://ci.codemc.io/job/retrooper/job/packetevents/lastSuccessfulBuild/artifact/spigot/build/libs/packetevents-spigot-2.6.0-SNAPSHOT.jar")
-        url("https://github.com/ViaVersion/ViaVersion/releases/download/5.1.0/ViaVersion-5.1.0.jar")
-        url("https://github.com/ViaVersion/ViaBackwards/releases/download/5.1.0/ViaBackwards-5.1.0.jar")
+        url("https://ci.codemc.io/job/retrooper/job/packetevents/lastSuccessfulBuild/artifact/spigot/build/libs/packetevents-spigot-2.6.1-SNAPSHOT.jar")
+        url("https://github.com/ViaVersion/ViaVersion/releases/download/5.1.1/ViaVersion-5.1.1.jar")
+        url("https://github.com/ViaVersion/ViaBackwards/releases/download/5.1.1/ViaBackwards-5.1.1.jar")
     }
 
     runServer {

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 paper-api = "1.20.4-R0.1-SNAPSHOT"
-packetevents = "2.6.0-SNAPSHOT"
+packetevents = "2.6.0"
 lombok = "1.18.34"
 configlib = "4.5.0"
 shadow = "8.3.0"

diff --git a/src/main/java/com/deathmotion/totemguard/checks/impl/totem/processor/TotemProcessor.java b/src/main/java/com/deathmotion/totemguard/checks/impl/totem/processor/TotemProcessor.java
@@ -93,6 +93,8 @@ public void onInventoryClick(InventoryClickEvent event) {
         ItemStack currentItem = event.getCurrentItem();
         if (currentItem == null || currentItem.getType() != Material.TOTEM_OF_UNDYING) return;
 
+        expectingReEquip.put(player.getUniqueId(), false);
+
         handleTotemEvent(player);
     }
 
@@ -119,7 +121,6 @@ private void handleTotemEvent(Player player) {
 
             long currentTime = System.currentTimeMillis();
             Long totemUseTime = totemUsage.get(playerId);
-            expectingReEquip.put(playerId, false);
 
             TotemPlayer totemPlayer = userTracker.getTotemPlayer(playerId).orElse(null);
             if (totemPlayer == null) return;