1 files changed, 31 insertions, 26 deletions

diff --git a/com/redstoner/bungee/joinmessages/JoinMessages.java b/com/redstoner/bungee/joinmessages/JoinMessages.java
index 21a4c66..13e6c0d 100644
--- a/com/redstoner/bungee/joinmessages/JoinMessages.java
+++ b/com/redstoner/bungee/joinmessages/JoinMessages.java
@@ -1,59 +1,64 @@
 package com.redstoner.bungee.joinmessages;
 
-import java.util.List;
 import net.md_5.bungee.api.ChatColor;
-import net.md_5.bungee.api.ProxyServer;
 import net.md_5.bungee.api.config.ServerInfo;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.event.ServerConnectEvent;
 import net.md_5.bungee.api.event.ServerDisconnectEvent;
 import net.md_5.bungee.api.plugin.Listener;
 import net.md_5.bungee.api.plugin.Plugin;
-import net.md_5.bungee.api.plugin.PluginManager;
 import net.md_5.bungee.event.EventHandler;
+import net.md_5.bungee.event.EventPriority;
 
-public class JoinMessages
-  extends Plugin
-  implements Listener
-{
+public class JoinMessages extends Plugin implements Listener {
+	
   private String loginString = "&a&l+ &7%s";
   private String logoutString = "&c&l- &7%s";
   
-  public void onEnable()
-  {
+  public void onEnable() {
     getProxy().registerChannel("JoinMessage");
-    getProxy().getPluginManager().registerCommand(this, new CommandGoto());
+    getProxy().getPluginManager().registerCommand(this, new CommandServer());
     getProxy().getPluginManager().registerListener(this, this);
   }
   
-  @EventHandler
-  public void onServerConnect(ServerConnectEvent e)
-  {
+  @EventHandler(priority = EventPriority.HIGHEST)
+  @SuppressWarnings("deprecation")
+  public void onServerConnect(ServerConnectEvent e) {
+	  
+	if (e.isCancelled())
+		return;
+	
     ServerInfo target = e.getTarget();
     ProxiedPlayer jp = e.getPlayer();
-    if (CommandGoto.justSwitched.contains(jp)) {
+    
+    if (CommandServer.justSwitched.contains(jp))
       return;
-    }
-    String joinMessage = ChatColor.translateAlternateColorCodes('&', String.format(this.loginString, new Object[] { jp.getName() }));
-    for (ProxiedPlayer p : target.getPlayers()) {
+    
+    String joinMessage = ChatColor.translateAlternateColorCodes('&',
+    		                String.format(this.loginString, new Object[] { jp.getName() }));
+    
+    for (ProxiedPlayer p : target.getPlayers())
       p.sendMessage(joinMessage);
-    }
+    
     jp.sendMessage(joinMessage);
   }
   
   @EventHandler
-  public void onServerDisconnect(ServerDisconnectEvent e)
-  {
+  @SuppressWarnings("deprecation")
+  public void onServerDisconnect(ServerDisconnectEvent e) {
+	  
     ServerInfo target = e.getTarget();
     ProxiedPlayer jp = e.getPlayer();
-    if (CommandGoto.justSwitched.contains(jp))
-    {
-      CommandGoto.justSwitched.remove(jp);
+    
+    if (CommandServer.justSwitched.contains(jp)) {
+      CommandServer.justSwitched.remove(jp);
       return;
     }
-    String leaveMessage = ChatColor.translateAlternateColorCodes('&', String.format(this.logoutString, new Object[] { jp.getName() }));
-    for (ProxiedPlayer p : target.getPlayers()) {
+    
+    String leaveMessage = ChatColor.translateAlternateColorCodes('&',
+    		                 String.format(this.logoutString, new Object[] { jp.getName() }));
+    
+    for (ProxiedPlayer p : target.getPlayers())
       p.sendMessage(leaveMessage);
-    }
   }
 }