Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: do not forcefully direct to x,y,z methods in AbstractDelegateExtent #2614

Merged
merged 1 commit into from Mar 14, 2024
Merged

fix: do not forcefully direct to x,y,z methods in AbstractDelegateExtent #2614

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 5 additions & 17 deletions worldedit-core/src/main/java/com/sk89q/worldedit/extent/AbstractDelegateExtent.java
View file
Open in desktop
Expand Up @@ -91,9 +91,7 @@ public Extent getExtent() {

@Override
public BlockState getBlock(BlockVector3 position) {
//FAWE start - return coordinates
return extent.getBlock(position.getX(), position.getY(), position.getZ());
//FAWE end
return extent.getBlock(position);
}

@Override
Expand All @@ -103,9 +101,7 @@ public BlockState getBlock(int x, int y, int z) {

@Override
public BaseBlock getFullBlock(BlockVector3 position) {
//FAWE start - return coordinates
return extent.getFullBlock(position.getX(), position.getY(), position.getZ());
//FAWE end
return extent.getFullBlock(position);
}

//FAWE start
Expand All @@ -117,9 +113,7 @@ public BaseBlock getFullBlock(BlockVector3 position) {

@Override
public BaseBlock getFullBlock(int x, int y, int z) {
//FAWE start - return coordinates
return extent.getFullBlock(x, y, z);
//FAWE end
}

@Override
Expand Down Expand Up @@ -375,9 +369,7 @@ protected Operation commitBefore() {

@Override
public BiomeType getBiome(BlockVector3 position) {
//FAWE start - switch top x,y,z
return extent.getBiomeType(position.getX(), position.getY(), position.getZ());
//FAWE end
return extent.getBiome(position);
}

//FAWE start
Expand Down Expand Up @@ -420,9 +412,7 @@ public void setChangeSet(AbstractChangeSet changeSet) {
@Override
public <T extends BlockStateHolder<T>> boolean setBlock(BlockVector3 position, T block)
throws WorldEditException {
//FAWE start - switch to x,y,z
return extent.setBlock(position.getX(), position.getY(), position.getZ(), block);
//FAWE end
return extent.setBlock(position, block);
}

//FAWE start
Expand All @@ -447,9 +437,7 @@ public boolean fullySupports3DBiomes() {

@Override
public boolean setBiome(BlockVector3 position, BiomeType biome) {
//FAWE start - switch to x,y,z
return extent.setBiome(position.getX(), position.getY(), position.getZ(), biome);
//FAWE end
return extent.setBiome(position, biome);
}

//FAWE start
Expand Down