Merge pull request #1589 from Ghost-chu/hikari

Fix entity explode bug
QuickShop-Community · May 29, 2024 · 51fc9ab · 51fc9ab
2 parents 7e3dbfe + dfb8abb
commit 51fc9ab
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.ghostchu</groupId>
     <artifactId>quickshop-hikari</artifactId>
-    <version>6.2.0.1</version>
+    <version>6.2.0.2</version>
     <packaging>pom</packaging>
     <name>quickshop-hikari</name>
     <description>Another QuickShop fork</description>

diff --git a/quickshop-bukkit/src/main/java/com/ghostchu/quickshop/listener/ShopProtectionListener.java b/quickshop-bukkit/src/main/java/com/ghostchu/quickshop/listener/ShopProtectionListener.java
@@ -99,11 +99,14 @@ public void onEntityBlockChange(EntityChangeBlockEvent e) {
     public void onExplode(EntityExplodeEvent e) {
         for (int i = 0, a = e.blockList().size(); i < a; i++) {
             final Block b = e.blockList().get(i);
-            final Shop shop = getShopNature(b.getLocation(), true);
-
+            Shop shop = getShopNature(b.getLocation(), true);
+            if (shop == null) {
+                shop = getShopNextTo(b.getLocation());
+            }
             if (shop == null) {
                 continue;
             }
+
             if (plugin.getConfig().getBoolean("protect.explode")) {
                 e.setCancelled(true);
             } else {