From d9d9e0a40be00d4e6c4cf16bc40c487ba0097db2 Mon Sep 17 00:00:00 2001
From: _OfTeN_ <dkoften@gmail.com>
Date: Mon, 24 Jan 2022 23:15:46 +0300
Subject: [PATCH] Revert "Fixed Intellect and Wisdom sometimes giving more exp
 than they should"

This reverts commit f164b76c621c1d462439bf148e5eb4f7ab36feaa.
---
 .../ecoenchants/normal/Wisdom.java            | 28 ++-----------------
 .../ecoenchants/special/Intellect.java        | 21 +-------------
 2 files changed, 4 insertions(+), 45 deletions(-)

diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Wisdom.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Wisdom.java
index e46edc12..b41a0ed0 100644
--- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Wisdom.java
+++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Wisdom.java
@@ -9,13 +9,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.ArrayList;
-import java.util.List;
-
 public class Wisdom extends EcoEnchant {
-
-    private static final List<Player> toPrevent = new ArrayList<>();
-
     public Wisdom() {
         super(
                 "wisdom", EnchantmentType.NORMAL
@@ -30,13 +24,7 @@ public class Wisdom extends EcoEnchant {
             return;
         }
 
-        if (!this.areRequirementsMet(player)) {
-            return;
-        }
-
-        int level = EnchantChecks.getMainhandLevel(player, this);
-
-        if (level == 0) {
+        if (!EnchantChecks.mainhand(player, this)) {
             return;
         }
 
@@ -44,18 +32,8 @@ public class Wisdom extends EcoEnchant {
             return;
         }
 
-        int newValue = toPrevent.contains(player) ? event.getExpChangeEvent().getAmount() :
-                (int) Math.ceil(event.getExpChangeEvent().getAmount() *
-                        (1 + (level * this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "bonus-per-point"))));
+        int level = EnchantChecks.getMainhandLevel(player, this);
 
-        event.getExpChangeEvent().setAmount(newValue);
-
-        if (newValue > player.getExpToLevel()) {
-            if (!toPrevent.contains(player)){
-                toPrevent.add(player);
-            }
-        } else {
-            toPrevent.remove(player);
-        }
+        event.getExpChangeEvent().setAmount((int) Math.ceil(event.getExpChangeEvent().getAmount() * (1 + (level * this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "bonus-per-point")))));
     }
 }
diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Intellect.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Intellect.java
index cf6ca78b..2f3282b7 100644
--- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Intellect.java
+++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Intellect.java
@@ -7,16 +7,9 @@ import com.willfp.ecoenchants.enchantments.meta.EnchantmentType;
 import com.willfp.ecoenchants.enchantments.util.EnchantChecks;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
-import org.bukkit.event.entity.PlayerDeathEvent;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.ArrayList;
-import java.util.List;
-
 public class Intellect extends EcoEnchant {
-
-    private static final List<Player> toPrevent = new ArrayList<>();
-
     public Intellect() {
         super(
                 "intellect", EnchantmentType.SPECIAL
@@ -45,18 +38,6 @@ public class Intellect extends EcoEnchant {
             return;
         }
 
-        int newValue = toPrevent.contains(player) ? event.getExpChangeEvent().getAmount() :
-        (int) Math.ceil(event.getExpChangeEvent().getAmount() *
-                (1 + (level * this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "bonus-per-point"))));
-
-        event.getExpChangeEvent().setAmount(newValue);
-
-        if (newValue > player.getExpToLevel()) {
-            if (!toPrevent.contains(player)){
-                toPrevent.add(player);
-            }
-        } else {
-            toPrevent.remove(player);
-        }
+        event.getExpChangeEvent().setAmount((int) Math.ceil(event.getExpChangeEvent().getAmount() * (1 + (level * this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "bonus-per-point")))));
     }
 }