From 1891024bf1d37d657ebc045cd2643543769543eb Mon Sep 17 00:00:00 2001
From: libraryaddict <github@lib.co.nz>
Date: Tue, 6 Aug 2024 21:46:37 +1200
Subject: [PATCH] Fix entity trackers on 1.14 to 1.17

---
 .../disguise/utilities/reflection/ReflectionManager.java    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/reflection/ReflectionManager.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/reflection/ReflectionManager.java
index 1d7e33c5..b98d3ea6 100644
--- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/reflection/ReflectionManager.java
+++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/reflection/ReflectionManager.java
@@ -206,8 +206,10 @@ public class ReflectionManager {
             // In 1.12 to 1.13, it's all in EntityTrackerEntry
             // In 1.14+, we have it in EntityTracker in PlayerChunkMap
             if (NmsVersion.v1_14.isSupported()) {
-                clearEntityTracker = getNmsMethod("PlayerChunkMap$EntityTracker", "a", getNmsClass("EntityPlayer"));
-                addEntityTracker = getNmsMethod("PlayerChunkMap$EntityTracker", "b", getNmsClass("EntityPlayer"));
+                clearEntityTracker = getNmsMethod("PlayerChunkMap$EntityTracker", NmsVersion.v1_18.isSupported() ? "a" : "clear",
+                    getNmsClass("EntityPlayer"));
+                addEntityTracker = getNmsMethod("PlayerChunkMap$EntityTracker", NmsVersion.v1_18.isSupported() ? "b" : "updatePlayer",
+                    getNmsClass("EntityPlayer"));
             } else {
                 clearEntityTracker = getNmsMethod("EntityTrackerEntry", "clear", getNmsClass("EntityPlayer"));
                 addEntityTracker = getNmsMethod("EntityTrackerEntry", "updatePlayer", getNmsClass("EntityPlayer"));