small optimization for older servers

GrimAnticheat · Jan 2, 2025 · 1ce5a53 · 1ce5a53
1 parent 61e5064
commit 1ce5a53
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/src/main/java/ac/grim/grimac/player/GrimPlayer.java b/src/main/java/ac/grim/grimac/player/GrimPlayer.java
@@ -804,11 +804,6 @@ public boolean isUsingBukkitItem() {
         Consumer<Player> resetActiveBukkitItem0 = null;
 
         try {
-            try { // paper 1.16+
-                LivingEntity.class.getMethod("clearActiveItem");
-                resetActiveBukkitItem0 = LivingEntity::clearActiveItem;
-            } catch (NoSuchMethodException ignored) {}
-
             if (version == ServerVersion.V_1_8_8) {
                 Class<?> EntityHuman = Class.forName("net.minecraft.server.v1_8_R3.EntityHuman");
                 Method getHandle = Class.forName("org.bukkit.craftbukkit.v1_8_R3.entity.CraftPlayer").getMethod("getHandle");
@@ -878,6 +873,10 @@ public boolean isUsingBukkitItem() {
                 };
             } else if (version.isNewerThanOrEquals(ServerVersion.V_1_17_1)) {
                 isUsingBukkitItem0 = player -> player.getItemInUse() != null;
+                try { // paper only
+                    LivingEntity.class.getMethod("clearActiveItem");
+                    resetActiveBukkitItem0 = LivingEntity::clearActiveItem;
+                } catch (NoSuchMethodException ignored) {}
             }
         } catch (ClassNotFoundException | NoSuchMethodException e) {
             throw new RuntimeException(e);