switch server connect events to ServerConnectedEvent

consolidates onConnect + onServerConnect Signed-off-by: unilock <unilock@fennet.rentals>
unilock · Nov 4, 2022 · c0115e6 · c0115e6
1 parent de4327c
commit c0115e6
Showing 1 changed file with 19 additions and 36 deletions.
diff --git a/src/main/java/ooo/foooooooooooo/velocitydiscord/discord/Discord.java b/src/main/java/ooo/foooooooooooo/velocitydiscord/discord/Discord.java
@@ -8,10 +8,10 @@
 import com.velocitypowered.api.event.Subscribe;
 import com.velocitypowered.api.event.connection.DisconnectEvent;
 import com.velocitypowered.api.event.player.PlayerChatEvent;
-import com.velocitypowered.api.event.player.PlayerChooseInitialServerEvent;
-import com.velocitypowered.api.event.player.ServerPostConnectEvent;
+import com.velocitypowered.api.event.player.ServerConnectedEvent;
 import com.velocitypowered.api.proxy.ProxyServer;
 import com.velocitypowered.api.proxy.ServerConnection;
+import com.velocitypowered.api.proxy.server.RegisteredServer;
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.JDABuilder;
 import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
@@ -129,17 +129,26 @@ public void onPlayerChat(PlayerChatEvent event) {
     }
 
     @Subscribe
-    public void onConnect(PlayerChooseInitialServerEvent event) {
-        var initialServer = event.getInitialServer();
+    public void onConnect(ServerConnectedEvent event) {
+        var username = event.getPlayer().getUsername();
+        var server = event.getServer().getServerInfo().getName();
 
-        if (initialServer.isEmpty()) return;
+        Optional<RegisteredServer> previousServer = event.getPreviousServer();
 
-        var username = event.getPlayer().getUsername();
-        var server = initialServer.get().getServerInfo().getName();
+        StringTemplate message;
 
-        var message = new StringTemplate(config.JOIN_MESSAGE)
-            .add("username", username)
-            .add("server", server);
+        if (previousServer.isPresent()) {
+            var previous = previousServer.get().getServerInfo().getName();
+
+            message = new StringTemplate(config.SERVER_SWITCH_MESSAGE)
+                    .add("username", username)
+                    .add("current", server)
+                    .add("previous", previous);
+        } else {
+            message = new StringTemplate(config.JOIN_MESSAGE)
+                    .add("username", username)
+                    .add("server", server);
+        }
 
         sendMessage(message.toString());
     }
@@ -159,32 +168,6 @@ public void onDisconnect(DisconnectEvent event) {
 
         sendMessage(message.toString());
     }
-
-    @SuppressWarnings("UnstableApiUsage")
-    @Subscribe
-    public void onServerConnect(ServerPostConnectEvent event) {
-        var currentServer = event.getPlayer().getCurrentServer();
-
-        if (currentServer.isEmpty()) return;
-
-        var username = event.getPlayer().getUsername();
-        var server = currentServer.get().getServerInfo().getName();
-        var previousServer = event.getPreviousServer();
-
-        if (previousServer == null) {
-            return;
-        }
-
-        var previous = previousServer.getServerInfo().getName();
-
-        var message = new StringTemplate(config.SERVER_SWITCH_MESSAGE)
-            .add("username", username)
-            .add("current", server)
-            .add("previous", previous);
-
-        sendMessage(message.toString());
-    }
-
     public void sendMessage(@Nonnull String message) {
         activeChannel.sendMessage(message).queue();
     }