From 890b034d4a1033d4e2606052c58a3bbb93c16d40 Mon Sep 17 00:00:00 2001
From: Auxilor <william.favierparsons1@gmail.com>
Date: Tue, 29 Jun 2021 18:29:08 +0100
Subject: [PATCH] Bosses should now load the chunk they're in on autospawn

---
 .../main/java/com/willfp/ecobosses/bosses/EcoBoss.java   | 2 ++
 .../ecobosses/bosses/listeners/AutoSpawnTimer.java       | 9 ++-------
 2 files changed, 4 insertions(+), 7 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 be07a06..0c1dd62 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
@@ -457,6 +457,8 @@ public class EcoBoss extends PluginDependent {
      * @param location The location.
      */
     public void spawn(@NotNull final Location location) {
+        location.getChunk().load();
+
         LivingEntity entity = bossType.spawnBossEntity(location);
         this.livingBosses.put(entity.getUniqueId(), new LivingEcoBoss(
                         this.getPlugin(),
diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/listeners/AutoSpawnTimer.java b/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/listeners/AutoSpawnTimer.java
index 8470c7d..44243b4 100644
--- a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/listeners/AutoSpawnTimer.java
+++ b/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/listeners/AutoSpawnTimer.java
@@ -1,10 +1,8 @@
 package com.willfp.ecobosses.bosses.listeners;
 
 import com.willfp.eco.util.NumberUtils;
-import com.willfp.ecobosses.EcoBossesPlugin;
 import com.willfp.ecobosses.bosses.EcoBoss;
 import com.willfp.ecobosses.bosses.EcoBosses;
-import com.willfp.ecobosses.bosses.LivingEcoBoss;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.World;
@@ -37,12 +35,9 @@ public class AutoSpawnTimer implements Runnable {
             for (UUID uuid : boss.getLivingBosses().keySet()) {
                 Entity entity = Bukkit.getEntity(uuid);
 
-                if (entity == null) {
-                    boss.removeLivingBoss(uuid);
-                    continue;
+                if (entity != null) {
+                    worlds.add(entity.getWorld());
                 }
-
-                worlds.add(entity.getWorld());
             }
 
             List<Location> locations = new ArrayList<>(boss.getAutoSpawnLocations());