Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-23 01:37:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix combine-stages=false for FAVS

Browse Source
This commit is contained in:
Jesse Boyd 2019-04-14 14:31:27 +10:00
parent 6502f0b5c6
commit b3e1076868
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
1 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
worldedit-core/src/main/java/com/boydti/fawe/object/ChangeSetFaweQueue.java
View File

@ -4,7 +4,11 @@ import com.boydti.fawe.FaweCache;
import com.boydti.fawe.object.changeset.FaweChangeSet;
import com.boydti.fawe.object.queue.DelegateFaweQueue;
import com.sk89q.jnbt.CompoundTag;
import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.math.BlockVector3;
import com.sk89q.worldedit.regions.CuboidRegion;
import com.sk89q.worldedit.world.biome.BiomeType;
import com.sk89q.worldedit.world.block.BlockStateHolder;
import com.sk89q.worldedit.world.block.BlockType;
import com.sk89q.worldedit.world.block.BlockTypes;
@ -25,8 +29,28 @@ public class ChangeSetFaweQueue extends DelegateFaweQueue {
}
@Override
public boolean setBlock(int x, int y, int z, int combinedId) {
public <B extends BlockStateHolder<B>> boolean setBlock(BlockVector3 p, B block) throws WorldEditException {
return setBlock(p.getX(), p.getY(), p.getZ(), block.getInternalId(), block.getNbtData());
}
@Override
public <B extends BlockStateHolder<B>> boolean setBlock(int x, int y, int z, B block) throws WorldEditException {
return setBlock(x, y, z, block.getInternalId(), block.getNbtData());
}
@Override
public boolean setBlock(int x, int y, int z, int combinedId, CompoundTag nbt) {
if (setBlock(x, y, z, combinedId)) {
if (nbt != null) {
set.addTileCreate(nbt);
}
return true;
}
return false;
}
@Override
public boolean setBlock(int x, int y, int z, int combinedId) {
if (super.setBlock(x, y, z, combinedId)) {
int combinedFrom = getParent().getCombinedId4Data(x, y, z);
BlockType typeFrom = BlockTypes.getFromStateId(combinedFrom);