diff --git a/pom.xml b/pom.xml
index 1223150..810eee5 100755
--- a/pom.xml
+++ b/pom.xml
@@ -154,7 +154,7 @@
     <dependency>
       <groupId>io.papermc.paper</groupId>
       <artifactId>paper-api</artifactId>
-      <version>1.21.4-R0.1-SNAPSHOT</version>
+      <version>1.21.1-R0.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/src/main/java/net/coreprotect/listener/entity/EntityChangeBlockListener.java b/src/main/java/net/coreprotect/listener/entity/EntityChangeBlockListener.java
index 31aaf73..babb6b3 100644
--- a/src/main/java/net/coreprotect/listener/entity/EntityChangeBlockListener.java
+++ b/src/main/java/net/coreprotect/listener/entity/EntityChangeBlockListener.java
@@ -54,7 +54,7 @@ public final class EntityChangeBlockListener extends Queue implements Listener {
                     e = "#silverfish";
                 }
             }
-            else if (entity instanceof WindCharge) {
+            else if (entity.getType().name().equals("WIND_CHARGE")) {
                 e = "#windcharge";
             }
             else if (entity.getType().name().equals("BREEZE_WIND_CHARGE")) {
diff --git a/src/main/java/net/coreprotect/listener/entity/EntityDeathListener.java b/src/main/java/net/coreprotect/listener/entity/EntityDeathListener.java
index a5a38f8..f07052f 100644
--- a/src/main/java/net/coreprotect/listener/entity/EntityDeathListener.java
+++ b/src/main/java/net/coreprotect/listener/entity/EntityDeathListener.java
@@ -127,7 +127,7 @@ public final class EntityDeathListener extends Queue implements Listener {
             e = isCommand ? "#command" : "";
         }
 
-        if (entity.getType() == EntityType.GLOW_SQUID && damage.getCause() == DamageCause.DROWNING) {
+        if (entity.getType().name().equals("GLOW_SQUID") && damage.getCause() == DamageCause.DROWNING) {
             return;
         }
 
diff --git a/src/main/java/net/coreprotect/listener/entity/HangingBreakByEntityListener.java b/src/main/java/net/coreprotect/listener/entity/HangingBreakByEntityListener.java
index 806c550..adf0454 100755
--- a/src/main/java/net/coreprotect/listener/entity/HangingBreakByEntityListener.java
+++ b/src/main/java/net/coreprotect/listener/entity/HangingBreakByEntityListener.java
@@ -144,7 +144,12 @@ public final class HangingBreakByEntityListener extends Queue implements Listene
                 material = Material.PAINTING;
                 Painting painting = (Painting) entity;
                 blockData = "FACING=" + painting.getFacing().name();
-                itemData = MaterialUtils.getArtId(painting.getArt().toString(), true);
+                try {
+                    itemData = MaterialUtils.getArtId(painting.getArt().toString(), true);
+                }
+                catch (IncompatibleClassChangeError e) {
+                    // 1.21.2+
+                }
             }
 
             if (!event.isCancelled() && Config.getConfig(blockEvent.getWorld()).BLOCK_BREAK && !inspecting) {
diff --git a/src/main/java/net/coreprotect/listener/entity/HangingBreakListener.java b/src/main/java/net/coreprotect/listener/entity/HangingBreakListener.java
index 8c314bf..7bd5971 100644
--- a/src/main/java/net/coreprotect/listener/entity/HangingBreakListener.java
+++ b/src/main/java/net/coreprotect/listener/entity/HangingBreakListener.java
@@ -72,7 +72,12 @@ public final class HangingBreakListener extends Queue implements Listener {
                     material = Material.PAINTING;
                     Painting painting = (Painting) entity;
                     blockData = "FACING=" + painting.getFacing().name();
-                    itemData = MaterialUtils.getArtId(painting.getArt().toString(), true);
+                    try {
+                        itemData = MaterialUtils.getArtId(painting.getArt().toString(), true);
+                    }
+                    catch (IncompatibleClassChangeError e) {
+                        // 1.21.2+
+                    }
                 }
 
                 if (!event.isCancelled() && Config.getConfig(blockEvent.getWorld()).NATURAL_BREAK) {
diff --git a/src/main/java/net/coreprotect/listener/entity/HangingPlaceListener.java b/src/main/java/net/coreprotect/listener/entity/HangingPlaceListener.java
index 7ad03c3..b960c10 100644
--- a/src/main/java/net/coreprotect/listener/entity/HangingPlaceListener.java
+++ b/src/main/java/net/coreprotect/listener/entity/HangingPlaceListener.java
@@ -40,7 +40,13 @@ public final class HangingPlaceListener extends Queue implements Listener {
                 material = Material.PAINTING;
                 Painting painting = (Painting) entity;
                 blockData = "FACING=" + painting.getFacing().name();
-                artId = MaterialUtils.getArtId(painting.getArt().toString(), true);
+                try {
+                    artId = MaterialUtils.getArtId(painting.getArt().toString(), true);
+                }
+                catch (IncompatibleClassChangeError e) {
+                    artId = 0;
+                    // 1.21.2+
+                }
             }
 
             int inspect = 0;
diff --git a/src/main/java/net/coreprotect/utility/entity/HangingUtil.java b/src/main/java/net/coreprotect/utility/entity/HangingUtil.java
index 404035d..4ae6348 100644
--- a/src/main/java/net/coreprotect/utility/entity/HangingUtil.java
+++ b/src/main/java/net/coreprotect/utility/entity/HangingUtil.java
@@ -16,7 +16,6 @@ import org.bukkit.inventory.ItemStack;
 
 import net.coreprotect.bukkit.BukkitAdapter;
 import net.coreprotect.model.BlockGroup;
-import net.coreprotect.utility.Util;
 import net.coreprotect.utility.BlockUtils;
 import net.coreprotect.utility.MaterialUtils;