From 733c48d3dea221b0596dd47297b335f4473e7d99 Mon Sep 17 00:00:00 2001
From: Auxilor <will@willfp.com>
Date: Fri, 5 Mar 2021 20:06:02 +0000
Subject: [PATCH] Fixed drop system (somehow)

---
 .../willfp/illusioner/commands/CommandIldrop.java    |  9 ++++++---
 .../com/willfp/illusioner/config/configs/Drops.java  |  6 +++---
 .../illusioner/options/IllusionerOptions.java        | 12 +++++++-----
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/eco-core/core-plugin/src/main/java/com/willfp/illusioner/commands/CommandIldrop.java b/eco-core/core-plugin/src/main/java/com/willfp/illusioner/commands/CommandIldrop.java
index 70344df..1bf90b1 100644
--- a/eco-core/core-plugin/src/main/java/com/willfp/illusioner/commands/CommandIldrop.java
+++ b/eco-core/core-plugin/src/main/java/com/willfp/illusioner/commands/CommandIldrop.java
@@ -1,9 +1,9 @@
 package com.willfp.illusioner.commands;
 
+import com.willfp.eco.util.NumberUtils;
 import com.willfp.eco.util.command.AbstractCommand;
 import com.willfp.illusioner.IllusionerPlugin;
 import com.willfp.illusioner.config.IllusionerConfigs;
-import com.willfp.illusioner.illusioner.IllusionerManager;
 import org.bukkit.Material;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -32,8 +32,11 @@ public class CommandIldrop extends AbstractCommand {
             return;
         }
 
-        IllusionerConfigs.DROPS.getConfig().set(String.valueOf(IllusionerManager.OPTIONS.getDrops().size()), itemStack);
+        IllusionerConfigs.DROPS.getConfig().set(String.valueOf(NumberUtils.randInt(0, 100000)), itemStack);
+        IllusionerConfigs.DROPS.save();
+        IllusionerConfigs.DROPS.clearCache();
         player.sendMessage(this.getPlugin().getLangYml().getMessage("added-drop"));
-        player.sendMessage(this.getPlugin().getLangYml().getMessage("reload-plugin"));
+
+        this.getPlugin().reload();
     }
 }
diff --git a/eco-core/core-plugin/src/main/java/com/willfp/illusioner/config/configs/Drops.java b/eco-core/core-plugin/src/main/java/com/willfp/illusioner/config/configs/Drops.java
index 6f07ecb..f9afb70 100644
--- a/eco-core/core-plugin/src/main/java/com/willfp/illusioner/config/configs/Drops.java
+++ b/eco-core/core-plugin/src/main/java/com/willfp/illusioner/config/configs/Drops.java
@@ -1,16 +1,16 @@
 package com.willfp.illusioner.config.configs;
 
-import com.willfp.eco.util.config.StaticBaseConfig;
+import com.willfp.eco.util.config.BaseConfig;
 import com.willfp.illusioner.IllusionerPlugin;
 
 import java.io.IOException;
 
-public class Drops extends StaticBaseConfig {
+public class Drops extends BaseConfig {
     /**
      * Instantiate drops.yml.
      */
     public Drops() {
-        super("drops", IllusionerPlugin.getInstance());
+        super("drops", false, IllusionerPlugin.getInstance());
     }
 
     /**
diff --git a/eco-core/core-plugin/src/main/java/com/willfp/illusioner/illusioner/options/IllusionerOptions.java b/eco-core/core-plugin/src/main/java/com/willfp/illusioner/illusioner/options/IllusionerOptions.java
index a5f9a7e..26f5452 100644
--- a/eco-core/core-plugin/src/main/java/com/willfp/illusioner/illusioner/options/IllusionerOptions.java
+++ b/eco-core/core-plugin/src/main/java/com/willfp/illusioner/illusioner/options/IllusionerOptions.java
@@ -16,7 +16,9 @@ import org.bukkit.boss.BarStyle;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.ArrayList;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 
 @ToString
@@ -78,7 +80,7 @@ public class IllusionerOptions extends PluginDependent {
      * The drops.
      */
     @Getter
-    private Set<ItemStack> drops;
+    private List<ItemStack> drops;
 
     /**
      * The gameplay options.
@@ -140,14 +142,14 @@ public class IllusionerOptions extends PluginDependent {
 
         gameplayOptions.reload();
 
-        drops = new HashSet<>();
-        IllusionerConfigs.DROPS.getConfig().getKeys(false).forEach(key -> {
+        drops = new ArrayList<>();
+        for (String key : IllusionerConfigs.DROPS.getConfig().getKeys(false)) {
             ItemStack itemStack = IllusionerConfigs.DROPS.getConfig().getItemStack(key);
             if (itemStack == null || itemStack.getType() == Material.AIR) {
-                return;
+                continue;
             }
             drops.add(itemStack);
-        });
+        }
     }
 
     /**