Merge pull request Artillex-Studios#9 from FreshSMP/master

Use entity scheduler for hide/show player

Author: AverageGithub

api/build.gradle.kts

@@ -2,7 +2,7 @@ group = rootProject.group
 version = rootProject.version
 
 dependencies {
-    implementation("com.artillexstudios.axapi:axapi:1.4.732:all")
+    implementation("com.artillexstudios.axapi:axapi:1.4.747:all")
 }
 
 tasks {

build.gradle.kts

@@ -32,7 +32,7 @@ subprojects {
     }
 
     dependencies {
-        implementation("com.artillexstudios.axapi:axapi:1.4.732:all")
+        implementation("com.artillexstudios.axapi:axapi:1.4.747:all")
         compileOnly("com.github.ben-manes.caffeine:caffeine:3.2.1")
         compileOnly("org.spigotmc:spigot-api:1.21-R0.1-SNAPSHOT")
         compileOnly("dev.jorel:commandapi-bukkit-shade:10.1.2")

common/src/main/java/com/artillexstudios/axvanish/config/Groups.java

@@ -44,7 +44,7 @@ private boolean refreshConfig() {
 
         this.config.load();
         Map<String, Group> groups = new HashMap<>();
-        Map<String, Map<String, Object>> section = (Map<String, Map<String, Object>>) this.config.getMap("groups");
+        Map<String, Map<String, Object>> section = this.config.getMap("groups");
         if (section == null) {
             return false;
         }

common/src/main/java/com/artillexstudios/axvanish/users/User.java

@@ -19,7 +19,9 @@
 import org.bukkit.entity.Player;
 
 public final class User implements com.artillexstudios.axvanish.api.users.User {
-    private static final Cooldown<User> cancelCooldown = new Cooldown<>();
+
+    private static final Cooldown<User> cancelCooldown = Cooldown.create();
+
     private final OfflinePlayer offlinePlayer;
     private Group group;
     private Player onlinePlayer;

common/src/main/java/com/artillexstudios/axvanish/utils/VanishStateManager.java

@@ -63,36 +63,38 @@ public void updateViewers(boolean current) {
                 continue;
             }
 
+            Runnable retired = () -> this.count(playerCounter, counter);
+
             // We want to be sure that only people who can see the player
             // can see the player. This is not a mistake
             if (Config.debug) {
                 LogUtils.debug("Can {} see {}: {}", onlinePlayer.getName(), player.getName(), online.canSee(this.user));
             }
             if (online.canSee(this.user)) {
-                Scheduler.get().runAt(onlinePlayer.getLocation(), task -> {
+                Scheduler.get().run(onlinePlayer, task -> {
                     onlinePlayer.showPlayer(this.plugin, player);
                     this.count(playerCounter, counter);
-                });
+                }, retired);
             } else {
-                Scheduler.get().runAt(onlinePlayer.getLocation(), task -> {
+                Scheduler.get().run(onlinePlayer, task -> {
                     onlinePlayer.hidePlayer(this.plugin, player);
                     this.count(playerCounter, counter);
-                });
+                }, retired);
             }
 
             if (Config.debug) {
                 LogUtils.debug("Can {} see {}: {}", player.getName(), onlinePlayer.getName(), this.user.canSee(online));
             }
             if (this.user.canSee(online)) {
-                Scheduler.get().runAt(onlinePlayer.getLocation(), task -> {
+                Scheduler.get().run(onlinePlayer, task -> {
                     player.showPlayer(this.plugin, onlinePlayer);
                     this.count(playerCounter, counter);
-                });
+                }, retired);
             } else {
-                Scheduler.get().runAt(onlinePlayer.getLocation(), task -> {
+                Scheduler.get().run(onlinePlayer, task -> {
                     player.hideEntity(this.plugin, onlinePlayer);
                     this.count(playerCounter, counter);
-                });
+                }, retired);
             }
         }
     }