|
|
@ -276,8 +276,10 @@ public class Mine extends AbstractGameObject { |
|
|
|
|
|
|
|
|
|
|
|
// 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); |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|