From 98e531fc3de27211599ff345ab14311234c2b217 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Fri, 9 Apr 2021 01:43:57 +0100 Subject: [PATCH] Stopped upgrades from working in /gmc due to dupe --- .../upgrades/listeners/AdvancementShardListener.java | 5 +++++ .../willfp/ecoarmor/upgrades/listeners/CrystalListener.java | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/upgrades/listeners/AdvancementShardListener.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/upgrades/listeners/AdvancementShardListener.java index 3811ccd..80834fc 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/upgrades/listeners/AdvancementShardListener.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/upgrades/listeners/AdvancementShardListener.java @@ -6,6 +6,7 @@ import com.willfp.eco.core.PluginDependent; import com.willfp.ecoarmor.sets.ArmorSet; import com.willfp.ecoarmor.sets.ArmorSets; import com.willfp.ecoarmor.sets.util.ArmorUtils; +import org.bukkit.GameMode; import org.bukkit.Material; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; @@ -32,6 +33,10 @@ public class AdvancementShardListener extends PluginDependent implements Listene */ @EventHandler public void onDrag(@NotNull final InventoryClickEvent event) { + if (event.getWhoClicked().getGameMode() == GameMode.CREATIVE) { + return; + } + ItemStack current = event.getCurrentItem(); ItemStack cursor = event.getCursor(); diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/upgrades/listeners/CrystalListener.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/upgrades/listeners/CrystalListener.java index d0ae58b..c783477 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/upgrades/listeners/CrystalListener.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/upgrades/listeners/CrystalListener.java @@ -4,6 +4,7 @@ import com.willfp.eco.core.EcoPlugin; import com.willfp.eco.core.PluginDependent; import com.willfp.ecoarmor.sets.util.ArmorUtils; import com.willfp.ecoarmor.upgrades.Tier; +import org.bukkit.GameMode; import org.bukkit.Material; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; @@ -31,6 +32,10 @@ public class CrystalListener extends PluginDependent implements Listener { */ @EventHandler public void onDrag(@NotNull final InventoryClickEvent event) { + if (event.getWhoClicked().getGameMode() == GameMode.CREATIVE) { + return; + } + ItemStack current = event.getCurrentItem(); ItemStack cursor = event.getCursor();