From 8451f84083a036682fb51132d18fc4f43c6847d5 Mon Sep 17 00:00:00 2001
From: nossr50 <nossr50@gmail.com>
Date: Fri, 25 Sep 2020 11:36:42 -0700
Subject: [PATCH] dev mode

---
 Changelog.txt                                 |  4 +-
 pom.xml                                       |  2 +-
 .../nossr50/listeners/CommandListener.java    | 40 +++++++++++++++++++
 src/main/java/com/gmail/nossr50/mcMMO.java    |  1 +
 .../gmail/nossr50/util/skills/SkillUtils.java |  4 --
 5 files changed, 45 insertions(+), 6 deletions(-)
 create mode 100644 src/main/java/com/gmail/nossr50/listeners/CommandListener.java

diff --git a/Changelog.txt b/Changelog.txt
index 43b552678..7f67c15e8 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,3 +1,6 @@
+Version 2.1.147
+
+
 Version 2.1.146
     A bug where players would disconnect from mcMMO messages has been fixed (thanks kashike / read notes)
         It should be noted this was NOT an mcMMO bug, but a bug within Spigot since Spigot 1.16
@@ -8,7 +11,6 @@ Version 2.1.146
 
     NOTES:
     Shout out to Kashike
-    If you guys are looking to hire someone of exceptional quality for a Java project, Kashike is a skilled developer who I respect and he makes a living off free lance right now. Try contacting him if you do!
     Kashike is a developer on the mcMMO team, however after I recruited him had a lot of life stuff come at him and hasn't had a chance to contribute until now!
 
     JSON is used by Minecraft for a lot of stuff, in this case the JSON mcMMO made use of was related to displaying text in chat or displaying text on the clients screen in other places such as the action bar, there's been a bad bug in Spigot since 1.16 that would disconnect players some of the time when sending JSON components.
diff --git a/pom.xml b/pom.xml
index f8fef7074..a3d6c5776 100755
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.gmail.nossr50.mcMMO</groupId>
     <artifactId>mcMMO</artifactId>
-    <version>2.1.146</version>
+    <version>2.1.147-SNAPSHOT</version>
     <name>mcMMO</name>
     <url>https://github.com/mcMMO-Dev/mcMMO</url>
     <scm>
diff --git a/src/main/java/com/gmail/nossr50/listeners/CommandListener.java b/src/main/java/com/gmail/nossr50/listeners/CommandListener.java
new file mode 100644
index 000000000..484faa5bb
--- /dev/null
+++ b/src/main/java/com/gmail/nossr50/listeners/CommandListener.java
@@ -0,0 +1,40 @@
+//package com.gmail.nossr50.listeners;
+//
+//import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+//import com.gmail.nossr50.datatypes.skills.SuperAbilityType;
+//import com.gmail.nossr50.mcMMO;
+//import com.gmail.nossr50.util.player.UserManager;
+//import com.gmail.nossr50.util.skills.SkillUtils;
+//import org.bukkit.Bukkit;
+//import org.bukkit.entity.Player;
+//import org.bukkit.event.EventHandler;
+//import org.bukkit.event.EventPriority;
+//import org.bukkit.event.Listener;
+//import org.bukkit.event.player.PlayerCommandPreprocessEvent;
+//
+//public class CommandListener implements Listener {
+//
+//    private final mcMMO pluginRef;
+//
+//    public CommandListener(mcMMO plugin) {
+//        this.pluginRef = plugin;
+//    }
+//
+//    @EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST)
+//    public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) {
+//        Player player = event.getPlayer();
+//
+//        SkillUtils.removeAbilityBoostsFromInventory(player);
+//
+//        McMMOPlayer mmoPlayer = UserManager.getPlayer(player);
+//
+//        if(mmoPlayer == null)
+//            return;
+//
+//        Bukkit.getServer().getScheduler().runTaskLater(pluginRef, () -> {
+//            if(mmoPlayer.getAbilityMode(SuperAbilityType.GIGA_DRILL_BREAKER) || mmoPlayer.getAbilityMode(SuperAbilityType.SUPER_BREAKER)) {
+//                SkillUtils.handleAbilitySpeedIncrease(player);
+//            }
+//        }, 5);
+//    }
+//}
diff --git a/src/main/java/com/gmail/nossr50/mcMMO.java b/src/main/java/com/gmail/nossr50/mcMMO.java
index 998c6d638..64c1509ef 100644
--- a/src/main/java/com/gmail/nossr50/mcMMO.java
+++ b/src/main/java/com/gmail/nossr50/mcMMO.java
@@ -555,6 +555,7 @@ public class mcMMO extends JavaPlugin {
         pluginManager.registerEvents(new InventoryListener(this), this);
         pluginManager.registerEvents(new SelfListener(this), this);
         pluginManager.registerEvents(new WorldListener(this), this);
+//        pluginManager.registerEvents(new CommandListener(this), this);
     }
 
     /**
diff --git a/src/main/java/com/gmail/nossr50/util/skills/SkillUtils.java b/src/main/java/com/gmail/nossr50/util/skills/SkillUtils.java
index d9ccf532f..76c73d391 100644
--- a/src/main/java/com/gmail/nossr50/util/skills/SkillUtils.java
+++ b/src/main/java/com/gmail/nossr50/util/skills/SkillUtils.java
@@ -198,10 +198,6 @@ public class SkillUtils {
     }
 
     public static void removeAbilityBoostsFromInventory(@NotNull Player player) {
-        if (!HiddenConfig.getInstance().useEnchantmentBuffs()) {
-            return;
-        }
-
         for (ItemStack itemStack : player.getInventory().getContents()) {
             removeAbilityBuff(itemStack);
         }