From 9e7cbdc2d307ca229362ce8321e72b6b23ca67fe Mon Sep 17 00:00:00 2001 From: MagicBot Date: Thu, 19 Jan 2023 12:19:37 -0500 Subject: [PATCH] bugfix: guilds cannot be null only errant. --- src/engine/objects/Mine.java | 2 +- src/engine/workthreads/HourlyJobThread.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/engine/objects/Mine.java b/src/engine/objects/Mine.java index 1e25ab47..239cf197 100644 --- a/src/engine/objects/Mine.java +++ b/src/engine/objects/Mine.java @@ -288,7 +288,7 @@ try{ // Adjust the serialized mine time based upon whether // the Guild's mine window has passed or not. - if (mineOwnerGuild != null) { + if (mineOwnerGuild.isErrant() == false) { int guildWOO = mineOwnerGuild.getMineTime(); LocalDateTime guildMineTime = mineTime.withHour(guildWOO); diff --git a/src/engine/workthreads/HourlyJobThread.java b/src/engine/workthreads/HourlyJobThread.java index 2a864421..a98946ef 100644 --- a/src/engine/workthreads/HourlyJobThread.java +++ b/src/engine/workthreads/HourlyJobThread.java @@ -105,7 +105,7 @@ public class HourlyJobThread implements Runnable { // Open Errant Mines - if (mine.getOwningGuild() == null) { + if (mine.getOwningGuild().isErrant()) { mine.handleStartMineWindow(); Mine.setLastChange(System.currentTimeMillis()); continue;