Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-06-30 22:21:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix stash failure

Browse Source
This commit is contained in:
dordsor21 2021-08-11 15:03:59 +01:00
parent 3ba42df321
commit 00a6a2d917
No known key found for this signature in database
GPG Key ID: 1E53E88969FFCF0B
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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

8
worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/transform/PatternTransform.java
View File

@ -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);
return pattern.apply(extent, mutable, mutable);
BlockVector3 vector3 = BlockVector3.at(x, y, z);
return pattern.apply(extent, vector3, vector3);
}
>>>>>>> Stashed changes
}