Mine window methods moved to HourlyJobThread and made static.

src/engine/devcmd/cmds/MineActiveCmd.java

@@ -16,6 +16,7 @@ import engine.objects.AbstractGameObject;
 import engine.objects.Building;
 import engine.objects.Mine;
 import engine.objects.PlayerCharacter;
+import engine.workthreads.HourlyJobThread;
 
 /**
  *
@@ -40,11 +41,11 @@ public class MineActiveCmd extends AbstractDevCmd {
 		String trigger = args[0];
 		switch (trigger){
 		case "true":
-			mine.handleStartMineWindow();
+			HourlyJobThread.handleStartMineWindow(mine);
 			Mine.setLastChange(System.currentTimeMillis());
 			break;
 		case "false":
-			mine.handleEndMineWindow();
+			HourlyJobThread.handleEndMineWindow(mine);
 			Mine.setLastChange(System.currentTimeMillis());
 			break;
 		default:

src/engine/objects/Mine.java

@@ -44,7 +44,7 @@ public class Mine extends AbstractGameObject {
 
     private String zoneName;
     private Resource production;
-    private boolean isActive = false;
+    public boolean isActive = false;
 
     private float latitude;
     private float longitude;
@@ -61,10 +61,10 @@ public class Mine extends AbstractGameObject {
 
 
     // Not persisted to DB
-    private String guildName;
+    public String guildName;
-    private GuildTag guildTag;
+    public GuildTag guildTag;
-    private String nationName;
+    public String nationName;
-    private GuildTag nationTag;
+    public GuildTag nationTag;
     public static ConcurrentHashMap<Mine, Integer> mineMap = new ConcurrentHashMap<>(MBServerStatics.CHM_INIT_CAP, MBServerStatics.CHM_LOAD, MBServerStatics.CHM_THREAD_LOW);
     public static ConcurrentHashMap<Integer, Mine> towerMap = new ConcurrentHashMap<>(MBServerStatics.CHM_INIT_CAP, MBServerStatics.CHM_LOAD, MBServerStatics.CHM_THREAD_LOW);
 
@@ -381,13 +381,6 @@ public class Mine extends AbstractGameObject {
         this.buildingID = buildingID;
     }
 
-    public void handleStartMineWindow() {
-
-        this.setActive(true);
-        ChatManager.chatSystemChannel(this.zoneName + "'s Mine is now Active!");
-        Logger.info(this.zoneName + "'s Mine is now Active!");
-    }
-
     public static boolean validClaimer(PlayerCharacter playerCharacter) {
 
         Guild playerGuild;
@@ -493,72 +486,6 @@ public class Mine extends AbstractGameObject {
         BuildingManager.cleanupHirelings(building);
     }
 
-    public boolean handleEndMineWindow() {
-
-        // No need to end the window of a mine which never opened.
-
-        if (this.isActive == false)
-            return false;
-
-        Building mineBuilding = BuildingManager.getBuildingFromCache(this.buildingID);
-
-        if (mineBuilding == null) {
-            Logger.debug("Null mine building for Mine " + this.getObjectUUID() + " Building " + this.buildingID);
-            return false;
-        }
-
-        if (mineBuilding.getRank() > 0) {
-            //never knocked down, let's just move on.
-            //hasn't been claimed since server start.
-            this.setActive(false);
-            this.lastClaimer = null;
-            return true;
-        }
-
-        // This mine does not have a valid claimer
-        // we will therefore set it to errant
-        // and keep the window open.
-
-        if (!validClaimer(this.lastClaimer)) {
-            this.lastClaimer = null;
-            this.updateGuildOwner(null);
-            this.setActive(true);
-            return false;
-        }
-
-        if (this.owningGuild.isEmptyGuild() || this.owningGuild.getNation().isEmptyGuild())
-            return false;
-
-        //Update ownership to map
-
-        this.guildName = this.owningGuild.getName();
-        this.guildTag = this.owningGuild.getGuildTag();
-        Guild nation = this.owningGuild.getNation();
-        this.nationName = nation.getName();
-        this.nationTag = nation.getGuildTag();
-
-        setLastChange(System.currentTimeMillis());
-
-        mineBuilding.rebuildMine();
-        WorldGrid.updateObject(mineBuilding);
-
-        ChatSystemMsg chatMsg = new ChatSystemMsg(null, this.lastClaimer.getName() + " has claimed the mine in " + this.parentZone.getParent().getName() + " for " + this.owningGuild.getName() + ". The mine is no longer active.");
-        chatMsg.setMessageType(10);
-        chatMsg.setChannel(Enum.ChatChannelType.SYSTEM.getChannelID());
-        DispatchMessage.dispatchMsgToAll(chatMsg);
-
-        // Warehouse this claim event
-
-        MineRecord mineRecord = MineRecord.borrow(this, this.lastClaimer, Enum.RecordEventType.CAPTURE);
-        DataWarehouse.pushToWarehouse(mineRecord);
-
-        mineBuilding.setRank(mineBuilding.getRank());
-		this.lastClaimer = null;
-        this.setActive(false);
-        this.wasClaimed = true;
-        return true;
-    }
-
     public boolean claimMine(PlayerCharacter claimer) {
 
         if (claimer == null)

src/engine/workthreads/HourlyJobThread.java

@@ -10,10 +10,13 @@
 package engine.workthreads;
 
 import engine.Enum;
-import engine.gameManager.DbManager;
+import engine.InterestManagement.WorldGrid;
-import engine.gameManager.SimulationManager;
+import engine.db.archive.DataWarehouse;
-import engine.gameManager.ZoneManager;
+import engine.db.archive.MineRecord;
+import engine.gameManager.*;
+import engine.net.DispatchMessage;
 import engine.net.MessageDispatcher;
+import engine.net.client.msg.chat.ChatSystemMsg;
 import engine.objects.*;
 import engine.server.world.WorldServer;
 import org.pmw.tinylog.Logger;
@@ -184,23 +187,24 @@ public class HourlyJobThread implements Runnable {
                     // Open Errant Mines
 
                     if (mine.getOwningGuild().isEmptyGuild()) {
-                        mine.handleStartMineWindow();
+                        HourlyJobThread.handleStartMineWindow(mine);
                         Mine.setLastChange(System.currentTimeMillis());
                         continue;
                     }
 
-                    // Open Mines with a current guild hour
+                    // Open Mines owned by nations having their WOO
+                    // set to the current mine window.
 
                     if (mine.getOwningGuild().getNation().getMineTime() ==
                             LocalDateTime.now().getHour()) {
-                        mine.handleStartMineWindow();
+                        HourlyJobThread.handleStartMineWindow(mine);
                         Mine.setLastChange(System.currentTimeMillis());
                         continue;
                     }
 
-                    // Close all remaining mines
+                    // Close all the remaining mines
 
-                    if (mine.handleEndMineWindow())
+                    if (handleEndMineWindow(mine))
                         Mine.setLastChange(System.currentTimeMillis());
 
                 } catch (Exception e) {
@@ -211,4 +215,77 @@ public class HourlyJobThread implements Runnable {
             Logger.error(e.toString());
         }
     }
+
+    public static void handleStartMineWindow(Mine mine) {
+
+        mine.setActive(true);
+        ChatManager.chatSystemChannel(mine.getZoneName() + "'s Mine is now Active!");
+        Logger.info(mine.getZoneName() + "'s Mine is now Active!");
+    }
+
+    public static boolean handleEndMineWindow(Mine mine) {
+
+        // No need to end the window of a mine which never opened.
+
+        if (mine.isActive == false)
+            return false;
+
+        Building mineBuilding = BuildingManager.getBuildingFromCache(mine.getBuildingID());
+
+        if (mineBuilding == null) {
+            Logger.debug("Null mine building for Mine " + mine.getObjectUUID() + " Building " + mine.getBuildingID());
+            return false;
+        }
+
+        if (mineBuilding.getRank() > 0) {
+            //never knocked down, let's just move on.
+            //hasn't been claimed since server start.
+            mine.setActive(false);
+            mine.lastClaimer = null;
+            return true;
+        }
+
+        // This mine does not have a valid claimer
+        // we will therefore set it to errant
+        // and keep the window open.
+
+        if (!Mine.validClaimer(mine.lastClaimer)) {
+            mine.lastClaimer = null;
+            mine.updateGuildOwner(null);
+            mine.setActive(true);
+            return false;
+        }
+
+        if (mine.getOwningGuild().isEmptyGuild() || mine.getOwningGuild().getNation().isEmptyGuild())
+            return false;
+
+        //Update ownership to map
+
+        mine.guildName = mine.getOwningGuild().getName();
+        mine.guildTag = mine.getOwningGuild().getGuildTag();
+        Guild nation = mine.getOwningGuild().getNation();
+        mine.nationName = nation.getName();
+        mine.nationTag = nation.getGuildTag();
+
+        Mine.setLastChange(System.currentTimeMillis());
+
+        mineBuilding.rebuildMine();
+        WorldGrid.updateObject(mineBuilding);
+
+        ChatSystemMsg chatMsg = new ChatSystemMsg(null, mine.lastClaimer.getName() + " has claimed the mine in " + mine.getParentZone().getParent().getName() + " for " + mine.getOwningGuild().getName() + ". The mine is no longer active.");
+        chatMsg.setMessageType(10);
+        chatMsg.setChannel(Enum.ChatChannelType.SYSTEM.getChannelID());
+        DispatchMessage.dispatchMsgToAll(chatMsg);
+
+        // Warehouse this claim event
+
+        MineRecord mineRecord = MineRecord.borrow(mine, mine.lastClaimer, Enum.RecordEventType.CAPTURE);
+        DataWarehouse.pushToWarehouse(mineRecord);
+
+        mineBuilding.setRank(mineBuilding.getRank());
+        mine.lastClaimer = null;
+        mine.setActive(false);
+        mine.wasClaimed = true;
+        return true;
+    }
 }