diff --git a/build.gradle.kts b/build.gradle.kts
index 1da69b2..5905255 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 }
 
 group = "cn.lunadeer"
-version = "1.44.0-beta"
+version = "1.44.1-beta"
 
 java {
     toolchain.languageVersion.set(JavaLanguageVersion.of(21))
diff --git a/src/main/java/cn/lunadeer/dominion/events/EnvironmentEvents.java b/src/main/java/cn/lunadeer/dominion/events/EnvironmentEvents.java
index b61d272..9a909e4 100644
--- a/src/main/java/cn/lunadeer/dominion/events/EnvironmentEvents.java
+++ b/src/main/java/cn/lunadeer/dominion/events/EnvironmentEvents.java
@@ -18,8 +18,6 @@ import org.bukkit.event.entity.*;
 import org.bukkit.event.hanging.HangingBreakByEntityEvent;
 import org.bukkit.event.hanging.HangingBreakEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
-import org.bukkit.material.PressurePlate;
-import org.bukkit.material.PressureSensor;
 
 import java.util.Objects;
 
@@ -57,7 +55,7 @@ public class EnvironmentEvents implements Listener {
         if (entity.getType() != EntityType.ARMOR_STAND) {
             return;
         }
-        if (event.getDamager() instanceof Player) {
+        if (isNotExplodeEntity(event.getDamager())) {
             return;
         }
         DominionDTO dom = Cache.instance.getDominionByLoc(entity.getLocation());
@@ -82,10 +80,13 @@ public class EnvironmentEvents implements Listener {
     }
 
     private static boolean isNotExplodeEntity(Entity damager) {
-        return damager.getType() != EntityType.CREEPER
-                && damager.getType() != EntityType.WITHER_SKULL
-                && damager.getType() != EntityType.FIREBALL
-                && damager.getType() != EntityType.END_CRYSTAL;
+        String materialName = damager.getType().name();
+        return !materialName.equals("creeper")
+                && !materialName.equals("wither_skull")
+                && !materialName.equals("fireball")
+                && !materialName.equals("end_crystal")
+                && !materialName.equals("dragon_fireball")
+                && !materialName.equals("small_fireball");
     }
 
     @EventHandler(priority = EventPriority.HIGHEST) // dragon_break_block
@@ -150,7 +151,7 @@ public class EnvironmentEvents implements Listener {
     @EventHandler(priority = EventPriority.HIGHEST) // tnt_explode
     public void onTntExplode(EntityExplodeEvent event) {
         Entity entity = event.getEntity();
-        if (entity.getType() != EntityType.TNT_MINECART && entity.getType() != EntityType.TNT) {
+        if (!entity.getType().name().contains("tnt")) {
             return;
         }
         event.blockList().removeIf(block -> {
@@ -165,8 +166,7 @@ public class EnvironmentEvents implements Listener {
         if (entity.getType() != EntityType.ARMOR_STAND) {
             return;
         }
-        Entity damager = event.getDamager();
-        if (entity.getType() != EntityType.TNT_MINECART && entity.getType() != EntityType.TNT) {
+        if (!event.getDamager().getType().name().contains("tnt")) {
             return;
         }
         DominionDTO dom = Cache.instance.getDominionByLoc(entity.getLocation());
diff --git a/src/main/java/cn/lunadeer/dominion/events/PlayerEvents.java b/src/main/java/cn/lunadeer/dominion/events/PlayerEvents.java
index d94ca1a..3bf2d65 100644
--- a/src/main/java/cn/lunadeer/dominion/events/PlayerEvents.java
+++ b/src/main/java/cn/lunadeer/dominion/events/PlayerEvents.java
@@ -61,14 +61,13 @@ public class PlayerEvents implements Listener {
 
     @EventHandler(priority = EventPriority.HIGHEST) // animal_killing
     public void onAnimalKilling(EntityDamageByEntityEvent event) {
-        if (!(event.getDamager() instanceof Player)) {
+        if (!(event.getDamager() instanceof Player bukkitPlayer)) {
             return;
         }
         // 如果不是动物 则不处理
         if (!(event.getEntity() instanceof Animals)) {
             return;
         }
-        Player bukkitPlayer = (Player) event.getDamager();
         DominionDTO dom = Cache.instance.getDominionByLoc(event.getEntity().getLocation());
         checkFlag(dom, Flag.ANIMAL_KILLING, bukkitPlayer, event);
     }
@@ -78,10 +77,9 @@ public class PlayerEvents implements Listener {
         if (event.getInventory().getType() != InventoryType.ANVIL) {
             return;
         }
-        if (!(event.getPlayer() instanceof Player)) {
+        if (!(event.getPlayer() instanceof Player bukkitPlayer)) {
             return;
         }
-        Player bukkitPlayer = (Player) event.getPlayer();
         DominionDTO dom = Cache.instance.getPlayerCurrentDominion(bukkitPlayer);
         checkFlag(dom, Flag.ANVIL, bukkitPlayer, event);
     }
@@ -91,10 +89,9 @@ public class PlayerEvents implements Listener {
         if (event.getInventory().getType() != InventoryType.BEACON) {
             return;
         }
-        if (!(event.getPlayer() instanceof Player)) {
+        if (!(event.getPlayer() instanceof Player bukkitPlayer)) {
             return;
         }
-        Player bukkitPlayer = (Player) event.getPlayer();
         DominionDTO dom = Cache.instance.getPlayerCurrentDominion(bukkitPlayer);
         checkFlag(dom, Flag.BEACON, bukkitPlayer, event);
     }
@@ -121,10 +118,9 @@ public class PlayerEvents implements Listener {
         if (event.getInventory().getType() != InventoryType.BREWING) {
             return;
         }
-        if (!(event.getPlayer() instanceof Player)) {
+        if (!(event.getPlayer() instanceof Player bukkitPlayer)) {
             return;
         }
-        Player bukkitPlayer = (Player) event.getPlayer();
         DominionDTO dom = Cache.instance.getPlayerCurrentDominion(bukkitPlayer);
         checkFlag(dom, Flag.BREW, bukkitPlayer, event);
     }
@@ -231,10 +227,9 @@ public class PlayerEvents implements Listener {
                 event.getInventory().getType() != InventoryType.SHULKER_BOX) {
             return;
         }
-        if (!(event.getPlayer() instanceof Player)) {
+        if (!(event.getPlayer() instanceof Player bukkitPlayer)) {
             return;
         }
-        Player bukkitPlayer = (Player) event.getPlayer();
         if (hasContainerPermission(bukkitPlayer, event.getInventory().getLocation())) {
             return;
         }
@@ -253,10 +248,9 @@ public class PlayerEvents implements Listener {
     @EventHandler(priority = EventPriority.HIGHEST) // container （item frame put）
     public void putSomeOnItemFrame(PlayerInteractEntityEvent event) {
         Entity entity = event.getRightClicked();
-        if (!(entity instanceof ItemFrame)) {
+        if (!(entity instanceof ItemFrame itemFrame)) {
             return;
         }
-        ItemFrame itemFrame = (ItemFrame) entity;
         if (itemFrame.getItem().getType() != Material.AIR) {
             return;
         }
@@ -270,17 +264,15 @@ public class PlayerEvents implements Listener {
     @EventHandler(priority = EventPriority.HIGHEST) // container （item frame get）
     public void removeSomeOnItemFrame(EntityDamageByEntityEvent event) {
         Entity entity = event.getEntity();
-        if (!(entity instanceof ItemFrame)) {
+        if (!(entity instanceof ItemFrame itemFrame)) {
             return;
         }
-        ItemFrame itemFrame = (ItemFrame) entity;
         if (itemFrame.getItem().getType() == Material.AIR) {
             return;
         }
-        if (!(event.getDamager() instanceof Player)) {
+        if (!(event.getDamager() instanceof Player bukkitPlayer)) {
             return;
         }
-        Player bukkitPlayer = (Player) event.getDamager();
         if (hasContainerPermission(bukkitPlayer, entity.getLocation())) {
             return;
         }
@@ -290,21 +282,18 @@ public class PlayerEvents implements Listener {
     @EventHandler(priority = EventPriority.HIGHEST) // container （item frame get）
     public void removeSomeOnItemFrameByArrow(EntityDamageByEntityEvent event) {
         Entity entity = event.getEntity();
-        if (!(entity instanceof ItemFrame)) {
+        if (!(entity instanceof ItemFrame itemFrame)) {
             return;
         }
-        ItemFrame itemFrame = (ItemFrame) entity;
         if (itemFrame.getItem().getType() == Material.AIR) {
             return;
         }
-        if (!(event.getDamager() instanceof Arrow)) {
+        if (!(event.getDamager() instanceof Arrow arrow)) {
             return;
         }
-        Arrow arrow = (Arrow) event.getDamager();
-        if (!(arrow.getShooter() instanceof Player)) {
+        if (!(arrow.getShooter() instanceof Player bukkitPlayer)) {
             return;
         }
-        Player bukkitPlayer = (Player) arrow.getShooter();
         if (hasContainerPermission(bukkitPlayer, itemFrame.getLocation())) {
             return;
         }
@@ -317,10 +306,9 @@ public class PlayerEvents implements Listener {
         if (inv.getType() != InventoryType.WORKBENCH) {
             return;
         }
-        if (!(event.getPlayer() instanceof Player)) {
+        if (!(event.getPlayer() instanceof Player bukkitPlayer)) {
             return;
         }
-        Player bukkitPlayer = (Player) event.getPlayer();
         DominionDTO dom = getInvDominion(bukkitPlayer, inv);
         checkFlag(dom, Flag.CRAFT, bukkitPlayer, event);
     }
@@ -425,13 +413,12 @@ public class PlayerEvents implements Listener {
 
     @EventHandler(priority = EventPriority.HIGHEST) // egg
     public void onThrowingEgg(ProjectileLaunchEvent event) {
-        if (!(event.getEntity().getShooter() instanceof Player)) {
+        if (!(event.getEntity().getShooter() instanceof Player player)) {
             return;
         }
         if (event.getEntity().getType() != EntityType.EGG) {
             return;
         }
-        Player player = (Player) event.getEntity().getShooter();
         DominionDTO dom = Cache.instance.getPlayerCurrentDominion(player);
         checkFlag(dom, Flag.EGG, player, event);
     }
@@ -441,23 +428,21 @@ public class PlayerEvents implements Listener {
         if (event.getInventory().getType() != InventoryType.ENCHANTING) {
             return;
         }
-        if (!(event.getPlayer() instanceof Player)) {
+        if (!(event.getPlayer() instanceof Player bukkitPlayer)) {
             return;
         }
-        Player bukkitPlayer = (Player) event.getPlayer();
         DominionDTO dom = getInvDominion(bukkitPlayer, event.getInventory());
         checkFlag(dom, Flag.ENCHANT, bukkitPlayer, event);
     }
 
     @EventHandler(priority = EventPriority.HIGHEST) // ender_pearl
     public void onThrowingEndPearl(ProjectileLaunchEvent event) {
-        if (!(event.getEntity().getShooter() instanceof Player)) {
+        if (!(event.getEntity().getShooter() instanceof Player player)) {
             return;
         }
         if (event.getEntity().getType() != EntityType.ENDER_PEARL) {
             return;
         }
-        Player player = (Player) event.getEntity().getShooter();
         DominionDTO dom = Cache.instance.getPlayerCurrentDominion(player);
         checkFlag(dom, Flag.ENDER_PEARL, player, event);
     }
@@ -542,10 +527,9 @@ public class PlayerEvents implements Listener {
         ) {
             return;
         }
-        if (!(event.getPlayer() instanceof Player)) {
+        if (!(event.getPlayer() instanceof Player bukkitPlayer)) {
             return;
         }
-        Player bukkitPlayer = (Player) event.getPlayer();
         DominionDTO dom = getInvDominion(bukkitPlayer, event.getInventory());
         checkFlag(dom, Flag.HOPPER, bukkitPlayer, event);
     }
@@ -563,10 +547,9 @@ public class PlayerEvents implements Listener {
     @EventHandler(priority = EventPriority.HIGHEST) // item_frame_interactive
     public void onItemFrameInteractive(PlayerInteractEntityEvent event) {
         Entity entity = event.getRightClicked();
-        if (!(entity instanceof ItemFrame)) {
+        if (!(entity instanceof ItemFrame itemFrame)) {
             return;
         }
-        ItemFrame itemFrame = (ItemFrame) entity;
         if (itemFrame.getItem().getType() == Material.AIR) {
             // 为空则当作容器处理见 putSomeOnItemFrame
             return;
@@ -596,7 +579,7 @@ public class PlayerEvents implements Listener {
 
     @EventHandler(priority = EventPriority.HIGHEST) // monster_killing
     public void onMonsterKilling(EntityDamageByEntityEvent event) {
-        if (!(event.getDamager() instanceof Player)) {
+        if (!(event.getDamager() instanceof Player bukkitPlayer)) {
             return;
         }
         // 如果不是怪物 则不处理
@@ -604,7 +587,6 @@ public class PlayerEvents implements Listener {
         if (!(entity instanceof Monster)) {
             return;
         }
-        Player bukkitPlayer = (Player) event.getDamager();
         DominionDTO dom = Cache.instance.getDominionByLoc(entity.getLocation());
         checkFlag(dom, Flag.MONSTER_KILLING, bukkitPlayer, event);
     }
@@ -758,20 +740,18 @@ public class PlayerEvents implements Listener {
         if (event.getInventory().getType() != InventoryType.MERCHANT) {
             return;
         }
-        if (!(event.getPlayer() instanceof Player)) {
+        if (!(event.getPlayer() instanceof Player bukkitPlayer)) {
             return;
         }
-        Player bukkitPlayer = (Player) event.getPlayer();
         DominionDTO dom = getInvDominion(bukkitPlayer, event.getInventory());
         checkFlag(dom, Flag.TRADE, bukkitPlayer, event);
     }
 
     @EventHandler(priority = EventPriority.HIGHEST) // vehicle_destroy
     public void onVehicleDestroy(VehicleDestroyEvent event) {
-        if (!(event.getAttacker() instanceof Player)) {
+        if (!(event.getAttacker() instanceof Player player)) {
             return;
         }
-        Player player = (Player) event.getAttacker();
         DominionDTO dom = Cache.instance.getDominionByLoc(event.getVehicle().getLocation());
         checkFlag(dom, Flag.VEHICLE_DESTROY, player, event);
     }
@@ -792,13 +772,12 @@ public class PlayerEvents implements Listener {
 
     @EventHandler(priority = EventPriority.HIGHEST)  // villager_killing
     public void onVillagerKilling(EntityDamageByEntityEvent event) {
-        if (!(event.getDamager() instanceof Player)) {
+        if (!(event.getDamager() instanceof Player player)) {
             return;
         }
         if (!(event.getEntity() instanceof Villager)) {
             return;
         }
-        Player player = (Player) event.getDamager();
         DominionDTO dom = Cache.instance.getDominionByLoc(event.getEntity().getLocation());
         checkFlag(dom, Flag.VILLAGER_KILLING, player, event);
     }