diff --git a/.classpath b/.classpath deleted file mode 100644 index db5b5e4..0000000 --- a/.classpath +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/.project b/.project deleted file mode 100644 index 80b13cb..0000000 --- a/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - QuickShop - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.m2e.core.maven2Nature - org.eclipse.jdt.core.javanature - - diff --git a/lib/ProtocolLib-3.6.5.jar b/lib/ProtocolLib-3.6.5.jar deleted file mode 100644 index ec73d32..0000000 Binary files a/lib/ProtocolLib-3.6.5.jar and /dev/null differ diff --git a/lib/ProtocolLib-4.1.jar b/lib/ProtocolLib-4.1.jar deleted file mode 100644 index 4e8a0f8..0000000 Binary files a/lib/ProtocolLib-4.1.jar and /dev/null differ diff --git a/lib/WorldEdit.jar b/lib/WorldEdit.jar deleted file mode 100644 index 600dcca..0000000 Binary files a/lib/WorldEdit.jar and /dev/null differ diff --git a/pom.xml b/pom.xml index 343c39c..98c93c4 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.maxgamer QuickShop - 2.0.1 + 2.1 快捷商店重置版本... ${project.name} @@ -14,14 +14,6 @@ - - maven-compiler-plugin - 3.1 - - 1.7 - 1.7 - - org.apache.maven.plugins maven-shade-plugin @@ -60,21 +52,19 @@ DEBUG §a全新版本 §c虚拟悬浮物(橙子提供 对 就是那个汉化COI的逗比)§e7老板修复逗比BUG... + §b2.1.0 - §c修复大箱子刷物品的问题...; §b2.0.1 - §a使用新类库 兼容最新版本...; §b1.9.5 - §a1.10+兼容虚拟悬浮物...; - §b1.9.4 - §a1.9+兼容虚拟悬浮物...; UTF-8 + 1.7 + 1.7 yumc-repo http://repo.yumc.pw/content/groups/public/ - - dmulloy - http://repo.dmulloy2.net/content/groups/public/ - @@ -88,19 +78,12 @@ pw.yumc YumCore jar - 1.5 + 1.6 io.github.Cnly.WowSuchCleaner WowSuchCleaner 1.6.5 - - com.sk89q - WorldEdit - 5.4.5 - system - ${project.basedir}/lib/WorldEdit.jar - \ No newline at end of file diff --git a/src/main/java/org/maxgamer/QuickShop/Listeners/BlockListener.java b/src/main/java/org/maxgamer/QuickShop/Listeners/BlockListener.java index b0a0528..fc6e53d 100644 --- a/src/main/java/org/maxgamer/QuickShop/Listeners/BlockListener.java +++ b/src/main/java/org/maxgamer/QuickShop/Listeners/BlockListener.java @@ -92,9 +92,19 @@ public class BlockListener implements Listener { final Block b = e.getBlock(); final Player p = e.getPlayer(); final Block chest = Util.getSecondHalf(b); - if (chest != null && plugin.getShopManager().getShop(chest.getLocation()) != null && !p.hasPermission("quickshop.create.double")) { - e.setCancelled(true); - p.sendMessage(MsgUtil.p("no-double-chests")); + if (chest != null) { + Shop shop = plugin.getShopManager().getShop(chest.getLocation()); + if (shop != null) { + if (!shop.getOwner().equals(p.getName())) { + e.setCancelled(true); + p.sendMessage(MsgUtil.p("no-double-chests")); + return; + } + if (!p.hasPermission("quickshop.create.double")) { + e.setCancelled(true); + p.sendMessage(MsgUtil.p("no-double-chests")); + } + } } } diff --git a/src/main/java/org/maxgamer/QuickShop/Shop/Item/DisplayItem.java b/src/main/java/org/maxgamer/QuickShop/Shop/Item/DisplayItem.java index 2eab29e..2d45504 100644 --- a/src/main/java/org/maxgamer/QuickShop/Shop/Item/DisplayItem.java +++ b/src/main/java/org/maxgamer/QuickShop/Shop/Item/DisplayItem.java @@ -7,6 +7,7 @@ import org.maxgamer.QuickShop.Shop.ContainerShop; import pw.yumc.YumCore.bukkit.Log; import pw.yumc.YumCore.bukkit.P; +import pw.yumc.YumCore.bukkit.compatible.C; /** * @author Netherfoam A display item, that spawns a block above the chest and @@ -16,17 +17,17 @@ public abstract class DisplayItem { public static QuickShop plugin = P.getPlugin(); public static DisplayItem create(final ContainerShop shop) { + String ver = C.getNMSVersion(); if (plugin.getConfigManager().isDisplay()) { if (plugin.getConfigManager().isFakeItem()) { try { - return new FakeItem_19_110(shop, shop.getItem()); + if (Integer.parseInt(ver.split("_")[1]) > 8) { + return new FakeItem_19_110(shop, shop.getItem()); + } else { + return new FakeItem_17_18(shop, shop.getItem()); + } } catch (final Throwable e) { Log.d(e); - try { - return new FakeItem_17_18(shop, shop.getItem()); - } catch (final Throwable e2) { - Log.d(e2); - } } } return new NormalItem(shop, shop.getItem());