From 9566020a9cfb9b0c597bc1fb633676a6ae022b1e Mon Sep 17 00:00:00 2001
From: Auxilor <will@willfp.com>
Date: Fri, 12 Mar 2021 21:37:11 +0000
Subject: [PATCH] Removed spawn egg

---
 .../java/com/willfp/ecobosses/bosses/EcoBoss.java     | 11 +++--------
 .../src/main/resources/bosses/illusioner.yml          |  7 +------
 2 files changed, 4 insertions(+), 14 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 2f30435..f5f69ff 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
@@ -2,7 +2,6 @@ package com.willfp.ecobosses.bosses;
 
 import com.willfp.eco.internal.config.AbstractUndefinedConfig;
 import com.willfp.eco.util.NumberUtils;
-import com.willfp.eco.util.StringUtils;
 import com.willfp.eco.util.internal.PluginDependent;
 import com.willfp.eco.util.plugin.AbstractEcoPlugin;
 import com.willfp.ecobosses.bosses.util.bosstype.BossEntityUtils;
@@ -32,7 +31,6 @@ import org.bukkit.entity.EntityType;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.SpawnEggMeta;
 import org.bukkit.persistence.PersistentDataType;
 import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;
@@ -147,12 +145,6 @@ public class EcoBoss extends PluginDependent {
     @Getter
     private final boolean attackOnInjure;
 
-    /**
-     * The ItemStack for the spawn egg.
-     */
-    @Getter
-    private final ItemStack spawnEgg;
-
     /**
      * Sounds played on injure.
      */
@@ -321,6 +313,7 @@ public class EcoBoss extends PluginDependent {
         }
 
         // Spawn egg
+        /*
         Material eggMaterial = Material.matchMaterial(this.getConfig().getString("spawn-egg.egg-material").toUpperCase());
         assert eggMaterial != null;
         this.spawnEgg = new ItemStack(eggMaterial);
@@ -335,6 +328,8 @@ public class EcoBoss extends PluginDependent {
         meta.getPersistentDataContainer().set(this.getPlugin().getNamespacedKeyFactory().create("spawn_egg"), PersistentDataType.STRING, this.getName());
         this.spawnEgg.setItemMeta(meta);
 
+         */
+
         // Teleportation
         this.teleportationEnabled = this.getConfig().getBool("defence.teleport.enabled");
         this.teleportOptions = new TeleportOptions(
diff --git a/eco-core/core-plugin/src/main/resources/bosses/illusioner.yml b/eco-core/core-plugin/src/main/resources/bosses/illusioner.yml
index 3bfccfd..53c026a 100644
--- a/eco-core/core-plugin/src/main/resources/bosses/illusioner.yml
+++ b/eco-core/core-plugin/src/main/resources/bosses/illusioner.yml
@@ -3,11 +3,6 @@ enabled: true
 name: "Illusioner" # Display name
 base-mob: custom_illusioner # Any existing mob - custom_illusioner is also accepted (like in the old Illusioner plugin)
 
-spawn-egg:
-  egg-material: squid_spawn_egg
-  display-name: "Illusioner Spawn Egg"
-  lore: []
-
 bossbar:
   enabled: true
   color: BLUE # Choose from: BLUE, GREEN, PINK, PURPLE, RED, WHITE, YELLOW
@@ -20,7 +15,7 @@ spawn-totem:
   enabled: true
   top: carved_pumpkin
   middle: beacon
-  bottom: diamond
+  bottom: diamond_block
 
 rewards:
   xp: