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

Serializing nation mine times.

Browse Source
This commit is contained in:
MagicBot
2023-01-20 10:34:57 -05:00
parent 20dba75602
commit 592caa40ea
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/objects/Mine.java
+6 -3
View File
@@ -273,16 +273,19 @@ public class Mine extends AbstractGameObject {
// 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();
// Mine times are those of the nation not individual guild.
Guild mineNatonGuild = mine.getOwningGuild().getNation();
// 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 and if it was claimed. // the Guild's mine window has passed or not and if it was claimed.
// If a mine is active serialize current datetime irrespective // If a mine is active serialize current datetime irrespective
// of any claim. // of any claim.
if (mineOwnerGuild.isErrant() == false && mine.isActive == false) { if (mineNatonGuild.isErrant() == false && mine.isActive == false) {
int guildWOO = mineOwnerGuild.getNation().getMineTime(); int guildWOO = mineNatonGuild.getNation().getMineTime();
LocalDateTime guildMineTime = mineOpenTime.withHour(guildWOO); LocalDateTime guildMineTime = mineOpenTime.withHour(guildWOO);
if (mineOpenTime.isAfter(guildMineTime) || mine.wasClaimed == true) if (mineOpenTime.isAfter(guildMineTime) || mine.wasClaimed == true)