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

Fixed time conversion being from seconds to millis instead of minutes to milis and npe for last kicked tracker

Browse Source
This commit is contained in:
Teriuihi 2022-09-02 21:34:28 +02:00
parent dd80712fee
commit d943ce999e
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,7 @@
package com.alttd.afkdectector; package com.alttd.afkdectector;
import java.util.UUID; import java.util.UUID;
import java.util.concurrent.TimeUnit;
import com.alttd.afkdectector.afkplayer.AFKPlayer; import com.alttd.afkdectector.afkplayer.AFKPlayer;
import com.alttd.afkdectector.config.Config; import com.alttd.afkdectector.config.Config;
@ -54,7 +55,7 @@ public class AFKCheckTimer extends BukkitRunnable{
} }
} }
long standingTime = afkplayer.getstandingTime(); long standingTime = afkplayer.getstandingTime();
if(System.currentTimeMillis() - standingTime > Config.TOGGLETIME * 60 * 1000 && !afkplayer.isafk()) { if(!afkplayer.isafk() && System.currentTimeMillis() - standingTime > TimeUnit.MINUTES.toMillis(Config.TOGGLETIME)) {
afkplayer.setafk(true); afkplayer.setafk(true);
player.setSleepingIgnored(true); player.setSleepingIgnored(true);
//player.setCanPickupItems(false); //player.setCanPickupItems(false);
@ -67,7 +68,7 @@ public class AFKCheckTimer extends BukkitRunnable{
Bukkit.broadcast(component, "afkdetector.notify"); Bukkit.broadcast(component, "afkdetector.notify");
} }
} }
if(System.currentTimeMillis() - standingTime > afkplayer.getafkTime() * 60 * 1000) { if(System.currentTimeMillis() - standingTime > TimeUnit.MINUTES.toMillis(afkplayer.getafkTime())) {
MessageTimer currentTimer = plugin.messageTimers.get(uuid); MessageTimer currentTimer = plugin.messageTimers.get(uuid);
if(currentTimer == null) { if(currentTimer == null) {
currentTimer = new MessageTimer(plugin, afkplayer, Config.MESSAGEREPEATS); currentTimer = new MessageTimer(plugin, afkplayer, Config.MESSAGEREPEATS);

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

@ -133,7 +133,7 @@ public class AFKDetector extends JavaPlugin implements Listener{
} }
long lastKick = AutoJoinTracker.getInstance().getLastKick(uuid); long lastKick = AutoJoinTracker.getInstance().getLastKick(uuid);
if (lastKick + TimeUnit.SECONDS.toMillis(Config.MAXREJOINFORTRACKING) > new Date().getTime()) { if (lastKick + TimeUnit.MINUTES.toMillis(Config.MAXREJOINFORTRACKING) > new Date().getTime()) {
SuspiciousKickTracker skt = SuspiciousKickTracker.getInstance(); SuspiciousKickTracker skt = SuspiciousKickTracker.getInstance();
skt.addSuspiciousKick(uuid); skt.addSuspiciousKick(uuid);
int suspiciousKickCount = skt.getSuspiciousKickCount(uuid); int suspiciousKickCount = skt.getSuspiciousKickCount(uuid);

3
src/main/java/com/alttd/afkdectector/MessageTimer.java
View File

@ -2,6 +2,7 @@ package com.alttd.afkdectector;
import java.util.Date; import java.util.Date;
import java.util.UUID; import java.util.UUID;
import java.util.concurrent.TimeUnit;
import com.alttd.afkdectector.afkplayer.AFKPlayer; import com.alttd.afkdectector.afkplayer.AFKPlayer;
import com.alttd.afkdectector.config.Config; import com.alttd.afkdectector.config.Config;
@ -31,7 +32,7 @@ public class MessageTimer extends BukkitRunnable {
} }
public void init() { public void init() {
runTaskTimer(plugin, 0, Config.MESSAGEDELAY * 20); runTaskTimer(plugin, 0, Config.MESSAGEDELAY * 20L);
} }
// TODO get a better string builder // TODO get a better string builder

2
src/main/java/com/alttd/afkdectector/trackers/AutoJoinTracker.java
View File

@ -20,7 +20,7 @@ public class AutoJoinTracker {
} }
synchronized public long getLastKick(UUID uuid) { synchronized public long getLastKick(UUID uuid) {
return lastKickedMap.get(uuid); return lastKickedMap.getOrDefault(uuid, 0L);
} }
} }