From c411cfdcc2c1dcb0d20e9e749f33b8c5960fca79 Mon Sep 17 00:00:00 2001
From: LMBishop <13875753+LMBishop@users.noreply.github.com>
Date: Mon, 29 Mar 2021 19:17:53 +0100
Subject: Fix enchantments not working in later ItemGetter(s)

---
 .../quests/hooks/itemgetter/ItemGetterLatest.java  | 22 ++++++++++++----------
 .../quests/hooks/itemgetter/ItemGetter_1_13.java   | 20 +++++++++++---------
 .../types/dependent/CitizensDeliverTaskType.java   |  3 ++-
 3 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/src/main/java/com/leonardobishop/quests/hooks/itemgetter/ItemGetterLatest.java b/src/main/java/com/leonardobishop/quests/hooks/itemgetter/ItemGetterLatest.java
index 615d1741..2cb1ec88 100644
--- a/src/main/java/com/leonardobishop/quests/hooks/itemgetter/ItemGetterLatest.java
+++ b/src/main/java/com/leonardobishop/quests/hooks/itemgetter/ItemGetterLatest.java
@@ -190,16 +190,18 @@ public class ItemGetterLatest implements ItemGetter {
                         levelName = "1";
                     }
 
-                    NamespacedKey namespacedKey;
-                    try {
-                        namespacedKey = new NamespacedKey(namespace, ench);
-                    } catch (Exception e) {
-                        plugin.getQuestsLogger().debug("Unrecognised namespace: " + namespace);
-                        continue;
-                    }
+                    // TODO i don't know how these namespaces work
+//                    NamespacedKey namespacedKey;
+//                    try {
+//                        namespacedKey = new NamespacedKey(namespace, ench);
+//                    } catch (Exception e) {
+//                        plugin.getQuestsLogger().debug("Unrecognised namespace: " + namespace);
+//                        e.printStackTrace();
+//                        continue;
+//                    }
                     Enchantment enchantment;
-                    if ((enchantment = Enchantment.getByKey(namespacedKey)) == null) {
-                        plugin.getQuestsLogger().debug("Unrecognised enchantment: " + namespacedKey);
+                    if ((enchantment = Enchantment.getByName(ench)) == null) {
+                        plugin.getQuestsLogger().debug("Unrecognised enchantment: " + ench);
                         continue;
                     }
 
@@ -210,7 +212,7 @@ public class ItemGetterLatest implements ItemGetter {
                         level = 1;
                     }
 
-                    is.addUnsafeEnchantment(enchantment, level);
+                    ism.addEnchant(enchantment, level, true);
                 }
             }
         }
diff --git a/src/main/java/com/leonardobishop/quests/hooks/itemgetter/ItemGetter_1_13.java b/src/main/java/com/leonardobishop/quests/hooks/itemgetter/ItemGetter_1_13.java
index aac4fec4..c3234a7f 100644
--- a/src/main/java/com/leonardobishop/quests/hooks/itemgetter/ItemGetter_1_13.java
+++ b/src/main/java/com/leonardobishop/quests/hooks/itemgetter/ItemGetter_1_13.java
@@ -180,16 +180,18 @@ public class ItemGetter_1_13 implements ItemGetter {
                         levelName = "1";
                     }
 
-                    NamespacedKey namespacedKey;
-                    try {
-                        namespacedKey = new NamespacedKey(namespace, ench);
-                    } catch (Exception e) {
-                        plugin.getQuestsLogger().debug("Unrecognised namespace: " + namespace);
-                        continue;
-                    }
+                    // TODO i don't know how these namespaces work
+//                    NamespacedKey namespacedKey;
+//                    try {
+//                        namespacedKey = new NamespacedKey(namespace, ench);
+//                    } catch (Exception e) {
+//                        plugin.getQuestsLogger().debug("Unrecognised namespace: " + namespace);
+//                        e.printStackTrace();
+//                        continue;
+//                    }
                     Enchantment enchantment;
-                    if ((enchantment = Enchantment.getByKey(namespacedKey)) == null) {
-                        plugin.getQuestsLogger().debug("Unrecognised enchantment: " + namespacedKey);
+                    if ((enchantment = Enchantment.getByName(ench)) == null) {
+                        plugin.getQuestsLogger().debug("Unrecognised enchantment: " + ench);
                         continue;
                     }
 
diff --git a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/dependent/CitizensDeliverTaskType.java b/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/dependent/CitizensDeliverTaskType.java
index ccced949..d9d4ec82 100644
--- a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/dependent/CitizensDeliverTaskType.java
+++ b/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/dependent/CitizensDeliverTaskType.java
@@ -121,7 +121,8 @@ public final class CitizensDeliverTaskType extends TaskType {
 
                     ItemStack is;
                     if (configBlock instanceof ConfigurationSection) {
-                        is = Quests.get().getItemStack(null, (org.bukkit.configuration.ConfigurationSection) configBlock);
+                        is = Quests.get().getItemStack("", (org.bukkit.configuration.ConfigurationSection) configBlock);
+                        player.getInventory().addItem(is);
                     } else {
                         material = Material.getMaterial(String.valueOf(configBlock));
 
-- 
cgit v1.2.3-70-g09d2