From 8ff02162435e56a84591a704f835e3b837757da0 Mon Sep 17 00:00:00 2001
From: MagicBot <MagicBot@magicbane.com>
Date: Thu, 19 Jan 2023 16:12:18 -0500
Subject: [PATCH] Opening mines at the end of bootstrap.
---
src/engine/net/client/ClientMessagePump.java | 2 +-
src/engine/server/world/WorldServer.java | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/engine/net/client/ClientMessagePump.java b/src/engine/net/client/ClientMessagePump.java
index 3dfab2e4..795c0889 100644
--- a/src/engine/net/client/ClientMessagePump.java
+++ b/src/engine/net/client/ClientMessagePump.java
@@ -1491,7 +1491,7 @@ boolean updateCity = false;
return;
//make sure mine belongs to guild
- if (mine.getOwningGuild() == null || mine.getOwningGuild().getObjectUUID() != sourcePlayer.getGuild().getObjectUUID())
+ if (mine.getOwningGuild().isErrant() || mine.getOwningGuild().getObjectUUID() != sourcePlayer.getGuild().getObjectUUID())
return;
//make sure valid resource
diff --git a/src/engine/server/world/WorldServer.java b/src/engine/server/world/WorldServer.java
index 7a259e66..9dce6c5a 100644
--- a/src/engine/server/world/WorldServer.java
+++ b/src/engine/server/world/WorldServer.java
@@ -391,10 +391,6 @@ public class WorldServer {
Logger.info("Loading Mine data.");
Mine.loadAllMines();
- // Open/Close mines for the current window
- Logger.info("Processing mine window.");
- HourlyJobThread.processMineWindow();
-
Logger.info("Loading Shrine data.");
DbManager.ShrineQueries.LOAD_ALL_SHRINES();
@@ -472,6 +468,10 @@ public class WorldServer {
Logger.info("Starting Orphan Item Purge");
PurgeOprhans.startPurgeThread();
+ // Open/Close mines for the current window
+ Logger.info("Processing mine window.");
+ HourlyJobThread.processMineWindow();
+
// Calculate bootstrap time and rest boot time to current time.
java.time.Duration bootDuration = java.time.Duration.between(LocalDateTime.now(), bootTime);
long bootSeconds = Math.abs(bootDuration.getSeconds());