From 846d0b41d356691f0481e0e7537a317daa9e9cbb Mon Sep 17 00:00:00 2001 From: VoidAngel Date: Tue, 24 Apr 2018 20:43:24 -0700 Subject: [PATCH] Revert "Slimefun book GUI dupe fix" This reverts commit 19f4666235d579eedc6ef73a495170cd50cbda18. --- src/me/mrCookieSlime/Slimefun/SlimefunGuide.java | 5 ----- src/me/mrCookieSlime/Slimefun/Variables.java | 1 - .../Slimefun/listeners/ItemListener.java | 15 --------------- 3 files changed, 21 deletions(-) diff --git a/src/me/mrCookieSlime/Slimefun/SlimefunGuide.java b/src/me/mrCookieSlime/Slimefun/SlimefunGuide.java index 475e85bc1..b89350d66 100644 --- a/src/me/mrCookieSlime/Slimefun/SlimefunGuide.java +++ b/src/me/mrCookieSlime/Slimefun/SlimefunGuide.java @@ -236,7 +236,6 @@ public class SlimefunGuide { } }); - Variables.usingGuide.add(p.getUniqueId()); menu.open(p); } @@ -329,7 +328,6 @@ public class SlimefunGuide { }); } - Variables.usingGuide.add(p.getUniqueId()); menu.open(p); } @@ -648,7 +646,6 @@ public class SlimefunGuide { } }); - Variables.usingGuide.add(p.getUniqueId()); menu.open(p); } } @@ -928,7 +925,6 @@ public class SlimefunGuide { } } - Variables.usingGuide.add(p.getUniqueId()); menu.open(p); } @@ -1321,7 +1317,6 @@ public class SlimefunGuide { } } - Variables.usingGuide.add(p.getUniqueId()); menu.build().open(p); } diff --git a/src/me/mrCookieSlime/Slimefun/Variables.java b/src/me/mrCookieSlime/Slimefun/Variables.java index da8771212..c2034c254 100644 --- a/src/me/mrCookieSlime/Slimefun/Variables.java +++ b/src/me/mrCookieSlime/Slimefun/Variables.java @@ -23,7 +23,6 @@ public class Variables { public static List blocks = new ArrayList(); public static List cancelPlace = new ArrayList(); public static Map arrows = new HashMap(); - public static List usingGuide = new ArrayList(); public static Map dialogueCooldown = new HashMap(); } diff --git a/src/me/mrCookieSlime/Slimefun/listeners/ItemListener.java b/src/me/mrCookieSlime/Slimefun/listeners/ItemListener.java index d215ddea1..3950c39eb 100644 --- a/src/me/mrCookieSlime/Slimefun/listeners/ItemListener.java +++ b/src/me/mrCookieSlime/Slimefun/listeners/ItemListener.java @@ -20,7 +20,6 @@ import org.bukkit.event.block.Action; import org.bukkit.event.entity.EntityChangeBlockEvent; import org.bukkit.event.inventory.CraftItemEvent; import org.bukkit.event.inventory.InventoryClickEvent; -import org.bukkit.event.inventory.InventoryCloseEvent; import org.bukkit.event.inventory.InventoryMoveItemEvent; import org.bukkit.event.inventory.InventoryType; import org.bukkit.event.player.PlayerInteractEvent; @@ -387,18 +386,4 @@ public class ItemListener implements Listener { } } } - - @EventHandler - public void onClose(InventoryCloseEvent e) { - if (Variables.usingGuide.contains(e.getPlayer().getUniqueId())) { - Variables.usingGuide.remove(e.getPlayer().getUniqueId()); - } - } - - @EventHandler - public void inventoryClickEvent(final InventoryClickEvent e) { - if (Variables.usingGuide.contains(e.getWhoClicked().getUniqueId())) { - e.setCancelled(true); - } - } }