1.19.4

Author: mcmonkey4eva

README.md

@@ -24,7 +24,7 @@ Sentinel NPCs: Combat NPCs for Spigot!
 
 ![AnimatedSentinel](https://i.imgur.com/VDwTzrs.gif)
 
-**Version 2.7.1**: Compatible with Spigot 1.8.8 through 1.19.2 (Primarily targeted at 1.19.2) - see 'Common Issues' section below if on older supported versions)
+**Version 2.7.3**: Compatible with Spigot 1.8.8 through 1.19.4 (Primarily targeted at 1.19.4) - see 'Common Issues' section below if on older supported versions)
 
 ### Downloads
 
@@ -346,7 +346,7 @@ If you're building a separate plugin you would like to integrate into Sentinel,
         <dependency>
             <groupId>org.mcmonkey</groupId>
             <artifactId>sentinel</artifactId>
-            <version>2.7.1-SNAPSHOT</version>
+            <version>2.7.3-SNAPSHOT</version>
             <type>jar</type>
             <scope>provided</scope>
             <exclusions>

pom.xml

@@ -7,14 +7,14 @@
     <groupId>org.mcmonkey</groupId>
     <artifactId>sentinel</artifactId>
     <packaging>jar</packaging>
-    <version>2.7.2-SNAPSHOT</version>
+    <version>2.7.3-SNAPSHOT</version>
     <name>Sentinel</name>
     <description>Combat NPCs for Spigot</description>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <bukkit.version>1.19.3-R0.1-SNAPSHOT</bukkit.version>
-        <citizens.version>2.0.30-SNAPSHOT</citizens.version>
+        <bukkit.version>1.19.4-R0.1-SNAPSHOT</bukkit.version>
+        <citizens.version>2.0.31-SNAPSHOT</citizens.version>
         <BUILD_NUMBER>Unknown</BUILD_NUMBER>
     </properties>
 

src/main/java/org/mcmonkey/sentinel/targeting/SentinelTarget.java

@@ -119,7 +119,7 @@ public class SentinelTarget {
     /**
      * Valid target types for 1.19 or higher.
      */
-    public static SentinelTarget TADPOLES, FROGS, ALLAYS, WARDENS, CAMELS;
+    public static SentinelTarget TADPOLES, FROGS, ALLAYS, WARDENS, CAMELS, SNIFFERS;
 
     /**
      * Multiple-entity-type targets.

src/main/java/org/mcmonkey/sentinel/utilities/SentinelNMSHelper.java

@@ -43,10 +43,10 @@ public static void init() {
                 nmsLivingEntity = Class.forName("net.minecraft.world.entity.EntityLiving");
                 String attackStrengthField = null;
                 boolean isCompat = false;
-                if (SentinelVersionCompat.v1_19 && !SentinelVersionCompat.vFuture) { // 1.19.3 names
-                    // https://minidigger.github.io/MiniMappingViewer/#/mojang/server/1.19.3
-                    endermanAngryField = "bZ"; // net.minecraft.world.entity.monster.EnderMan#DATA_CREEPY
-                    attackStrengthField = "aQ"; // net.minecraft.world.entity.LivingEntity#attackStrengthTicker
+                if (SentinelVersionCompat.v1_19 && !SentinelVersionCompat.vFuture) { // 1.19.4 names
+                    // https://minidigger.github.io/MiniMappingViewer/#/mojang/server/1.19.4
+                    endermanAngryField = "bU"; // net.minecraft.world.entity.monster.EnderMan#DATA_CREEPY
+                    attackStrengthField = "aO"; // 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;

src/main/java/org/mcmonkey/sentinel/utilities/SentinelVersionCompat.java

@@ -187,9 +187,10 @@ public class SentinelVersionCompat {
             SentinelTarget.WARDENS = new SentinelTarget(new EntityType[]{EntityType.WARDEN}, "WARDEN");
             try {
                 SentinelTarget.CAMELS = new SentinelTarget(new EntityType[]{EntityType.valueOf("CAMEL")}, "CAMEL");
+                SentinelTarget.SNIFFERS = new SentinelTarget(new EntityType[]{EntityType.valueOf("SNIFFER")}, "SNIFFER");
             }
             catch (Throwable ex) {
-                // ignore: 1.19.2 lacked camels.
+                // ignore: 1.19.2 lacked camels, 1.19.3 lacked sniffers.
             }
         }
         if (v1_19) { // && !v1_20
@@ -455,6 +456,9 @@ static EntityType[] v1_19_passive() {
         if (SentinelTarget.CAMELS != null) {
             res = combine(res, EntityType.valueOf("CAMEL"));
         }
+        if (SentinelTarget.SNIFFERS != null) {
+            res = combine(res, EntityType.valueOf("SNIFFER"));
+        }
         return res;
     }