Upstream/Harbor-Minecraft
1
0
Fork 0
mirror of https://github.com/nkomarn/harbor.git synced 2024-12-18 22:37:36 +01:00
Code Issues Projects Releases Wiki Activity

Refactoring

Browse Source
This commit is contained in:
Roland von Rotz 2019-09-29 16:58:58 +02:00
parent 5d5710af91
commit 1b75e88799
1 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/xyz/nkomarn/Harbor/task/Checker.java
View File

@ -92,18 +92,10 @@ public class Checker implements Runnable {
}
private boolean isExcluded(final Player p) {
boolean s = false;
if (Config.getBoolean("features.ignore")) if (p.getGameMode() == GameMode.SURVIVAL) s = false;
else s = true;
if (Config.getBoolean("features.bypass")) if (p.hasPermission("harbor.bypass")) s = true;
else s = false;
// Essentials AFK detection
if (Harbor.essentials != null) {
if (Harbor.essentials.getUser(p).isAfk()) s = true;
}
return s;
final boolean excludedByGameMode = Config.getBoolean("features.ignore") && p.getGameMode() != GameMode.SURVIVAL;
final boolean excludedByPermission = Config.getBoolean("features.bypass") && p.hasPermission("harbor.bypass");
final boolean excludedByAfk = Harbor.essentials != null && Harbor.essentials.getUser(p).isAfk(); // Essentials AFK detection
return excludedByGameMode || excludedByPermission || excludedByAfk;
}
private String randomMessage(final String list) {
@ -130,16 +122,13 @@ public class Checker implements Runnable {
if (!(time >= 450 && time <= 1000)) {
world.setTime(time + 60);
} else {
// Announce night skip and clear queue
sendChatMessage(randomMessage("messages.chat.skipped"));
skippingWorlds.remove(world);
// Reset sleep statistic if phantoms are disabled
if (!Config.getBoolean("features.phantoms")) {
for (final Player player : world.getPlayers()) {
player.setStatistic(Statistic.TIME_SINCE_REST, 0);
}
world.getPlayers().forEach(player -> player.setStatistic(Statistic.TIME_SINCE_REST, 0));
}
// Clear weather