From d943ce999ec2595e66bf3dd8fa82f88c43b9132c Mon Sep 17 00:00:00 2001
From: Teriuihi <teriuihi@alttd.com>
Date: Fri, 2 Sep 2022 21:34:28 +0200
Subject: [PATCH] Fixed time conversion being from seconds to millis instead of
 minutes to milis and npe for last kicked tracker

---
 src/main/java/com/alttd/afkdectector/AFKCheckTimer.java      | 5 +++--
 src/main/java/com/alttd/afkdectector/AFKDetector.java        | 2 +-
 src/main/java/com/alttd/afkdectector/MessageTimer.java       | 3 ++-
 .../com/alttd/afkdectector/trackers/AutoJoinTracker.java     | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/alttd/afkdectector/AFKCheckTimer.java b/src/main/java/com/alttd/afkdectector/AFKCheckTimer.java
index 8e751e6..d6ba826 100755
--- a/src/main/java/com/alttd/afkdectector/AFKCheckTimer.java
+++ b/src/main/java/com/alttd/afkdectector/AFKCheckTimer.java
@@ -1,6 +1,7 @@
 package com.alttd.afkdectector;
 
 import java.util.UUID;
+import java.util.concurrent.TimeUnit;
 
 import com.alttd.afkdectector.afkplayer.AFKPlayer;
 import com.alttd.afkdectector.config.Config;
@@ -54,7 +55,7 @@ public class AFKCheckTimer extends BukkitRunnable{
 				}
 			}
 			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);
 				player.setSleepingIgnored(true);
 				//player.setCanPickupItems(false);
@@ -67,7 +68,7 @@ public class AFKCheckTimer extends BukkitRunnable{
 					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);	
 				if(currentTimer == null) {
 					currentTimer = new MessageTimer(plugin, afkplayer, Config.MESSAGEREPEATS);
diff --git a/src/main/java/com/alttd/afkdectector/AFKDetector.java b/src/main/java/com/alttd/afkdectector/AFKDetector.java
index 2f342da..f5e81e6 100755
--- a/src/main/java/com/alttd/afkdectector/AFKDetector.java
+++ b/src/main/java/com/alttd/afkdectector/AFKDetector.java
@@ -133,7 +133,7 @@ public class AFKDetector extends JavaPlugin implements Listener{
         }
 
         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();
             skt.addSuspiciousKick(uuid);
             int suspiciousKickCount = skt.getSuspiciousKickCount(uuid);
diff --git a/src/main/java/com/alttd/afkdectector/MessageTimer.java b/src/main/java/com/alttd/afkdectector/MessageTimer.java
index 50f22d8..e725eb6 100755
--- a/src/main/java/com/alttd/afkdectector/MessageTimer.java
+++ b/src/main/java/com/alttd/afkdectector/MessageTimer.java
@@ -2,6 +2,7 @@ package com.alttd.afkdectector;
 
 import java.util.Date;
 import java.util.UUID;
+import java.util.concurrent.TimeUnit;
 
 import com.alttd.afkdectector.afkplayer.AFKPlayer;
 import com.alttd.afkdectector.config.Config;
@@ -31,7 +32,7 @@ public class MessageTimer extends BukkitRunnable {
     }
     
     public void init() {
-    	runTaskTimer(plugin, 0, Config.MESSAGEDELAY * 20);
+    	runTaskTimer(plugin, 0, Config.MESSAGEDELAY * 20L);
     }
     
     // TODO get a better string builder
diff --git a/src/main/java/com/alttd/afkdectector/trackers/AutoJoinTracker.java b/src/main/java/com/alttd/afkdectector/trackers/AutoJoinTracker.java
index daa7f74..79bb1b1 100644
--- a/src/main/java/com/alttd/afkdectector/trackers/AutoJoinTracker.java
+++ b/src/main/java/com/alttd/afkdectector/trackers/AutoJoinTracker.java
@@ -20,7 +20,7 @@ public class AutoJoinTracker {
     }
 
     synchronized public long getLastKick(UUID uuid) {
-        return lastKickedMap.get(uuid);
+        return lastKickedMap.getOrDefault(uuid, 0L);
     }
 
 }