From be8614e7b4fec8ea579b9803792dbbe247271916 Mon Sep 17 00:00:00 2001
From: Auxilor <william.favierparsons1@gmail.com>
Date: Wed, 31 Aug 2022 14:38:05 +0100
Subject: [PATCH] Fixed a couple more bugs

---
 .../com/willfp/ecoenchants/enchants/EcoEnchant.kt    | 12 ++++++++++++
 .../com/willfp/ecoenchants/enchants/EcoEnchants.kt   |  4 ++++
 2 files changed, 16 insertions(+)

diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoenchants/enchants/EcoEnchant.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoenchants/enchants/EcoEnchant.kt
index 395d6162..8b09af75 100644
--- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoenchants/enchants/EcoEnchant.kt
+++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoenchants/enchants/EcoEnchant.kt
@@ -129,10 +129,22 @@ abstract class EcoEnchant(
                 "Allows getting $id from an Enchanting Table",
                 PermissionDefault.TRUE
             )
+
+            if (Bukkit.getPluginManager().getPermission("ecoenchants.fromtable.*") == null) {
+                Bukkit.getPluginManager().addPermission(
+                    Permission(
+                        "ecoenchants.fromtable.*",
+                        "Allows getting all enchantments from an Enchanting Table",
+                        PermissionDefault.TRUE
+                    )
+                )
+            }
+
             permission.addParent(
                 Bukkit.getPluginManager().getPermission("ecoenchants.fromtable.*")!!,
                 true
             )
+
             Bukkit.getPluginManager().addPermission(permission)
         }
 
diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoenchants/enchants/EcoEnchants.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoenchants/enchants/EcoEnchants.kt
index ac070637..f41c03f8 100644
--- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoenchants/enchants/EcoEnchants.kt
+++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoenchants/enchants/EcoEnchants.kt
@@ -153,6 +153,10 @@ object EcoEnchants {
                 set(null, true)
             }
 
+        if (enchantment is EcoEnchant) {
+            removeEnchant(enchantment)
+        }
+
         Enchantment.registerEnchantment(enchantment)
         EnchantRegistrations.registerEnchantments()
     }