Updated events to choose the best platform for certain tasks.

src/bukkit/java/com/sk89q/worldedit/bukkit/BukkitCommandSender.java

@@ -29,8 +29,7 @@ public class BukkitCommandSender extends LocalPlayer {
     private CommandSender sender;
     private WorldEditPlugin plugin;
 
-    public BukkitCommandSender(WorldEditPlugin plugin, ServerInterface server, CommandSender sender) {
+    public BukkitCommandSender(WorldEditPlugin plugin, CommandSender sender) {
-        super(server);
         this.plugin = plugin;
         this.sender = sender;
     }

src/bukkit/java/com/sk89q/worldedit/bukkit/BukkitPlayer.java

@@ -41,7 +41,6 @@ public class BukkitPlayer extends LocalPlayer {
     private WorldEditPlugin plugin;
 
     public BukkitPlayer(WorldEditPlugin plugin, ServerInterface server, Player player) {
-        super(server);
         this.plugin = plugin;
         this.player = player;
     }
@@ -52,6 +51,7 @@ public class BukkitPlayer extends LocalPlayer {
         return itemStack != null ? itemStack.getTypeId() : 0;
     }
 
+    @Override
     public BaseBlock getBlockInHand() throws WorldEditException {
         ItemStack itemStack = player.getItemInHand();
         return BukkitUtil.toBlock(getWorld(), itemStack);

src/bukkit/java/com/sk89q/worldedit/bukkit/BukkitServerInterface.java

@@ -25,6 +25,7 @@ import com.sk89q.minecraft.util.commands.Command;
 import com.sk89q.minecraft.util.commands.CommandPermissions;
 import com.sk89q.minecraft.util.commands.CommandsManager;
 import com.sk89q.worldedit.*;
+import com.sk89q.worldedit.entity.Player;
 import com.sk89q.worldedit.extension.platform.Capability;
 import com.sk89q.worldedit.extension.platform.Preference;
 import org.bukkit.Bukkit;
@@ -33,6 +34,7 @@ import org.bukkit.Server;
 import org.bukkit.World;
 import org.bukkit.entity.EntityType;
 
+import javax.annotation.Nullable;
 import java.lang.reflect.Method;
 import java.util.*;
 
@@ -93,6 +95,28 @@ public class BukkitServerInterface extends ServerInterface {
         return ret;
     }
 
+    @Nullable
+    @Override
+    public Player matchPlayer(Player player) {
+        if (player instanceof BukkitPlayer) {
+            return player;
+        } else {
+            org.bukkit.entity.Player bukkitPlayer = server.getPlayerExact(player.getName());
+            return bukkitPlayer != null ? new BukkitPlayer(plugin, this, bukkitPlayer) : null;
+        }
+    }
+
+    @Nullable
+    @Override
+    public com.sk89q.worldedit.world.World matchWorld(com.sk89q.worldedit.world.World world) {
+        if (world instanceof BukkitWorld) {
+            return world;
+        } else {
+            World bukkitWorld = server.getWorld(world.getName());
+            return bukkitWorld != null ? new BukkitWorld(bukkitWorld) : null;
+        }
+    }
+
     @Override
     public void onCommandRegistration(List<Command> commands, CommandsManager<LocalPlayer> manager) {
         List<CommandInfo> toRegister = new ArrayList<CommandInfo>();

src/bukkit/java/com/sk89q/worldedit/bukkit/BukkitWorld.java

@@ -1110,13 +1110,15 @@ public class BukkitWorld extends LocalWorld {
 
     @Override
     public boolean equals(Object other) {
-        World world = getWorld();
+        if (other == null) {
-
+            return false;
-        if (!(other instanceof BukkitWorld)) {
+        } else if ((other instanceof BukkitWorld)) {
+            return ((BukkitWorld) other).getWorld().equals(getWorld());
+        } else if (other instanceof com.sk89q.worldedit.world.World) {
+            return ((com.sk89q.worldedit.world.World) other).getName().equals(getName());
+        } else {
             return false;
         }
-
-        return ((BukkitWorld) other).getWorld().equals(world);
     }
 
     @Override

src/bukkit/java/com/sk89q/worldedit/bukkit/WorldEditPlugin.java

@@ -339,7 +339,7 @@ public class WorldEditPlugin extends JavaPlugin {
             return wrapPlayer((Player) sender);
         }
 
-        return new BukkitCommandSender(this, this.server, sender);
+        return new BukkitCommandSender(this, sender);
     }
 
     /**

src/forge/java/com/sk89q/worldedit/forge/ForgePlatform.java

@@ -23,19 +23,23 @@ import com.sk89q.minecraft.util.commands.Command;
 import com.sk89q.worldedit.BiomeTypes;
 import com.sk89q.worldedit.LocalConfiguration;
 import com.sk89q.worldedit.ServerInterface;
+import com.sk89q.worldedit.entity.Player;
 import com.sk89q.worldedit.extension.platform.Capability;
 import com.sk89q.worldedit.extension.platform.Preference;
+import com.sk89q.worldedit.world.World;
 import cpw.mods.fml.common.FMLCommonHandler;
 import net.minecraft.command.CommandBase;
 import net.minecraft.command.ICommand;
 import net.minecraft.command.ICommandSender;
 import net.minecraft.command.ServerCommandManager;
 import net.minecraft.entity.EntityList;
+import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.Item;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.world.WorldServer;
 import net.minecraftforge.common.DimensionManager;
 
+import javax.annotation.Nullable;
 import java.util.*;
 
 class ForgePlatform extends ServerInterface {
@@ -101,6 +105,33 @@ class ForgePlatform extends ServerInterface {
         return ret;
     }
 
+    @Nullable
+    @Override
+    public Player matchPlayer(Player player) {
+        if (player instanceof ForgePlayer) {
+            return player;
+        } else {
+            EntityPlayerMP entity = server.getConfigurationManager().getPlayerForUsername(player.getName());
+            return entity != null ? new ForgePlayer(entity) : null;
+        }
+    }
+
+    @Nullable
+    @Override
+    public World matchWorld(World world) {
+        if (world instanceof ForgeWorld) {
+            return world;
+        } else {
+            for (WorldServer ws : DimensionManager.getWorlds()) {
+                if (ws.getWorldInfo().getWorldName().equals(world.getName())) {
+                    return new ForgeWorld(ws);
+                }
+            }
+
+            return null;
+        }
+    }
+
     @Override
     public void onCommandRegistration(List<Command> commands) {
         if (server == null) return;

src/forge/java/com/sk89q/worldedit/forge/ForgePlayer.java

@@ -38,7 +38,6 @@ public class ForgePlayer extends LocalPlayer {
     private EntityPlayerMP player;
 
     protected ForgePlayer(EntityPlayerMP player) {
-        super((ServerInterface) ForgeWorldEdit.inst.getPlatform());
         this.player = player;
     }
 

src/forge/java/com/sk89q/worldedit/forge/ForgeWorld.java

@@ -107,7 +107,7 @@ public class ForgeWorld extends AbstractWorld {
 
     @Override
     public String getName() {
-        return getWorld().provider.getDimensionName();
+        return getWorld().getWorldInfo().getWorldName();
     }
 
     @Override
@@ -459,11 +459,15 @@ public class ForgeWorld extends AbstractWorld {
 
     @Override
     public boolean equals(Object o) {
-        if ((o instanceof ForgeWorld)) {
+        if (o == null) {
-            ForgeWorld other = ((ForgeWorld) o);
+            return false;
-            World otherWorld = other.worldRef.get();
+        } else if ((o instanceof ForgeWorld)) {
-            World thisWorld = other.worldRef.get();
+                ForgeWorld other = ((ForgeWorld) o);
-            return otherWorld != null && thisWorld != null && otherWorld.equals(thisWorld);
+                World otherWorld = other.worldRef.get();
+                World thisWorld = other.worldRef.get();
+                return otherWorld != null && thisWorld != null && otherWorld.equals(thisWorld);
+        } else if (o instanceof com.sk89q.worldedit.world.World) {
+            return ((com.sk89q.worldedit.world.World) o).getName().equals(getName());
         } else {
             return false;
         }

src/main/java/com/sk89q/worldedit/LocalPlayer.java

@@ -31,13 +31,4 @@ import com.sk89q.worldedit.extension.platform.Actor;
 @Deprecated
 public abstract class LocalPlayer extends AbstractPlayerActor {
 
-    /**
-     * Construct the object.
-     *
-     * @param server A reference to the server this player is on
-     */
-    protected LocalPlayer(ServerInterface server) {
-        super(server);
-    }
-
 }

src/main/java/com/sk89q/worldedit/extension/platform/AbstractPlayerActor.java

@@ -40,19 +40,6 @@ import static com.google.common.base.Preconditions.checkNotNull;
  */
 public abstract class AbstractPlayerActor implements Actor, Player {
 
-    private final Platform platform;
-
-    /**
-     * Create a new instance.
-     *
-     * @param platform the platform
-     */
-    protected AbstractPlayerActor(Platform platform) {
-        checkNotNull(platform);
-
-        this.platform = platform;
-    }
-
     /**
      * Returns direction according to rotation. May return null.
      *

src/main/java/com/sk89q/worldedit/extension/platform/Platform.java

@@ -24,8 +24,10 @@ import com.sk89q.minecraft.util.commands.CommandsManager;
 import com.sk89q.worldedit.BiomeTypes;
 import com.sk89q.worldedit.LocalConfiguration;
 import com.sk89q.worldedit.LocalPlayer;
+import com.sk89q.worldedit.entity.Player;
 import com.sk89q.worldedit.world.World;
 
+import javax.annotation.Nullable;
 import java.util.List;
 import java.util.Map;
 
@@ -78,6 +80,26 @@ public interface Platform {
 
     List<? extends World> getWorlds();
 
+    /**
+     * Create a duplicate of the given player.
+     * </p>
+     * The given player may have been provided by a different platform.
+     *
+     * @param player the player to match
+     * @return a matched player, otherwise null
+     */
+    @Nullable Player matchPlayer(Player player);
+
+    /**
+     * Create a duplicate of the given world.
+     * </p>
+     * The given world may have been provided by a different platform.
+     *
+     * @param world the world to match
+     * @return a matched world, otherwise null
+     */
+    @Nullable World matchWorld(World world);
+
     @Deprecated
     void onCommandRegistration(List<Command> commands);
 

src/main/java/com/sk89q/worldedit/extension/platform/PlatformManager.java

@@ -31,6 +31,7 @@ import com.sk89q.worldedit.internal.ServerInterfaceAdapter;
 import com.sk89q.worldedit.regions.RegionSelector;
 import com.sk89q.worldedit.util.Location;
 import com.sk89q.worldedit.util.eventbus.Subscribe;
+import com.sk89q.worldedit.world.World;
 
 import javax.annotation.Nullable;
 import java.util.*;
@@ -207,6 +208,44 @@ public class PlatformManager {
         return new ArrayList<Platform>(platforms);
     }
 
+    /**
+     * Given a world, possibly return the same world but using a different
+     * platform preferred for world editing operations.
+     *
+     * @param base the world to match
+     * @return the preferred world, if one was found, otherwise the given world
+     */
+    public World getWorldForEditing(World base) {
+        checkNotNull(base);
+        World match = queryCapability(Capability.WORLD_EDITING).matchWorld(base);
+        return match != null ? match : base;
+    }
+
+    /**
+     * Given an actor, return a new one that may use a different platform
+     * for permissions and world editing.
+     *
+     * @param base the base actor to match
+     * @return a new delegate actor
+     */
+    @SuppressWarnings("unchecked")
+    public <T extends Actor> T createProxyActor(T base) {
+        checkNotNull(base);
+
+        if (base instanceof Player) {
+            Player player = (Player) base;
+
+            Player permActor = queryCapability(Capability.PERMISSIONS).matchPlayer(player);
+            if (permActor == null) {
+                permActor = player;
+            }
+
+            return (T) new PlayerProxy(player, permActor, getWorldForEditing(base.getWorld()));
+        } else {
+            return base;
+        }
+    }
+
     /**
      * Get the command manager.
      *
@@ -247,7 +286,10 @@ public class PlatformManager {
     @SuppressWarnings("deprecation")
     @Subscribe
     public void handleBlockInteract(BlockInteractEvent event) {
-        Actor actor = event.getCause();
+        // Create a proxy actor with a potentially different world for
+        // making changes to the world
+        Actor actor = createProxyActor(event.getCause());
+
         Location location = event.getLocation();
         Vector vector = location.toVector();
 
@@ -335,7 +377,9 @@ public class PlatformManager {
     @SuppressWarnings("deprecation")
     @Subscribe
     public void handlePlayerInput(PlayerInputEvent event) {
-        Player player = event.getPlayer();
+        // Create a proxy actor with a potentially different world for
+        // making changes to the world
+        Player player = createProxyActor(event.getPlayer());
 
         switch (event.getInputType()) {
             case PRIMARY: {

src/main/java/com/sk89q/worldedit/extension/platform/PlayerProxy.java

@@ -0,0 +1,125 @@
+/*
+ * WorldEdit, a Minecraft world manipulation toolkit
+ * Copyright (C) sk89q <http://www.sk89q.com>
+ * Copyright (C) WorldEdit team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.sk89q.worldedit.extension.platform;
+
+import com.sk89q.worldedit.Vector;
+import com.sk89q.worldedit.WorldVector;
+import com.sk89q.worldedit.entity.Player;
+import com.sk89q.worldedit.extent.inventory.BlockBag;
+import com.sk89q.worldedit.util.Location;
+import com.sk89q.worldedit.world.World;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+class PlayerProxy extends AbstractPlayerActor {
+
+    private final Player basePlayer;
+    private final Actor permActor;
+    private final World world;
+
+    PlayerProxy(Player basePlayer, Actor permActor, World world) {
+        checkNotNull(basePlayer);
+        checkNotNull(permActor);
+        checkNotNull(world);
+        this.basePlayer = basePlayer;
+        this.permActor = permActor;
+        this.world = world;
+    }
+
+    @Override
+    public int getItemInHand() {
+        return basePlayer.getItemInHand();
+    }
+
+    @Override
+    public void giveItem(int type, int amount) {
+        basePlayer.giveItem(type, amount);
+    }
+
+    @Override
+    public BlockBag getInventoryBlockBag() {
+        return basePlayer.getInventoryBlockBag();
+    }
+
+    @Override
+    public String getName() {
+        return basePlayer.getName();
+    }
+
+    @Override
+    public Location getLocation() {
+        return basePlayer.getLocation();
+    }
+
+    @Override
+    public WorldVector getPosition() {
+        return basePlayer.getPosition();
+    }
+
+    @Override
+    public double getPitch() {
+        return basePlayer.getPitch();
+    }
+
+    @Override
+    public double getYaw() {
+        return basePlayer.getYaw();
+    }
+
+    @Override
+    public void setPosition(Vector pos, float pitch, float yaw) {
+        basePlayer.setPosition(pos, pitch, yaw);
+    }
+
+    @Override
+    public World getWorld() {
+        return world;
+    }
+
+    @Override
+    public void printRaw(String msg) {
+        basePlayer.printRaw(msg);
+    }
+
+    @Override
+    public void printDebug(String msg) {
+        basePlayer.printDebug(msg);
+    }
+
+    @Override
+    public void print(String msg) {
+        basePlayer.print(msg);
+    }
+
+    @Override
+    public void printError(String msg) {
+        basePlayer.printError(msg);
+    }
+
+    @Override
+    public String[] getGroups() {
+        return permActor.getGroups();
+    }
+
+    @Override
+    public boolean hasPermission(String perm) {
+        return permActor.hasPermission(perm);
+    }
+}

src/main/java/com/sk89q/worldedit/internal/ServerInterfaceAdapter.java

@@ -25,11 +25,13 @@ import com.sk89q.worldedit.BiomeTypes;
 import com.sk89q.worldedit.LocalConfiguration;
 import com.sk89q.worldedit.LocalPlayer;
 import com.sk89q.worldedit.ServerInterface;
+import com.sk89q.worldedit.entity.Player;
 import com.sk89q.worldedit.extension.platform.Capability;
 import com.sk89q.worldedit.extension.platform.Platform;
 import com.sk89q.worldedit.extension.platform.Preference;
 import com.sk89q.worldedit.world.World;
 
+import javax.annotation.Nullable;
 import java.util.List;
 import java.util.Map;
 
@@ -82,6 +84,18 @@ public class ServerInterfaceAdapter extends ServerInterface {
         return platform.getWorlds();
     }
 
+    @Nullable
+    @Override
+    public Player matchPlayer(Player player) {
+        return platform.matchPlayer(player);
+    }
+
+    @Nullable
+    @Override
+    public World matchWorld(World world) {
+        return platform.matchWorld(world);
+    }
+
     @Override
     @Deprecated
     public void onCommandRegistration(List<Command> commands) {