Fixed the adapt function for Actor -> Bukkit not working for players …

…or command blocks
EngineHub · Jan 4, 2020 · e198718 · e198718
1 parent 3ed02aa
commit e198718
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitAdapter.java b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitAdapter.java
@@ -148,6 +148,11 @@ public static BukkitPlayer adapt(Player player) {
      * @return The Bukkit command sender
      */
     public static CommandSender adapt(Actor actor) {
+        if (actor instanceof com.sk89q.worldedit.entity.Player) {
+            return adapt((com.sk89q.worldedit.entity.Player) actor);
+        } else if (actor instanceof BukkitBlockCommandSender) {
+            return ((BukkitBlockCommandSender) actor).getSender();
+        }
         return ((BukkitCommandSender) actor).getSender();
     }
 

diff --git a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitBlockCommandSender.java b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitBlockCommandSender.java
@@ -139,6 +139,10 @@ public boolean hasPermission(String permission) {
         return sender.hasPermission(permission);
     }
 
+    public BlockCommandSender getSender() {
+        return this.sender;
+    }
+
     @Override
     public SessionKey getSessionKey() {
         return new SessionKey() {