From 00a6a2d9173189dea549e939724cecd609a9af25 Mon Sep 17 00:00:00 2001 From: dordsor21 Date: Wed, 11 Aug 2021 15:03:59 +0100 Subject: [PATCH] Fix stash failure --- .../core/extent/BlockTranslateExtent.java | 8 -------- .../core/extent/transform/PatternTransform.java | 8 ++------ 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/BlockTranslateExtent.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/BlockTranslateExtent.java index 05bc7acba..d7b8a986e 100644 --- a/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/BlockTranslateExtent.java +++ b/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/BlockTranslateExtent.java @@ -24,20 +24,12 @@ public class BlockTranslateExtent extends AbstractDelegateExtent { @Override public > boolean setBlock(BlockVector3 location, T block) throws WorldEditException { -<<<<<<< Updated upstream - return getExtent().setBlock(location.getX(), location.getY(), location.getZ(), block); -======= return getExtent().setBlock(location.getX() + dx, location.getY() + dy, location.getZ() + dz, block); ->>>>>>> Stashed changes } @Override public > boolean setBlock(int x, int y, int z, T block) throws WorldEditException { -<<<<<<< Updated upstream - return getExtent().setBlock(x, y, z, block); -======= return getExtent().setBlock(x + dx, y + dy, z + dz, block); ->>>>>>> Stashed changes } @Override diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/transform/PatternTransform.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/transform/PatternTransform.java index 310de6d8f..794649719 100644 --- a/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/transform/PatternTransform.java +++ b/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/transform/PatternTransform.java @@ -11,7 +11,6 @@ import com.sk89q.worldedit.world.block.BlockStateHolder; public class PatternTransform extends ResettableExtent { private final Pattern pattern; - private final MutableBlockVector3 mutable = new MutableBlockVector3(); public PatternTransform(Extent parent, Pattern pattern) { super(parent); @@ -24,14 +23,11 @@ public class PatternTransform extends ResettableExtent { return pattern.apply(getExtent(), location, location); } -<<<<<<< Updated upstream -======= @Override public > boolean setBlock(int x, int y, int z, B block) throws WorldEditException { - mutable.setComponents(x, y, z); - return pattern.apply(extent, mutable, mutable); + BlockVector3 vector3 = BlockVector3.at(x, y, z); + return pattern.apply(extent, vector3, vector3); } ->>>>>>> Stashed changes }