diff --git a/pom.xml b/pom.xml index 9354fc3..66b35ab 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.maxgamer QuickShop - 1.8.2 + 1.8.3 快捷商店重置版本... ${project.name} @@ -56,7 +56,11 @@ http://ci.citycraft.cn:8080 DEBUG &a全新版本 &c虚拟悬浮物(橙子提供 对 就是那个汉化COI的逗比) &e7老板修复逗比BUG... - &c修复PlayerInteractEvent错误参数导致GuiShopManager的报错...;&c修复箱子的标题为Null是产生的报错... + + &b1.8.3 - &c修复漏斗传输NPE错误...; + &b1.8.2 - &c修复箱子的标题为Null是产生的报错...; + &b1.8.1 - &c修复PlayerInteractEvent错误参数导致GuiShopManager的报错...; + UTF-8 diff --git a/src/main/java/org/maxgamer/QuickShop/Listeners/ProtectListener.java b/src/main/java/org/maxgamer/QuickShop/Listeners/ProtectListener.java index cb369f1..b0288ec 100644 --- a/src/main/java/org/maxgamer/QuickShop/Listeners/ProtectListener.java +++ b/src/main/java/org/maxgamer/QuickShop/Listeners/ProtectListener.java @@ -61,7 +61,8 @@ public class ProtectListener implements Listener { final Shop srcshop = getShop(src); final Shop meshop = getShop(me); final Shop desshop = getShop(des); - if ((srcshop != null && meshop == null) || (meshop != null && desshop == null) || (srcshop != null && desshop != null && srcshop.getOwner().equalsIgnoreCase(desshop.getOwner()))) { + if ((srcshop != null && meshop == null) || (meshop != null && desshop == null) + || (srcshop != null && desshop != null && srcshop.getOwner() != null && srcshop.getOwner().equalsIgnoreCase(desshop.getOwner()))) { e.setCancelled(true); } }