Force non-Locatable actors to use placeAtPos1

EngineHub · Sep 22, 2019 · 6162a47 · 6162a47
1 parent 44dc926
commit 6162a47
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/LocalSession.java b/worldedit-core/src/main/java/com/sk89q/worldedit/LocalSession.java
@@ -521,6 +521,14 @@ public BlockVector3 getPlacementPosition(Actor actor) throws IncompleteRegionExc
         return selector.getPrimaryPosition();
     }
 
+    public void setPlaceAtPos1(boolean placeAtPos1) {
+        this.placeAtPos1 = placeAtPos1;
+    }
+
+    public boolean isPlaceAtPos1() {
+        return placeAtPos1;
+    }
+
     /**
      * Toggle placement position.
      *

diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/session/SessionManager.java b/worldedit-core/src/main/java/com/sk89q/worldedit/session/SessionManager.java
@@ -34,6 +34,7 @@
 import com.sk89q.worldedit.command.tool.Tool;
 import com.sk89q.worldedit.entity.Player;
 import com.sk89q.worldedit.event.platform.ConfigurationLoadEvent;
+import com.sk89q.worldedit.extension.platform.Locatable;
 import com.sk89q.worldedit.session.request.Request;
 import com.sk89q.worldedit.session.storage.JsonFileSessionStore;
 import com.sk89q.worldedit.session.storage.SessionStore;
@@ -199,6 +200,11 @@ public synchronized LocalSession get(SessionOwner owner) {
                 && (owner.hasPermission("worldedit.inventory.unrestricted")
                 || (config.useInventoryCreativeOverride && (!(owner instanceof Player) || ((Player) owner).getGameMode() == GameModes.CREATIVE)))));
 
+        // Force non-locatable actors to use placeAtPos1
+        if (!(owner instanceof Locatable)) {
+            session.setPlaceAtPos1(true);
+        }
+
         return session;
     }