From 0a316afe4dd5f376168c400a57ebff4538ae8fbf Mon Sep 17 00:00:00 2001
From: dginovker <dcress01@uoguelph.ca>
Date: Thu, 7 Nov 2019 16:43:01 -0500
Subject: [PATCH] make immersive bots occur at startup

---
 .../entity/player/ai/resource/ResourceAIPManager.java  | 10 ++++++++++
 Server/src/org/crandor/game/world/GameWorld.java       |  1 +
 Server/src/plugin/command/AIPCommandPlugin.java        |  7 ++++---
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/Server/src/org/crandor/game/node/entity/player/ai/resource/ResourceAIPManager.java b/Server/src/org/crandor/game/node/entity/player/ai/resource/ResourceAIPManager.java
index 725658a50..314a1f4a8 100644
--- a/Server/src/org/crandor/game/node/entity/player/ai/resource/ResourceAIPManager.java
+++ b/Server/src/org/crandor/game/node/entity/player/ai/resource/ResourceAIPManager.java
@@ -1,8 +1,11 @@
 package org.crandor.game.node.entity.player.ai.resource;
 
 import org.crandor.game.node.entity.player.Player;
+import org.crandor.game.node.entity.player.ai.AIPBuilder;
+import org.crandor.game.node.entity.player.ai.pvmbots.PvMBotsBuilder;
 import org.crandor.game.node.entity.player.ai.resource.task.ResourceTask;
 import org.crandor.game.node.entity.player.ai.resource.task.ResourceTasks;
+import org.crandor.game.node.entity.player.ai.skillingbot.SkillingBotsBuilder;
 import org.crandor.game.system.task.Pulse;
 import org.crandor.game.world.GameWorld;
 
@@ -32,6 +35,13 @@ public class ResourceAIPManager {
         return this;
     }
 
+    public void immerseWorld() { //There's probably a better place for this (it adds bot at bootup)
+        PvMBotsBuilder.immersiveSpawns();
+        AIPBuilder.immersiveSpawns();
+        SkillingBotsBuilder.immersiveSpawnsSkillingBots();
+        System.out.println("Loaded immerseWorld");
+    }
+
     public ResourceAIPManager runTask(Player player, String taskName) {
         for (Map.Entry<ResourceTask, Long> entry : getTasks().entrySet()) {
             if (entry.getKey().getTaskName().equalsIgnoreCase(taskName)) {
diff --git a/Server/src/org/crandor/game/world/GameWorld.java b/Server/src/org/crandor/game/world/GameWorld.java
index fd78ab575..7508c7614 100644
--- a/Server/src/org/crandor/game/world/GameWorld.java
+++ b/Server/src/org/crandor/game/world/GameWorld.java
@@ -189,6 +189,7 @@ public final class GameWorld {
         SQLManager.postPlugin();
         parseObjects();
         CallbackHub.call();
+
 //        ResourceAIPManager.get().init();
         if (run) {
             SystemManager.flag(GameWorld.getSettings().isDevMode() ? SystemState.PRIVATE : SystemState.ACTIVE);
diff --git a/Server/src/plugin/command/AIPCommandPlugin.java b/Server/src/plugin/command/AIPCommandPlugin.java
index d3e840e26..017ac570b 100644
--- a/Server/src/plugin/command/AIPCommandPlugin.java
+++ b/Server/src/plugin/command/AIPCommandPlugin.java
@@ -13,6 +13,7 @@ import org.crandor.game.node.entity.player.ai.pvmbots.PvMBotsBuilder;
 import org.crandor.game.node.entity.player.ai.pvp.PVPAIPActions;
 import org.crandor.game.node.entity.player.ai.pvp.PVPAIPBuilderUtils;
 import org.crandor.game.node.entity.player.ai.resource.ResourceAIPActions;
+import org.crandor.game.node.entity.player.ai.resource.ResourceAIPManager;
 import org.crandor.game.node.entity.player.ai.skillingbot.SkillingBotsBuilder;
 import org.crandor.game.node.entity.player.ai.wilderness.PvPBotsBuilder;
 import org.crandor.game.node.entity.player.link.appearance.Gender;
@@ -214,10 +215,10 @@ public final class AIPCommandPlugin extends CommandPlugin {
             case "noobbot":
                 PvMBotsBuilder.spawnNoob(player.getLocation());
                 return true;
+            case "immerse":
+            case "immersiveworld":
             case "immersive":
-                PvMBotsBuilder.immersiveSpawns();
-                AIPBuilder.immersiveSpawns();
-                SkillingBotsBuilder.immersiveSpawnsSkillingBots();
+                ResourceAIPManager.get().immerseWorld();
                 return true;
             case "fishtest":
                 SkillingBotsBuilder.spawnTroutLumbridge("Bot", new Location(3241, 3242));