Intercept other plugins' teleports properly

This commit will eventually provide a fix for #328, when it gets merged

src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java

@@ -63,8 +63,8 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
 
     /**
      * This method is used to find out who is teleporting a player.
-     * @param playerName The teleported player.
+     * @param playerName The teleported player (the teleportee).
-     * @return The player that teleported the other one.
+     * @return The player that teleported the other one (the teleporter).
      */
     public static String getPlayerTeleporter(String playerName) {
         if (teleportQueue.containsKey(playerName)) {
@@ -76,7 +76,8 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
     }
 
     public static void addPlayerToTeleportQueue(String teleporter, String teleportee) {
-        teleportQueue.put(teleporter, teleportee);
+        staticLog(Level.FINEST, "Adding mapping '" + teleporter + "' => '" + teleportee + "' to teleport queue");
+        teleportQueue.put(teleportee, teleporter);
     }
 
     @Override

src/main/java/com/onarandombox/MultiverseCore/listeners/MVPlayerListener.java

@@ -17,6 +17,7 @@ import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.World;
+import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.event.player.*;
 
@@ -61,8 +62,6 @@ public class MVPlayerListener extends PlayerListener {
 
     @Override
     public void onPlayerRespawn(PlayerRespawnEvent event) {
-
-
         World world = event.getPlayer().getWorld();
         MultiverseWorld mvWorld = this.worldManager.getMVWorld(world.getName());
         // If it's not a World MV manages we stop.
@@ -144,11 +143,17 @@ public class MVPlayerListener extends PlayerListener {
             return;
         }
         Player teleportee = event.getPlayer();
-        Player teleporter = null;
+        CommandSender teleporter = null;
         String teleporterName = MultiverseCore.getPlayerTeleporter(teleportee.getName());
         if (teleporterName != null) {
-            teleporter = this.plugin.getServer().getPlayer(teleporterName);
+            if (teleporterName.equals("CONSOLE")) {
+                this.plugin.log(Level.FINEST, "We know the teleporter is the console! Magical!");
+                teleporter = this.plugin.getServer().getConsoleSender();
+            } else {
+                teleporter = this.plugin.getServer().getPlayer(teleporterName);
+            }
         }
+        this.plugin.log(Level.FINEST, "Inferred sender '" + teleporter + "' from name '" + teleporterName + "', fetched from name '" + teleportee.getName() + "'");
         MultiverseWorld fromWorld = this.worldManager.getMVWorld(event.getFrom().getWorld().getName());
         MultiverseWorld toWorld = this.worldManager.getMVWorld(event.getTo().getWorld().getName());
         if (event.getFrom().getWorld().equals(event.getTo().getWorld())) {
@@ -169,8 +174,6 @@ public class MVPlayerListener extends PlayerListener {
             if (event.isCancelled() && teleporter != null) {
                 this.plugin.log(Level.FINE, "Player '" + teleportee.getName() + "' was DENIED ACCESS to '" + event.getTo().getWorld().getName() +
                         "' because '" + teleporter.getName() + "' don't have: multiverse.access." + event.getTo().getWorld().getName());
-            } else {
-                this.plugin.log(Level.FINE, "Player '" + teleportee.getName() + "' was allowed to go to '" + event.getTo().getWorld().getName() + "' under normal circumstances.");
             }
         } else {
             this.plugin.log(Level.FINE, "Player '" + teleportee.getName() + "' was allowed to go to '" + event.getTo().getWorld().getName() + "' because enforceaccess is off.");

src/main/java/com/onarandombox/MultiverseCore/utils/PermissionTools.java

@@ -7,9 +7,12 @@
 
 package com.onarandombox.MultiverseCore.utils;
 
+import java.util.logging.Level;
 import com.fernferret.allpay.GenericBank;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.ConsoleCommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.permissions.Permission;
 
@@ -79,10 +82,20 @@ public class PermissionTools {
         return returnString + "*";
     }
 
-    public boolean playerHasMoneyToEnter(MultiverseWorld fromWorld, MultiverseWorld toWorld, Player teleporter, Player teleportee, boolean pay) {
+    public boolean playerHasMoneyToEnter(MultiverseWorld fromWorld, MultiverseWorld toWorld, CommandSender teleporter, Player teleportee, boolean pay) {
-        if (teleporter == null) {
+        if (teleporter instanceof ConsoleCommandSender) {
             return true;
         }
+
+        if (teleporter == null) {
+            teleporter = teleportee;
+        }
+
+        if (!(teleporter instanceof Player)) {
+            return false;
+        }
+        Player teleporterPlayer = (Player) teleporter;
+
         // Only check payments if it's a different world:
         if (!toWorld.equals(fromWorld)) {
             // If the player does not have to pay, return now.
@@ -90,14 +103,14 @@ public class PermissionTools {
                 return true;
             }
             GenericBank bank = plugin.getBank();
-            String errString = "You need " + bank.getFormattedAmount(teleporter, toWorld.getPrice(), toWorld.getCurrency()) + " to send " + teleportee + " to " + toWorld.getColoredWorldString();
+            String errString = "You need " + bank.getFormattedAmount(teleporterPlayer, toWorld.getPrice(), toWorld.getCurrency()) + " to send " + teleportee + " to " + toWorld.getColoredWorldString();
             if (teleportee.equals(teleporter)) {
-                errString = "You need " + bank.getFormattedAmount(teleporter, toWorld.getPrice(), toWorld.getCurrency()) + " to enter " + toWorld.getColoredWorldString();
+                errString = "You need " + bank.getFormattedAmount(teleporterPlayer, toWorld.getPrice(), toWorld.getCurrency()) + " to enter " + toWorld.getColoredWorldString();
             }
-            if (!bank.hasEnough(teleporter, toWorld.getPrice(), toWorld.getCurrency(), errString)) {
+            if (!bank.hasEnough(teleporterPlayer, toWorld.getPrice(), toWorld.getCurrency(), errString)) {
                 return false;
             } else if(pay) {
-                bank.pay(teleporter, toWorld.getPrice(), toWorld.getCurrency());
+                bank.pay(teleporterPlayer, toWorld.getPrice(), toWorld.getCurrency());
             }
         }
         return true;
@@ -111,16 +124,33 @@ public class PermissionTools {
      *
      * @param fromWorld  The MultiverseWorld they are in.
      * @param toWorld    The MultiverseWorld they want to go to.
-     * @param teleporter The player that wants to travel.
+     * @param teleporter The CommandSender that wants to send someone somewhere. If null,
+     *                   will be given the same value as teleportee.
+     * @param teleportee The player going somewhere.
      * @return True if they can't go to the world, False if they can.
      */
-    public boolean playerCanGoFromTo(MultiverseWorld fromWorld, MultiverseWorld toWorld, Player teleporter, Player teleportee) {
+    public boolean playerCanGoFromTo(MultiverseWorld fromWorld, MultiverseWorld toWorld, CommandSender teleporter, Player teleportee) {
+        this.plugin.log(Level.FINEST, "Checking '" + teleporter + "' can send '" + teleportee + "' somewhere");
+
         // The console can send anyone anywhere
-        if (teleporter == null) {
+        if (teleporter instanceof ConsoleCommandSender) {
             return true;
         }
+
+        // Make sure we have a teleporter of some kind, even if it's inferred to be the teleportee
+        if (teleporter == null) {
+            teleporter = teleportee;
+        }
+
+        // Now make sure we can cast the teleporter to a player, 'cause I'm tired of console things now
+        if (!(teleporter instanceof Player)) {
+            return false;
+        }
+        Player teleporterPlayer = (Player) teleporter;
+
+        // Actual checks
         if (toWorld != null) {
-            if (!this.plugin.getMVPerms().canEnterWorld(teleporter, toWorld)) {
+            if (!this.plugin.getMVPerms().canEnterWorld(teleporterPlayer, toWorld)) {
                 if (teleportee.equals(teleporter)) {
                     teleporter.sendMessage("You don't have access to go here...");
                 } else {