Fix some merge issues

This commit is contained in:
Len 2023-07-09 00:52:32 +02:00
parent d7797a496d
commit 27d75fcfa3
3 changed files with 4 additions and 12 deletions

View File

@ -88,7 +88,7 @@ public class AFKCheckTimer extends BukkitRunnable {
afkPlayer.setPlayerToSphereCenter(pastLocation);
afkPlayer.setStandingTime(System.currentTimeMillis());
player.setSleepingIgnored(false);
afkPlayer.ResetAFK();
afkPlayer.resetAFK();
MessageTimer currentTimer = plugin.messageTimers.get(player.getUniqueId());
if (currentTimer != null) {

View File

@ -28,7 +28,6 @@ import org.bukkit.permissions.PermissionAttachmentInfo;
import org.bukkit.plugin.java.JavaPlugin;
import org.bukkit.scoreboard.Scoreboard;
import org.bukkit.scoreboard.ScoreboardManager;
import org.bukkit.scoreboard.Team;
import java.util.Date;
import java.util.HashMap;
@ -70,9 +69,6 @@ public class AFKDetector extends JavaPlugin implements Listener {
@Override
public void onDisable() {
ScoreboardManager manager = Bukkit.getScoreboardManager();
Scoreboard board = manager.getMainScoreboard();
board.getTeam("AFKPlayers").unregister();
this.getServer().getScheduler().cancelTasks(this);
}
@ -155,7 +151,7 @@ public class AFKDetector extends JavaPlugin implements Listener {
}
Player player = event.getPlayer();
getPlayer(player).resetAFK(player);
getPlayer(player).resetAFK();
messageHistory.addEntry(uuid, message);
}
@ -175,7 +171,7 @@ public class AFKDetector extends JavaPlugin implements Listener {
}
Player player = event.getPlayer();
getPlayer(player).resetAFK(player);
getPlayer(player).resetAFK();
commandHistory.addEntry(uuid, command);
}

View File

@ -83,11 +83,7 @@ public class AFKPlayer {
player.setAfk(bool);
}
public boolean isAFK() {
return isAFK;
}
public void ResetAFK() {
public void resetAFK() {
if (isAFK && Config.AFK_TOGGLE_MESSAGES) {
TagResolver placeholders = TagResolver.resolver(
Placeholder.parsed("player", getPlayerName())