From 60822767b15400f6f80c1534ba745f047de91a2f Mon Sep 17 00:00:00 2001
From: Auxilor <will@willfp.com>
Date: Sat, 13 Mar 2021 13:17:29 +0000
Subject: [PATCH] Fixed miscellaneous bugs

---
 .../main/java/com/willfp/ecobosses/bosses/EcoBoss.java |  7 ++-----
 .../ecobosses/bosses/listeners/AttackListeners.java    |  7 -------
 .../ecobosses/bosses/listeners/DeathListeners.java     | 10 ----------
 .../com/willfp/ecobosses/config/BaseBossConfig.java    |  2 +-
 4 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/EcoBoss.java b/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/EcoBoss.java
index 9dda990..84987d1 100644
--- a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/EcoBoss.java
+++ b/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/EcoBoss.java
@@ -27,7 +27,6 @@ import org.bukkit.boss.BarColor;
 import org.bukkit.boss.BarFlag;
 import org.bukkit.boss.BarStyle;
 import org.bukkit.boss.BossBar;
-import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.InvalidConfigurationException;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.EntityType;
@@ -37,10 +36,8 @@ import org.bukkit.inventory.ItemStack;
 import org.bukkit.persistence.PersistentDataType;
 import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;
-import org.bukkit.util.StringUtil;
 import org.jetbrains.annotations.NotNull;
 
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Base64;
 import java.util.Collections;
@@ -251,8 +248,8 @@ public class EcoBoss extends PluginDependent {
             }
             String tempConfigString = new String(Base64.getDecoder().decode(string));
             try {
-                tempConfig.load(tempConfigString);
-            } catch (IOException | InvalidConfigurationException e) {
+                tempConfig.loadFromString(tempConfigString);
+            } catch (InvalidConfigurationException e) {
                 e.printStackTrace();
             }
             ItemStack itemStack = tempConfig.getItemStack("drop-key");
diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/listeners/AttackListeners.java b/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/listeners/AttackListeners.java
index 2e1c36e..3855617 100644
--- a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/listeners/AttackListeners.java
+++ b/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/listeners/AttackListeners.java
@@ -3,7 +3,6 @@ package com.willfp.ecobosses.bosses.listeners;
 import com.willfp.eco.util.NumberUtils;
 import com.willfp.eco.util.internal.PluginDependent;
 import com.willfp.eco.util.plugin.AbstractEcoPlugin;
-import com.willfp.ecobosses.EcoBossesPlugin;
 import com.willfp.ecobosses.bosses.EcoBoss;
 import com.willfp.ecobosses.bosses.util.BossUtils;
 import com.willfp.ecobosses.bosses.util.obj.DamagerProperty;
@@ -22,16 +21,10 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent;
 import org.bukkit.event.entity.EntityDamageEvent;
 import org.jetbrains.annotations.NotNull;
 
-import javax.swing.tree.TreeNode;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.Optional;
-import java.util.SortedMap;
-import java.util.TreeMap;
-import java.util.UUID;
 
 public class AttackListeners extends PluginDependent implements Listener {
     /**
diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/listeners/DeathListeners.java b/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/listeners/DeathListeners.java
index 5819f2c..f1fe40d 100644
--- a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/listeners/DeathListeners.java
+++ b/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/listeners/DeathListeners.java
@@ -18,19 +18,9 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.entity.EntityDeathEvent;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
-import sun.reflect.generics.tree.Tree;
 
 import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.Map;
-import java.util.SortedMap;
-import java.util.TreeMap;
-import java.util.UUID;
-import java.util.stream.Collectors;
 
 public class DeathListeners extends PluginDependent implements Listener {
     /**
diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/config/BaseBossConfig.java b/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/config/BaseBossConfig.java
index cb865dd..9997bc9 100644
--- a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/config/BaseBossConfig.java
+++ b/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/config/BaseBossConfig.java
@@ -11,6 +11,6 @@ public class BaseBossConfig extends ExtendableConfig {
      * @param configName The name of the config.
      */
     public BaseBossConfig(@NotNull final String configName) {
-        super(configName, false, EcoBossesPlugin.getInstance(), EcoBossesPlugin.class, "bosses/");
+        super(configName, true, EcoBossesPlugin.getInstance(), EcoBossesPlugin.class, "bosses/");
     }
 }