Fix stash failure

worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/BlockTranslateExtent.java

@@ -24,20 +24,12 @@ public class BlockTranslateExtent extends AbstractDelegateExtent {
 
     @Override
     public <T extends BlockStateHolder<T>> 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 <T extends BlockStateHolder<T>> 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

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 <B extends BlockStateHolder<B>> boolean setBlock(int x, int y, int z, B block)
             throws WorldEditException {
-        mutable.setComponents(x, y, z);
+        BlockVector3 vector3 = BlockVector3.at(x, y, z);
-        return pattern.apply(extent, mutable, mutable);
+        return pattern.apply(extent, vector3, vector3);
     }
 
->>>>>>> Stashed changes
 }