v 1.4.4, 1.21 support

hraponssi · Jun 15, 2024 · 3240d66 · 3240d66
1 parent 1b03f4b
commit 3240d66
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
 	<groupId>DragonDmg</groupId>
 	<artifactId>DragonDmg</artifactId>
-	<version>1.4.3</version>
+	<version>1.4.4</version>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -35,7 +35,7 @@
 		<dependency>
 			<groupId>org.spigotmc</groupId>
 			<artifactId>spigot-api</artifactId>
-			<version>1.20.4-R0.1-SNAPSHOT</version>
+			<version>1.21-R0.1-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>

diff --git a/src/main/java/net/hraponssi/dragondmg/main/EventHandlers.java b/src/main/java/net/hraponssi/dragondmg/main/EventHandlers.java
@@ -137,7 +137,8 @@ public void onEntityDamagedByEntity(EntityDamageByEntityEvent e) { //Track diffe
                 } else {
                     dragonDamage.put(p.getName(), e.getDamage());
                 }
-            } else if (type.equals(EntityType.ENDER_CRYSTAL)) {
+            // hacky way to get around END vs ENDER
+            } else if (type.name().startsWith("END") && type.name().endsWith("_CRYSTAL")) {
                 if (crystalKills.containsKey(p.getName())) {
                     int num = crystalKills.get(p.getName());
                     crystalKills.replace(p.getName(), num + 1);
@@ -157,7 +158,7 @@ public void onEntityDamagedByEntity(EntityDamageByEntityEvent e) { //Track diffe
                     } else {
                         dragonDamage.put(p.getName(), e.getDamage());
                     }
-                } else if (type.equals(EntityType.ENDER_CRYSTAL)) {
+                } else if (type.name().startsWith("END") && type.name().endsWith("_CRYSTAL")) {
                     if (crystalKills.containsKey(p.getName())) {
                         int num = crystalKills.get(p.getName());
                         crystalKills.replace(p.getName(), num + 1);
@@ -178,7 +179,7 @@ public void onEntityDamagedByEntity(EntityDamageByEntityEvent e) { //Track diffe
                     } else {
                         dragonDamage.put(p.getName(), e.getDamage());
                     }
-                } else if (type.equals(EntityType.ENDER_CRYSTAL)) {
+                } else if (type.name().startsWith("END") && type.name().endsWith("_CRYSTAL")) {
                     if (crystalKills.containsKey(p.getName())) {
                         int num = crystalKills.get(p.getName());
                         crystalKills.replace(p.getName(), num + 1);