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

mines will start again

Browse Source
This commit is contained in:
FatBoy-DOTC
2024-05-21 20:19:19 -05:00
parent c9dcb82c45
commit f1e8384af0
1 changed files with 18 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/workthreads/MineThread.java
+18 -25
View File
@@ -23,45 +23,38 @@ public class MineThread implements Runnable {
@Override @Override
public void run() { public void run() {
LocalDateTime nextPulse = LocalDateTime.now().withMinute(0).withSecond(0).withNano(0); LocalDateTime nextPulse = LocalDateTime.now().withMinute(0).withSecond(0).withNano(0);
while (true) { while (true){
LocalDateTime now = LocalDateTime.now(); if(LocalDateTime.now().isAfter(nextPulse)) {
if (now.isAfter(nextPulse)) {
for (Mine mine : Mine.getMines()) { for (Mine mine : Mine.getMines()) {
// Reset mine at 4:00 AM
if (nextPulse.getHour() == 4 && nextPulse.getMinute() == 0) {
mine.wasClaimed = false;
mine.hasProduced = false;
}
Building mineTower = BuildingManager.getBuilding(mine.getBuildingID()); Building mineTower = BuildingManager.getBuilding(mine.getBuildingID());
if (mineTower == null) {
continue;
}
int minute = mine.firstThirty ? 0 : 30; if (mineTower == null)
LocalDateTime openTime = now.withHour(mine.liveTime).withMinute(minute).withSecond(0).withNano(0); continue;
int minute = 0;
if (mine.firstThirty == false)
minute = 30;
LocalDateTime openTime = LocalDateTime.now().withHour(mine.liveTime).withMinute(minute).withSecond(0);
LocalDateTime closeTime = openTime.plusMinutes(29); LocalDateTime closeTime = openTime.plusMinutes(29);
if (!mine.wasClaimed && !mine.wasOpened && now.isAfter(openTime.minusMinutes(1))) { //current time is after start time and before close time, open mine window
if (LocalDateTime.now().isAfter(openTime.minusMinutes(1)) && !mine.wasClaimed && !mine.wasOpened) {
mineWindowOpen(mine); mineWindowOpen(mine);
continue; continue;
} }
if (mine.isActive) {
if (mine.isActive && now.isAfter(closeTime)) { if (LocalDateTime.now().isAfter(closeTime) && mineTower.getRank() > 0)
if (mineTower.getRank() > 0 || (mineTower.getRank() < 1 && mine.lastClaimer != null)) { mineWindowClose(mine); //mine was never knocked down, close window
mineWindowClose(mine);
} if (LocalDateTime.now().isAfter(closeTime) && mineTower.getRank() < 1 && mine.lastClaimer != null)
mineWindowClose(mine); //mine was knocked down and was claimed, close window
} }
} }
nextPulse = nextPulse.plusMinutes(30); nextPulse = nextPulse.plusMinutes(30);
} }
try {
Thread.sleep(1000); // Avoid busy-waiting
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
}
} }
} }