From 8edb488ab24519236553cabd943e946c6f223b02 Mon Sep 17 00:00:00 2001 From: 502647092 Date: Thu, 4 Oct 2018 23:59:35 +0800 Subject: [PATCH] feat: remove wsc listener Signed-off-by: 502647092 --- pom.xml | 9 +---- .../Listeners/WowSuchCleanerListener.java | 37 ------------------- .../org/maxgamer/QuickShop/QuickShop.java | 11 ------ 3 files changed, 2 insertions(+), 55 deletions(-) delete mode 100644 src/main/java/org/maxgamer/QuickShop/Listeners/WowSuchCleanerListener.java diff --git a/pom.xml b/pom.xml index 5de3d60..2844e08 100644 --- a/pom.xml +++ b/pom.xml @@ -79,14 +79,14 @@ yumc-repo - http://repo.yumc.pw/content/groups/public/ + https://repo.yumc.pw/repository/maven-public/ jtb YUMC - http://repo.yumc.pw/content/repositories/yumcenter/ + https://repo.yumc.pw/repository/yumcenter/ @@ -96,10 +96,5 @@ jar [1.8.1,) - - io.github.Cnly.WowSuchCleaner - WowSuchCleaner - 1.6.5 - \ No newline at end of file diff --git a/src/main/java/org/maxgamer/QuickShop/Listeners/WowSuchCleanerListener.java b/src/main/java/org/maxgamer/QuickShop/Listeners/WowSuchCleanerListener.java deleted file mode 100644 index a570908..0000000 --- a/src/main/java/org/maxgamer/QuickShop/Listeners/WowSuchCleanerListener.java +++ /dev/null @@ -1,37 +0,0 @@ -package org.maxgamer.QuickShop.Listeners; - -import io.github.Cnly.WowSuchCleaner.WowSuchCleaner.ItemPreCleanEvent; -import org.bukkit.entity.Item; -import org.bukkit.event.EventHandler; -import org.bukkit.event.Listener; -import org.bukkit.inventory.ItemStack; -import org.maxgamer.QuickShop.Util.MarkUtil; - -import java.util.ArrayList; -import java.util.List; - -public class WowSuchCleanerListener implements Listener { - @EventHandler - public void onWSCClear(final ItemPreCleanEvent e) { - final List clearList = new ArrayList<>(); - final List aucList = new ArrayList<>(); - final List cleanList = e.getItemsToClean(); - final List acList = e.getItemsToAuction(); - if (cleanList != null) { - for (final Item item : cleanList) { - if (MarkUtil.hasMark(item.getItemStack())) { - clearList.add(item); - } - } - e.getItemsToClean().removeAll(clearList); - } - if (acList != null) { - for (final ItemStack itemStack : acList) { - if (MarkUtil.hasMark(itemStack)) { - aucList.add(itemStack); - } - } - e.getItemsToAuction().removeAll(aucList); - } - } -} diff --git a/src/main/java/org/maxgamer/QuickShop/QuickShop.java b/src/main/java/org/maxgamer/QuickShop/QuickShop.java index 857b7ff..a05db62 100644 --- a/src/main/java/org/maxgamer/QuickShop/QuickShop.java +++ b/src/main/java/org/maxgamer/QuickShop/QuickShop.java @@ -40,7 +40,6 @@ import org.maxgamer.QuickShop.Listeners.LockListener; import org.maxgamer.QuickShop.Listeners.PlayerListener; import org.maxgamer.QuickShop.Listeners.ProtectListener; import org.maxgamer.QuickShop.Listeners.WorldListener; -import org.maxgamer.QuickShop.Listeners.WowSuchCleanerListener; import org.maxgamer.QuickShop.Shop.ContainerShop; import org.maxgamer.QuickShop.Shop.Shop; import org.maxgamer.QuickShop.Shop.ShopManager; @@ -300,16 +299,6 @@ public class QuickShop extends JavaPlugin { MsgUtil.clean(); // Register events final PluginManager pm = this.getServer().getPluginManager(); - final Plugin wsc = pm.getPlugin("WowSuchCleaner"); - if (wsc != null && wsc.isEnabled()) { - getLogger().info("发现 WowSuchCleaner 插件 开启相关功能..."); - try { - Class.forName("io.github.Cnly.WowSuchCleaner.WowSuchCleaner.ItemPreCleanEvent"); - pm.registerEvents(new WowSuchCleanerListener(), this); - } catch (final ClassNotFoundException e) { - getLogger().info("WowSuchCleaner 版本过低 可能造成悬浮物上架..."); - } - } pm.registerEvents(new BlockListener(this), this); pm.registerEvents(new PlayerListener(this), this); pm.registerEvents(new WorldListener(this), this);