Altitude/AFKDetector
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into afk_mobs

Browse Source
This commit is contained in:
destro174 2023-07-09 00:33:59 +02:00 committed by GitHub
parent 399ee1394b 961950a90b
commit 2aea075786
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 20 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle.kts
View File

@ -6,7 +6,7 @@ plugins {
}
group = "com.alttd"
version = "2.1.4"
version = "2.1.5"
description = "Altitude AFK Detector plugin."
apply<JavaLibraryPlugin>()
@ -43,5 +43,5 @@ tasks {
}
dependencies {
implementation("com.alttd:Galaxy-API:1.19.4-R0.1-SNAPSHOT")
implementation("com.alttd:Galaxy-API:1.20.1-R0.1-SNAPSHOT")
}

0
gradlew vendored Normal file → Executable file
View File

4
src/main/java/com/alttd/afkdectector/AFKCheckTimer.java
View File

@ -88,8 +88,7 @@ public class AFKCheckTimer extends BukkitRunnable {
afkPlayer.setPlayerToSphereCenter(pastLocation);
afkPlayer.setStandingTime(System.currentTimeMillis());
player.setSleepingIgnored(false);
plugin.AFKPlayers.removeEntry(player.getName());
afkPlayer.resetAFK(player);
afkPlayer.ResetAFK();
MessageTimer currentTimer = plugin.messageTimers.get(player.getUniqueId());
if (currentTimer != null) {
@ -101,7 +100,6 @@ public class AFKCheckTimer extends BukkitRunnable {
afkPlayer.setAFK(player);
player.setSleepingIgnored(true);
//player.setCanPickupItems(false);
plugin.AFKPlayers.addEntry(player.getName());
if (Config.AFK_TOGGLE_MESSAGES) {
TagResolver placeholders = TagResolver.resolver(
Placeholder.parsed("player", player.getName())

19
src/main/java/com/alttd/afkdectector/AFKDetector.java
View File

@ -46,10 +46,6 @@ public class AFKDetector extends JavaPlugin implements Listener {
public boolean fullOverride;
public static MiniMessage miniMessage;
/**
* AFK players need to be added to a team.
*/
Team AFKPlayers;
@Override
public void onEnable() {
@ -57,7 +53,6 @@ public class AFKDetector extends JavaPlugin implements Listener {
instance = this;
miniMessage = MiniMessage.miniMessage();
loadConfig(null);
setupAFKStats();
getServer().getPluginManager().registerEvents(this, this);
//getCommand("afk").setExecutor(new AFKCommand(this));
getCommand("afklist").setExecutor(new AFKListCommand(this));
@ -88,20 +83,6 @@ public class AFKDetector extends JavaPlugin implements Listener {
return players.get(player.getUniqueId());
}
private void setupAFKStats() {
if (Bukkit.getScoreboardManager().getMainScoreboard().getTeam("AFKPlayers") == null) {
AFKPlayers = Bukkit.getScoreboardManager().getMainScoreboard().registerNewTeam("AFKPlayers");
} else {
AFKPlayers = Bukkit.getScoreboardManager().getMainScoreboard().getTeam("AFKPlayers");
}
if (AFKPlayers == null) {
Logger.warn("Could not find scoreboard AFKPlayers");
return;
}
AFKPlayers.setOption(Team.Option.COLLISION_RULE, Team.OptionStatus.NEVER);
//AFKPlayers.setOption(Team.Option.NAME_TAG_VISIBILITY, Team.OptionStatus.NEVER);
}
/**
* Get the afk time for a player
*/

25
src/main/java/com/alttd/afkdectector/afkplayer/AFKPlayer.java
View File

@ -20,8 +20,7 @@ import java.util.concurrent.TimeUnit;
public class AFKPlayer {
private final String playerName;
private final UUID uuid;
private final Player player;
private Location playerToSphereCenter;
private long standingTime;
private final int afkTime;
@ -32,8 +31,7 @@ public class AFKPlayer {
private final String afkKickSoon;
public AFKPlayer(Player player, AFKDetector plugin) {
this.playerName = player.getName();
this.uuid = player.getUniqueId();
this.player = player;
this.playerToSphereCenter = player.getLocation();
this.standingTime = System.currentTimeMillis();
this.afkTime = plugin.getAllowedAFKTime(player);
@ -45,11 +43,11 @@ public class AFKPlayer {
}
public String getPlayerName() {
return this.playerName;
return this.player.getName();
}
public UUID getPlayerUuid() {
return this.uuid;
return this.player.getUniqueId();
}
public Location getPlayerToSphereCenter() {
@ -80,10 +78,19 @@ public class AFKPlayer {
return x < Config.SPAWN_MAX_X && x > Config.SPAWN_MIN_X && z < Config.SPAWN_MAX_Z && z > Config.SPAWN_MIN_Z;
}
public void resetAFK(Player player) {
public void setAFK(boolean bool) {
isAFK = bool;
player.setAfk(bool);
}
public boolean isAFK() {
return isAFK;
}
public void ResetAFK() {
if (isAFK && Config.AFK_TOGGLE_MESSAGES) {
TagResolver placeholders = TagResolver.resolver(
Placeholder.parsed("player", playerName)
Placeholder.parsed("player", getPlayerName())
);
Component component = AFKDetector.miniMessage.deserialize(Messages.AFK_TOGGLE_OFF.getMessage(), placeholders);
Bukkit.broadcast(component, "afkdetector.notify");
@ -100,6 +107,8 @@ public class AFKPlayer {
bossBar.setColor(BarColor.RED);
player.setAfk(true);
isAFK = true;
playerToSphereCenter = (player == null) ? null : player.getLocation();
setAFK(false);
}
public boolean isAFK() {