fixed vanish not reaplying on rejoin

0PandaDEV · Dec 1, 2023 · 9923f2b · 9923f2b
1 parent 50d48a5
commit 9923f2b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/main/java/tk/pandadev/nextron/listeners/JoinListener.java b/src/main/java/tk/pandadev/nextron/listeners/JoinListener.java
@@ -1,6 +1,5 @@
 package tk.pandadev.nextron.listeners;
 
-import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -20,9 +19,11 @@ public class JoinListener implements Listener {
     public void onJoin(PlayerJoinEvent event) {
         Player player = event.getPlayer();
         SettingsConfig.checkSettings(player);
+        VanishAPI.executeVanish(player);
         if (Configs.feature.getBoolean("join_leave_system")) {
             if (VanishAPI.isVanish(player)) {
-                event.setJoinMessage("");
+                event.setJoinMessage(null);
+                return;
             } else {
                 event.setJoinMessage(
                         ChatColor.translateAlternateColorCodes('&', Main.getInstance().getConfig().getString("join_message")
@@ -38,9 +39,7 @@ public void onJoin(PlayerJoinEvent event) {
         RankAPI.createPlayerTeam(player);
         RankAPI.checkRank(player);
         Main.getInstance().getTablistManager().setAllPlayerTeams();
-        for (Player onlinePlayer : Bukkit.getOnlinePlayers()) {
-            VanishAPI.executeVanish(onlinePlayer);
-        }
+
     }
 
 }
diff --git a/src/main/java/tk/pandadev/nextron/listeners/QuitListener.java b/src/main/java/tk/pandadev/nextron/listeners/QuitListener.java
@@ -20,7 +20,8 @@ public void onQuit(PlayerQuitEvent event) {
         SettingsConfig.checkSettings(player);
         if (Configs.feature.getBoolean("join_leave_system")) {
             if (VanishAPI.isVanish(player)) {
-                event.setQuitMessage("");
+                event.setQuitMessage(null);
+                return;
             } else {
                 event.setQuitMessage(ChatColor.translateAlternateColorCodes('&', Main.getInstance().getConfig().getString("leave_message").replace("%p", Configs.settings.getString(player.getUniqueId() + ".nick"))));
             }