From 8fde121570fe21b3008a224919104c692290f264 Mon Sep 17 00:00:00 2001
From: MagicBot <MagicBot@magicbane.com>
Date: Fri, 24 Feb 2023 01:22:00 -0500
Subject: [PATCH] lastHotZoneUpdate instant moved to ZoneManager.

---
 src/engine/gameManager/ZoneManager.java             | 5 +++--
 src/engine/net/client/handlers/CityDataHandler.java | 6 +-----
 src/engine/net/client/msg/HotzoneChangeMsg.java     | 6 ++----
 src/engine/server/world/WorldServer.java            | 3 ---
 4 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/src/engine/gameManager/ZoneManager.java b/src/engine/gameManager/ZoneManager.java
index 463568f5..f73fbadb 100644
--- a/src/engine/gameManager/ZoneManager.java
+++ b/src/engine/gameManager/ZoneManager.java
@@ -17,9 +17,9 @@ import engine.objects.Building;
 import engine.objects.City;
 import engine.objects.Zone;
 import engine.server.MBServerStatics;
-import engine.server.world.WorldServer;
 import org.pmw.tinylog.Logger;
 
+import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.util.ArrayList;
@@ -37,6 +37,7 @@ public enum ZoneManager {
 
     ZONEMANAGER;
 
+    public static Instant hotZoneLastUpdate;
     /* Instance variables */
     private static Zone seaFloor = null;
     public static Zone hotZone = null;
@@ -155,7 +156,7 @@ public enum ZoneManager {
         ZoneManager.hotZone = zone;
         ZoneManager.hotZoneCycle = 1;  // Used with HOTZONE_DURATION from config.
         zone.hasBeenHotzone = true;
-        WorldServer.hotZoneLastUpdate = LocalDateTime.now().atZone(ZoneId.systemDefault()).toInstant();
+        hotZoneLastUpdate = LocalDateTime.now().atZone(ZoneId.systemDefault()).toInstant();
 
     }
 
diff --git a/src/engine/net/client/handlers/CityDataHandler.java b/src/engine/net/client/handlers/CityDataHandler.java
index f1033a22..cad913b3 100644
--- a/src/engine/net/client/handlers/CityDataHandler.java
+++ b/src/engine/net/client/handlers/CityDataHandler.java
@@ -10,13 +10,9 @@ import engine.net.DispatchMessage;
 import engine.net.client.ClientConnection;
 import engine.net.client.msg.*;
 import engine.objects.City;
-import engine.objects.Mine;
 import engine.objects.PlayerCharacter;
-import engine.server.world.WorldServer;
 import engine.session.Session;
 
-import java.time.ZoneId;
-
 /*
  * @Author:
  * @Summary: Processes application protocol message which displays
@@ -68,7 +64,7 @@ public class CityDataHandler extends AbstractClientMsgHandler {
 
         // If the hotZone has changed then update the client's map accordingly.
 
-        if (playerCharacter.getTimeStamp("hotzoneupdate") <= WorldServer.hotZoneLastUpdate.toEpochMilli() && ZoneManager.hotZone != null) {
+        if (playerCharacter.getTimeStamp("hotzoneupdate") <= ZoneManager.hotZoneLastUpdate.toEpochMilli() && ZoneManager.hotZone != null) {
                 HotzoneChangeMsg hotzoneChangeMsg = new HotzoneChangeMsg(Enum.GameObjectType.Zone.ordinal(), ZoneManager.hotZone.getObjectUUID());
                 dispatch = Dispatch.borrow(playerCharacter, hotzoneChangeMsg);
                 DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
diff --git a/src/engine/net/client/msg/HotzoneChangeMsg.java b/src/engine/net/client/msg/HotzoneChangeMsg.java
index d5874c41..2072976c 100644
--- a/src/engine/net/client/msg/HotzoneChangeMsg.java
+++ b/src/engine/net/client/msg/HotzoneChangeMsg.java
@@ -11,15 +11,13 @@ package engine.net.client.msg;
 
 
 import engine.gameManager.ConfigManager;
-import engine.math.FastMath;
+import engine.gameManager.ZoneManager;
 import engine.net.AbstractConnection;
 import engine.net.ByteBufferReader;
 import engine.net.ByteBufferWriter;
 import engine.net.client.Protocol;
-import engine.server.world.WorldServer;
 
 import java.time.Duration;
-import java.time.LocalDateTime;
 
 
 public class HotzoneChangeMsg extends ClientNetMsg {
@@ -38,7 +36,7 @@ public class HotzoneChangeMsg extends ClientNetMsg {
 
         int hotZoneDuration = Integer.parseInt(ConfigManager.MB_HOTZONE_DURATION.getValue());
 
-        endOfCycle = Duration.between(WorldServer.hotZoneLastUpdate, WorldServer.hotZoneLastUpdate.plusSeconds(hotZoneDuration * 3600));
+        endOfCycle = Duration.between(ZoneManager.hotZoneLastUpdate, ZoneManager.hotZoneLastUpdate.plusSeconds(hotZoneDuration * 3600));
 
     }
 
diff --git a/src/engine/server/world/WorldServer.java b/src/engine/server/world/WorldServer.java
index d239a41b..20bb7f1d 100644
--- a/src/engine/server/world/WorldServer.java
+++ b/src/engine/server/world/WorldServer.java
@@ -58,9 +58,7 @@ import java.io.IOException;
 import java.net.InetAddress;
 import java.nio.file.Files;
 import java.nio.file.Paths;
-import java.time.Instant;
 import java.time.LocalDateTime;
-import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -72,7 +70,6 @@ import static java.lang.System.exit;
 public class WorldServer {
 
 	private static LocalDateTime bootTime = LocalDateTime.now();
-	public static Instant hotZoneLastUpdate;
 	public boolean isRunning = false;
 
 	// Member variable declaration