From 86d40fedb2ed5b9cd937f4af0f3aea50451f6ca5 Mon Sep 17 00:00:00 2001
From: zhangyuheng <zhangyuheng@lunadeer.cn>
Date: Wed, 31 Jul 2024 15:16:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=BD=9C=E5=BD=B1=E8=B4=9D?=
 =?UTF-8?q?=E6=89=93=E6=8E=89=E5=9C=B0=E5=9B=BE=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                              |  2 +-
 .../lunadeer/dominion/events/EnvironmentEvents.java  | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index b3e39f5..d9a1b17 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>cn.lunadeer</groupId>
     <artifactId>Dominion</artifactId>
-    <version>1.42.8-beta</version>
+    <version>1.42.9-beta</version>
     <packaging>jar</packaging>
 
     <name>Dominion</name>
diff --git a/src/main/java/cn/lunadeer/dominion/events/EnvironmentEvents.java b/src/main/java/cn/lunadeer/dominion/events/EnvironmentEvents.java
index 5fb1028..d56dc7d 100644
--- a/src/main/java/cn/lunadeer/dominion/events/EnvironmentEvents.java
+++ b/src/main/java/cn/lunadeer/dominion/events/EnvironmentEvents.java
@@ -53,24 +53,24 @@ public class EnvironmentEvents implements Listener {
         if (entity.getType() != EntityType.ARMOR_STAND) {
             return;
         }
+        if (event.getDamager() instanceof Player) {
+            return;
+        }
         DominionDTO dom = Cache.instance.getDominionByLoc(entity.getLocation());
         checkFlag(dom, Flag.CREEPER_EXPLODE, event);
     }
 
-    @EventHandler(priority = EventPriority.HIGHEST) // creeper_explode - other entity shoot
+    @EventHandler(priority = EventPriority.HIGHEST) // creeper_explode - other projectiles
     public void removeSomeOnItemFrameByArrow(EntityDamageByEntityEvent event) {
         Entity entity = event.getEntity();
         if (!(entity instanceof ItemFrame)) {
             return;
         }
         ItemFrame itemFrame = (ItemFrame) entity;
-        if (itemFrame.getItem().getType() == Material.AIR) {
+        if (!(event.getDamager() instanceof Projectile)) {
             return;
         }
-        if (!(event.getDamager() instanceof Arrow)) {
-            return;
-        }
-        Arrow arrow = (Arrow) event.getDamager();
+        Projectile arrow = (Projectile) event.getDamager();
         if (arrow.getShooter() instanceof Player) {
             return;
         }