Merge pull request #1 from Josscoder/dev

Dev

Author: Josscoder

nukkit/src/main/java/net/josscoder/redisbridge/nukkit/command/TransferCommand.java

@@ -6,12 +6,13 @@
 import cn.nukkit.utils.TextFormat;
 import net.josscoder.redisbridge.core.data.InstanceInfo;
 import net.josscoder.redisbridge.core.manager.InstanceManager;
+import net.josscoder.redisbridge.nukkit.RedisBridgePlugin;
 
 public class TransferCommand extends Command {
 
     public TransferCommand() {
         super("transfer", "Transfer to a server", "/transfer <serverID>");
-        setPermission("redisbridge.transfer");
+        setPermission("redisbridge.transfer.command.permission");
     }
 
     @Override
@@ -34,7 +35,13 @@ public boolean execute(CommandSender sender, String label, String[] args) {
 
         InstanceInfo instance = InstanceManager.getInstance().getInstanceById(serverID);
         if (instance == null) {
-            player.sendMessage(TextFormat.RED + "That server does not exist!");
+            player.sendMessage(TextFormat.RED + "Server does not exist!");
+
+            return false;
+        }
+
+        if (instance.getId().equalsIgnoreCase(RedisBridgePlugin.getInstance().getCurrentInstanceInfo().getId())) {
+            player.sendMessage(TextFormat.RED + "You are already on this server!");
 
             return false;
         }

waterdogpe/src/main/java/net/josscoder/redisbridge/waterdogpe/RedisBridgePlugin.java

@@ -69,7 +69,6 @@ private void setupCommands() {
         CommandMap map = getProxy().getCommandMap();
         map.unregisterCommand("wdlist");
         map.registerCommand(new WhereAmICommand());
-        //map.registerCommand(new ListCommand());
     }
 
     private void setupEvents() {

waterdogpe/src/main/java/net/josscoder/redisbridge/waterdogpe/command/ListCommand.java

@@ -20,9 +20,10 @@ public static void onQuery(ProxyQueryEvent event) {
 
     public static void onTransferRequest(ServerTransferRequestEvent event) {
         ProxiedPlayer player = event.getPlayer();
+        ServerInfo currentServer = player.getServerInfo();
         ServerInfo targetServer = event.getTargetServer();
 
-        if (player.getServerInfo() == null || targetServer == null || player.getServerInfo().getServerName().equalsIgnoreCase(targetServer.getServerName())) {
+        if (currentServer == null || targetServer == null || currentServer.getServerName().equalsIgnoreCase(targetServer.getServerName())) {
             return;
         }