Preston/prestonbane
1
0
Fork 0
forked from MagicBane/Server
Code Issues Pull Requests Projects Releases Wiki Activity

More context in method names.

Browse Source
This commit is contained in:
MagicBot
2023-01-21 12:27:33 -05:00
parent d425050387
commit fa0cfa5191
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/devcmd/cmds/MineActiveCmd.java
+2 -2
View File
@@ -41,11 +41,11 @@ public class MineActiveCmd extends AbstractDevCmd {
String trigger = args[0]; String trigger = args[0];
switch (trigger){ switch (trigger){
case "true": case "true":
HourlyJobThread.handleStartMineWindow(mine); HourlyJobThread.mineWindowOpen(mine);
Mine.setLastChange(System.currentTimeMillis()); Mine.setLastChange(System.currentTimeMillis());
break; break;
case "false": case "false":
HourlyJobThread.handleEndMineWindow(mine); HourlyJobThread.mineWindowClose(mine);
Mine.setLastChange(System.currentTimeMillis()); Mine.setLastChange(System.currentTimeMillis());
break; break;
default: default:
src/engine/workthreads/HourlyJobThread.java
+8 -7
View File
@@ -187,7 +187,7 @@ public class HourlyJobThread implements Runnable {
// Open Errant Mines // Open Errant Mines
if (mine.getOwningGuild().isEmptyGuild()) { if (mine.getOwningGuild().isEmptyGuild()) {
HourlyJobThread.handleStartMineWindow(mine); HourlyJobThread.mineWindowOpen(mine);
Mine.setLastChange(System.currentTimeMillis()); Mine.setLastChange(System.currentTimeMillis());
continue; continue;
} }
@@ -197,14 +197,14 @@ public class HourlyJobThread implements Runnable {
if (mine.getOwningGuild().getNation().getMineTime() == if (mine.getOwningGuild().getNation().getMineTime() ==
LocalDateTime.now().getHour()) { LocalDateTime.now().getHour()) {
HourlyJobThread.handleStartMineWindow(mine); HourlyJobThread.mineWindowOpen(mine);
Mine.setLastChange(System.currentTimeMillis()); Mine.setLastChange(System.currentTimeMillis());
continue; continue;
} }
// Close all the remaining mines // Close all the remaining mines
if (handleEndMineWindow(mine)) if (mineWindowClose(mine))
Mine.setLastChange(System.currentTimeMillis()); Mine.setLastChange(System.currentTimeMillis());
} catch (Exception e) { } catch (Exception e) {
@@ -216,14 +216,14 @@ public class HourlyJobThread implements Runnable {
} }
} }
public static void handleStartMineWindow(Mine mine) { public static void mineWindowOpen(Mine mine) {
mine.setActive(true); mine.setActive(true);
ChatManager.chatSystemChannel(mine.getZoneName() + "'s Mine is now Active!"); ChatManager.chatSystemChannel(mine.getZoneName() + "'s Mine is now Active!");
Logger.info(mine.getZoneName() + "'s Mine is now Active!"); Logger.info(mine.getZoneName() + "'s Mine is now Active!");
} }
public static boolean handleEndMineWindow(Mine mine) { public static boolean mineWindowClose(Mine mine) {
// No need to end the window of a mine which never opened. // No need to end the window of a mine which never opened.
@@ -237,9 +237,10 @@ public class HourlyJobThread implements Runnable {
return false; return false;
} }
// Mine building still stands.
// It was never knocked down
if (mineBuilding.getRank() > 0) { if (mineBuilding.getRank() > 0) {
//never knocked down, let's just move on.
//hasn't been claimed since server start.
mine.setActive(false); mine.setActive(false);
mine.lastClaimer = null; mine.lastClaimer = null;
return true; return true;