Upstream/DungeonsXL
1
0
Fork 0
mirror of https://github.com/DRE2N/DungeonsXL.git synced 2024-11-28 21:48:43 +01:00
Code Issues Projects Releases Wiki Activity

Fix time requirement check, resolves #386

Browse Source
This commit is contained in:
Daniel Saukel 2018-05-03 21:45:59 +02:00
parent 60f2a497dd
commit 866fa307bf
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/io/github/dre2n/dungeonsxl/player/DGamePlayer.java
View File

@ -600,13 +600,17 @@ public class DGamePlayer extends DInstancePlayer {
GameRuleProvider rules = game.getRules(); GameRuleProvider rules = game.getRules();
if (!checkTimeAfterStart(game)) { if (!checkTimeAfterStart(game) && !checkTimeAfterFinish(game)) {
int longestTime = rules.getTimeToNextPlayAfterStart() >= rules.getTimeToNextPlayAfterFinish() ? rules.getTimeToNextPlayAfterStart() : rules.getTimeToNextPlayAfterFinish();
MessageUtil.sendMessage(player, DMessage.ERROR_COOLDOWN.getMessage(String.valueOf(longestTime)));
return false;
} else if (!checkTimeAfterStart(game)) {
MessageUtil.sendMessage(player, DMessage.ERROR_COOLDOWN.getMessage(String.valueOf(rules.getTimeToNextPlayAfterStart()))); MessageUtil.sendMessage(player, DMessage.ERROR_COOLDOWN.getMessage(String.valueOf(rules.getTimeToNextPlayAfterStart())));
return false; return false;
}
if (!checkTimeAfterFinish(game)) { } else if (!checkTimeAfterFinish(game)) {
MessageUtil.sendMessage(player, DMessage.ERROR_COOLDOWN.getMessage(String.valueOf(rules.getTimeToNextPlayAfterStart()))); MessageUtil.sendMessage(player, DMessage.ERROR_COOLDOWN.getMessage(String.valueOf(rules.getTimeToNextPlayAfterFinish())));
return false; return false;
} }
@ -689,12 +693,7 @@ public class DGamePlayer extends DInstancePlayer {
return true; return true;
} }
if (requirement != -1) { return requirement != 0 && dataTime != -1 && dataTime + requirement * 1000 * 60 * 60 <= System.currentTimeMillis();
if (requirement + dataTime * 1000 * 60 * 60 > System.currentTimeMillis()) {
return false;
}
}
return true;
} }
public void ready() { public void ready() {