Merge pull request #298 from DarkArc/master

Fixes WorldEdit CUI.

Closes WORLDEDIT-3150.

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

@@ -168,6 +168,7 @@ public class BukkitServerInterface extends ServerInterface {
     public Map<Capability, Preference> getCapabilities() {
         Map<Capability, Preference> capabilities = new EnumMap<Capability, Preference>(Capability.class);
         capabilities.put(Capability.CONFIGURATION, Preference.NORMAL);
+        capabilities.put(Capability.WORLDEDIT_CUI, Preference.NORMAL);
         capabilities.put(Capability.GAME_HOOKS, Preference.PREFERRED);
         capabilities.put(Capability.PERMISSIONS, Preference.PREFERRED);
         capabilities.put(Capability.USER_COMMANDS, Preference.PREFERRED);

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

@@ -205,6 +205,7 @@ class ForgePlatform extends ServerInterface {
     public Map<Capability, Preference> getCapabilities() {
         Map<Capability, Preference> capabilities = new EnumMap<Capability, Preference>(Capability.class);
         capabilities.put(Capability.CONFIGURATION, Preference.PREFER_OTHERS);
+        capabilities.put(Capability.WORLDEDIT_CUI, Preference.NORMAL);
         capabilities.put(Capability.GAME_HOOKS, Preference.NORMAL);
         capabilities.put(Capability.PERMISSIONS, Preference.PREFER_OTHERS);
         capabilities.put(Capability.USER_COMMANDS, Preference.NORMAL);

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

@@ -65,6 +65,11 @@ public enum Capability {
      */
     PERMISSIONS,
 
+    /**
+     * The capability of a platform to dispatch WorldEditCUI events.
+     */
+    WORLDEDIT_CUI,
+
     /**
      * The capability of a platform to perform modifications to a world.
      */

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

@@ -240,7 +240,12 @@ public class PlatformManager {
                 permActor = player;
             }
 
-            return (T) new PlayerProxy(player, permActor, getWorldForEditing(player.getWorld()));
+            Player cuiActor = queryCapability(Capability.WORLDEDIT_CUI).matchPlayer(player);
+            if (cuiActor == null) {
+                cuiActor = player;
+            }
+
+            return (T) new PlayerProxy(player, permActor, cuiActor, getWorldForEditing(player.getWorld()));
         } else {
             return base;
         }

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

@@ -23,6 +23,7 @@ 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.internal.cui.CUIEvent;
 import com.sk89q.worldedit.util.Location;
 import com.sk89q.worldedit.world.World;
 
@@ -32,14 +33,17 @@ class PlayerProxy extends AbstractPlayerActor {
 
     private final Player basePlayer;
     private final Actor permActor;
+    private final Actor cuiActor;
     private final World world;
 
-    PlayerProxy(Player basePlayer, Actor permActor, World world) {
+    PlayerProxy(Player basePlayer, Actor permActor, Actor cuiActor, World world) {
         checkNotNull(basePlayer);
         checkNotNull(permActor);
+        checkNotNull(cuiActor);
         checkNotNull(world);
         this.basePlayer = basePlayer;
         this.permActor = permActor;
+        this.cuiActor = cuiActor;
         this.world = world;
     }
 
@@ -122,4 +126,9 @@ class PlayerProxy extends AbstractPlayerActor {
     public boolean hasPermission(String perm) {
         return permActor.hasPermission(perm);
     }
+
+    @Override
+    public void dispatchCUIEvent(CUIEvent event) {
+        cuiActor.dispatchCUIEvent(event);
+    }
 }