diff --git a/pom.xml b/pom.xml
index 99ef39d..fa90e3b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,14 +6,14 @@
 
     <groupId>me.kadotcom</groupId>
     <artifactId>LifeStolen</artifactId>
-    <version>5.0</version>
+    <version>5.1</version>
     <packaging>jar</packaging>
 
     <name>LifeStolen</name>
 
     <description>Another lifesteal plugin.</description>
     <properties>
-        <java.version>1.8</java.version>
+        <java.version>21</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
@@ -69,17 +69,17 @@
     </repositories>
 
     <dependencies>
-        <dependency>
-            <groupId>org.spigotmc</groupId>
-            <artifactId>spigot-api</artifactId>
-            <version>1.18.1-R0.1-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>net.quazar.offlinemanager</groupId>
             <artifactId>api</artifactId>
             <version>3.1.4</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.spigotmc</groupId>
+            <artifactId>spigot-api</artifactId>
+            <version>1.21-R0.1-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
-</project>
+</project>
\ No newline at end of file
diff --git a/src/main/java/me/kadotcom/lifestolen/Events/LifeStealEvent.java b/src/main/java/me/kadotcom/lifestolen/Events/LifeStealEvent.java
index 88ab40c..2fce57b 100644
--- a/src/main/java/me/kadotcom/lifestolen/Events/LifeStealEvent.java
+++ b/src/main/java/me/kadotcom/lifestolen/Events/LifeStealEvent.java
@@ -82,13 +82,13 @@ public void onPlayerDeath(PlayerDeathEvent event) {
 
                 } else if (HealthManager.getMaxHealth(p) <= 2.0) {
                     System.out.println("Player " + e.getName() + " Killed " + p.getName());
-                    if(event.getEntityType() != EntityType.PLAYER && event.getEntityType() != EntityType.PRIMED_TNT && event.getEntityType() != EntityType.MINECART_TNT && event.getEntityType() != EntityType.CREEPER  && event.getEntityType() != EntityType.SKELETON  && event.getEntityType() != EntityType.ARROW  && event.getEntityType() != EntityType.SPECTRAL_ARROW) {
+                    if(event.getEntityType() != EntityType.PLAYER && !event.getEntityType().equals(EntityType.TNT)  && !event.getEntityType().equals(EntityType.TNT_MINECART) && event.getEntityType() != EntityType.CREEPER  && event.getEntityType() != EntityType.SKELETON  && event.getEntityType() != EntityType.ARROW  && event.getEntityType() != EntityType.SPECTRAL_ARROW) {
                         dm = plugin.getConfig().getString("translation.deathMessages.generic").replace("&", "§").replace("${player}", p.getName()).replace("${attacker}", event.getEntityType().name());
                         event.setDeathMessage(dm);
                     }else if(event.getEntityType() == EntityType.PLAYER){
                         dm = plugin.getConfig().getString("translation.deathMessages.generic").replace("&", "§").replace("${player}", p.getName()).replace("${attacker}", e.getName());
                         event.setDeathMessage(dm);
-                    }else if (event.getEntityType() == EntityType.CREEPER || event.getEntityType() == EntityType.MINECART_TNT || event.getEntityType() == EntityType.PRIMED_TNT) {
+                    }else if (event.getEntityType() == EntityType.CREEPER || event.getEntityType().equals(EntityType.TNT) || event.getEntityType().equals(EntityType.TNT_MINECART)) {
                         dm = plugin.getConfig().getString("translation.deathMessages.explosion").replace("&", "§").replace("${player}", p.getName()).replace("${attacker}", event.getEntityType().name());
                         event.setDeathMessage(dm);
                     }else if(event.getEntityType() == EntityType.SKELETON || event.getEntityType() == EntityType.ARROW || event.getEntityType() == EntityType.SPECTRAL_ARROW) {