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

Check by setting blocks with BlockBagExtend for changed materials.

Browse Source
This commit is contained in:
JOO200 2018-12-05 17:09:06 +01:00 committed by IronApollo
parent b276907dcd
commit 63bf01fdaf
1 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
worldedit-core/src/main/java/com/sk89q/worldedit/extent/inventory/BlockBagExtent.java
View File

@ -86,18 +86,16 @@ public class BlockBagExtent extends AbstractDelegateExtent {
} }
@Override @Override
//<<<<<<< HEAD
public boolean setBlock(BlockVector3 pos, BlockStateHolder block) throws WorldEditException { public boolean setBlock(BlockVector3 pos, BlockStateHolder block) throws WorldEditException {
return setBlock(pos.getBlockX(), pos.getBlockY(), pos.getBlockZ(), block); return setBlock(pos.getBlockX(), pos.getBlockY(), pos.getBlockZ(), block);
} }
//=======
// public boolean setBlock(BlockVector3 position, BlockStateHolder block) throws WorldEditException {
// if (blockBag != null) {
// BlockState existing = getExtent().getBlock(position);
//>>>>>>> 399e0ad5... Refactor vector system to be cleaner
@Override @Override
public boolean setBlock(int x, int y, int z, BlockStateHolder block) throws WorldEditException { public boolean setBlock(int x, int y, int z, BlockStateHolder block) throws WorldEditException {
if(blockBag != null) {
BlockStateHolder lazyBlock = getExtent().getLazyBlock(x, y, z);
BlockType fromType = lazyBlock.getBlockType();
if(!block.getBlockType().equals(fromType)) {
BlockType type = block.getBlockType(); BlockType type = block.getBlockType();
if (!type.getMaterial().isAir()) { if (!type.getMaterial().isAir()) {
try { try {
@ -110,8 +108,7 @@ public class BlockBagExtent extends AbstractDelegateExtent {
} }
} }
if (mine) { if (mine) {
BlockStateHolder lazyBlock = getExtent().getLazyBlock(x, y, z);
BlockType fromType = lazyBlock.getBlockType();
if (!fromType.getMaterial().isAir()) { if (!fromType.getMaterial().isAir()) {
try { try {
blockBag.storeDroppedBlock(fromType.getDefaultState()); blockBag.storeDroppedBlock(fromType.getDefaultState());
@ -119,6 +116,8 @@ public class BlockBagExtent extends AbstractDelegateExtent {
} }
} }
} }
}
}
return getExtent().setBlock(x, y, z, block); return getExtent().setBlock(x, y, z, block);
} }