From 380abb5e65f53f14ac7142276625611738751344 Mon Sep 17 00:00:00 2001 From: Zeranny Date: Fri, 22 Mar 2024 18:24:40 +0000 Subject: [PATCH 1/2] Replace toWorld with toWorldRel for relative data --- .../regions/shape/WorldEditExpressionEnvironment.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/shape/WorldEditExpressionEnvironment.java b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/shape/WorldEditExpressionEnvironment.java index 4b87ebcc6d..1b84aa9985 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/shape/WorldEditExpressionEnvironment.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/shape/WorldEditExpressionEnvironment.java @@ -83,9 +83,8 @@ public int getBlockTypeRel(double x, double y, double z) { } @SuppressWarnings("deprecation") - @Override public int getBlockDataRel(double x, double y, double z) { - return extent.getBlock(toWorld(x, y, z)).getBlockType().getLegacyCombinedId() & 0xF; + return extent.getBlock(toWorldRel(x, y, z).toBlockPoint()).getBlockType().getLegacyCombinedId() & 0xF; } //FAWE start From 5b181ab9cc6a43422e553ef1eeb7dd0f24be8d02 Mon Sep 17 00:00:00 2001 From: Zeranny Date: Sat, 23 Mar 2024 14:55:19 +0000 Subject: [PATCH 2/2] re-add accidentally deleted annotation --- .../worldedit/regions/shape/WorldEditExpressionEnvironment.java | 1 + 1 file changed, 1 insertion(+) diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/shape/WorldEditExpressionEnvironment.java b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/shape/WorldEditExpressionEnvironment.java index 1b84aa9985..2284b9733f 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/shape/WorldEditExpressionEnvironment.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/shape/WorldEditExpressionEnvironment.java @@ -83,6 +83,7 @@ public int getBlockTypeRel(double x, double y, double z) { } @SuppressWarnings("deprecation") + @Override public int getBlockDataRel(double x, double y, double z) { return extent.getBlock(toWorldRel(x, y, z).toBlockPoint()).getBlockType().getLegacyCombinedId() & 0xF; }