MagicBane/Server
Template
92
1
Fork 5
Code Issues 5 Pull Requests Projects Releases Wiki Activity

Serialize current time for all active mines regardless of claim status.

Browse Source
This commit is contained in:
MagicBot
2023-01-19 13:59:52 -05:00
parent 2a140a6ce1
commit 79d05f1fb2
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/objects/Mine.java
+4 -7
View File
@@ -269,15 +269,17 @@ public class Mine extends AbstractGameObject {
writer.putInt(mine.getModifiedProductionAmount()); //TODO calculate range penalty here writer.putInt(mine.getModifiedProductionAmount()); //TODO calculate range penalty here
writer.putInt(3600); //window in seconds writer.putInt(3600); //window in seconds
// Errant mines are currently open. Set time to now. // Errant mines are currently open. Set time to now.
LocalDateTime mineOpenTime = LocalDateTime.now().withMinute(0).withSecond(0).withNano(0); LocalDateTime mineOpenTime = LocalDateTime.now().withMinute(0).withSecond(0).withNano(0);
Guild mineOwnerGuild = mine.getOwningGuild(); Guild mineOwnerGuild = mine.getOwningGuild();
// Adjust the serialized mine time based upon whether // Adjust the serialized mine time based upon whether
// the Guild's mine window has passed or not. // the Guild's mine window has passed or not.
// If a mine is active serialize current datetime irrespective
// of any claim
if (mineOwnerGuild.isErrant() == false) { if (mineOwnerGuild.isErrant() == false && mine.isActive == false) {
int guildWOO = mineOwnerGuild.getMineTime(); int guildWOO = mineOwnerGuild.getMineTime();
LocalDateTime guildMineTime = mineOpenTime.withHour(guildWOO); LocalDateTime guildMineTime = mineOpenTime.withHour(guildWOO);
@@ -287,11 +289,6 @@ public class Mine extends AbstractGameObject {
else else
mineOpenTime = guildMineTime; mineOpenTime = guildMineTime;
// If a mine is active serialize current datetime irrespective
// of any claim
if (mine.isActive == true)
mineOpenTime = LocalDateTime.now().withMinute(0).withSecond(0).withNano(0);
} }