1.18.2 NMS target

mcmonkeyprojects · Mar 1, 2022 · 677c98b · 677c98b
1 parent 4d8ecda
commit 677c98b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -13,7 +13,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <bukkit.version>1.18.1-R0.1-SNAPSHOT</bukkit.version>
+        <bukkit.version>1.18.2-R0.1-SNAPSHOT</bukkit.version>
         <citizens.version>2.0.29-SNAPSHOT</citizens.version>
         <BUILD_NUMBER>Unknown</BUILD_NUMBER>
     </properties>

diff --git a/src/main/java/org/mcmonkey/sentinel/utilities/SentinelNMSHelper.java b/src/main/java/org/mcmonkey/sentinel/utilities/SentinelNMSHelper.java
@@ -48,11 +48,12 @@ public static void init() {
                 String playerAttackMethod = null, attackStrengthField = null;
                 boolean isCompat = false;
                 if (SentinelVersionCompat.v1_18 && !SentinelVersionCompat.vFuture) { // 1.18 names
-                    endermanAngryField = "bY"; // EnderMan#DATA_CREEPY
-                    playerAttackMethod = "d"; // Player#attack(Entity)
-                    attackStrengthField = "aR"; // LivingEntity#attackStrengthTicker
-                    broadcastEffectMethod = "a"; // Level#broadcastEntityEvent
-                    dataWatcherSet = "b"; // SynchedEntityData#set
+                    // https://minidigger.github.io/MiniMappingViewer/#/mojang/server/1.18.2
+                    endermanAngryField = "bX"; // net.minecraft.world.entity.monster.EnderMan#DATA_CREEPY
+                    playerAttackMethod = "d"; // net.minecraft.world.entity.player.Player#attack(Entity)
+                    attackStrengthField = "aQ"; // net.minecraft.world.entity.LivingEntity#attackStrengthTicker
+                    broadcastEffectMethod = "a"; // net.minecraft.world.level.Level#broadcastEntityEvent(Entity,byte)
+                    dataWatcherSet = "b"; // net.minecraft.network.syncher.SynchedEntityData#set
                     isCompat = true;
                 }
                 else if (!SentinelVersionCompat.v1_18) { // 1.17 names