Fix SuperVanish listeners not working on unvanish

Author: Telesphoreo

server/src/main/java/dev/plex/command/impl/BcastLoginMessageCMD.java

@@ -130,7 +130,6 @@ private void registerBuiltInCommands(boolean debugEnabled)
                 new AdventureCMD(),
                 new BanCMD(),
                 new BanListCommand(),
-                new BcastLoginMessageCMD(),
                 new BlockEditCMD(),
                 new CommandSpyCMD(),
                 new ConsoleSayCMD(),

server/src/main/java/dev/plex/handlers/CommandHandler.java

@@ -21,6 +21,7 @@
 import dev.plex.listener.impl.WorldListener;
 import dev.plex.listener.impl.WorldSpawnSignListener;
 import dev.plex.util.PlexLog;
+import dev.plex.util.PlexUtils;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Supplier;
@@ -54,7 +55,10 @@ private void registerBuiltInListeners()
         register(() -> new ServerListener(plugin));
         register(() -> new TabListener(plugin));
         register(() -> new TogglesListener(plugin));
-        register(() -> new VanishListener(plugin));
+        if (PlexUtils.hasVanishPlugin())
+        {
+            register(() -> new VanishListener(plugin));
+        }
         register(() -> new WorldListener(plugin));
         register(() -> new WorldSpawnSignListener(plugin));
     }

server/src/main/java/dev/plex/handlers/ListenerHandler.java

@@ -2,10 +2,11 @@
 
 import dev.plex.Plex;
 
-import de.myzelyam.api.vanish.PlayerShowEvent;
+import de.myzelyam.api.vanish.PostPlayerShowEvent;
 import dev.plex.listener.ServerListenerBase;
 import dev.plex.meta.PlayerMeta;
 import dev.plex.player.PlexPlayer;
+import dev.plex.util.PlexLog;
 import dev.plex.util.PlexUtils;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -18,21 +19,25 @@ public VanishListener(Plex plugin)
     }
 
     @EventHandler(priority = EventPriority.MONITOR)
-    public void onPlayerUnvanish(PlayerShowEvent event)
+    public void onPlayerUnvanish(PostPlayerShowEvent event)
     {
-        if (!PlexUtils.hasVanishPlugin())
+        if (event.isSilent())
         {
             return;
         }
-        if (event.isSilent())
+
+        PlexPlayer plexPlayer = plugin.getPlayerService().getPlayer(event.getPlayer().getUniqueId());
+        if (plexPlayer == null)
         {
+            PlexLog.warn("Unable to load Plex player data for {0}; skipping reappear messages.", event.getPlayer().getName());
             return;
         }
-        PlexPlayer plexPlayer = plugin.getPlayerService().getPlayer(event.getPlayer().getUniqueId());
+
         String loginMessage = PlayerMeta.getLoginMessage(plexPlayer);
         if (!loginMessage.isEmpty())
         {
             PlexUtils.broadcast(PlexUtils.stringToComponent(loginMessage));
+            PlexUtils.broadcast(PlexUtils.messageComponent("loginMessage", plexPlayer.getName()));
         }
     }
 }

server/src/main/java/dev/plex/listener/impl/VanishListener.java

@@ -230,7 +230,6 @@ removedOwnLoginMessage: "<gray>Your login message has been removed."
 # 0 - The player
 removedOtherLoginMessage: "<gray>You removed {0}'s login message."
 nameRequired: "<red>Policy requires that you must state your player name in your login message. You can either do this by inserting your name or %player%."
-playerHasNoLoginMessage: "<red>This player does not have a login message."
 # 0 - The material name
 # 1 - The players who have the material in their inventory
 playersWithMaterial: "<gray>Players with {0} in their inventory: {1}"