|
@@ -145,8 +145,15 @@ public class CastleManorManager {
|
|
|
init(); // schedule all manor related events
|
|
|
_underMaintenance = false;
|
|
|
_disabled = !Config.ALLOW_MANOR;
|
|
|
- boolean isApproved = (_periodApprove.getTimeInMillis() < Calendar.getInstance().getTimeInMillis() &&
|
|
|
- _manorRefresh.getTimeInMillis() > Calendar.getInstance().getTimeInMillis());
|
|
|
+
|
|
|
+ boolean isApproved;
|
|
|
+ if (_periodApprove.getTimeInMillis() > _manorRefresh.getTimeInMillis())
|
|
|
+ // Next approve period already scheduled
|
|
|
+ isApproved = (_manorRefresh.getTimeInMillis() > Calendar.getInstance().getTimeInMillis());
|
|
|
+ else
|
|
|
+ isApproved = (_periodApprove.getTimeInMillis() < Calendar.getInstance().getTimeInMillis() &&
|
|
|
+ _manorRefresh.getTimeInMillis() > Calendar.getInstance().getTimeInMillis());
|
|
|
+
|
|
|
for (Castle c: CastleManager.getInstance().getCastles()) {
|
|
|
c.setNextPeriodApproved(isApproved);
|
|
|
}
|