feedc0de/LogBlock
1
0
Fork 0
forked from LogBlock/LogBlock
Code Pull Requests Activity

Force CAVE_AIR and VOID_AIR to AIR + Cleanup rollbacks

Browse Source
This commit is contained in:
Brokkonaut
2018-08-02 00:50:03 +02:00
parent 37ce2303dc
commit 0eb2b0dbc8
2 changed files with 6 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/de/diddiz/LogBlock/Consumer.java
View File

@ -578,10 +578,10 @@ public class Consumer extends TimerTask {
}
private void queueBlock(Actor actor, Location loc, BlockData typeBefore, BlockData typeAfter, byte[] stateBefore, byte[] stateAfter, ChestAccess ca) {
if (typeBefore == null) {
if (typeBefore == null || typeBefore.getMaterial() == Material.CAVE_AIR || typeBefore.getMaterial() == Material.VOID_AIR) {
typeBefore = Bukkit.createBlockData(Material.AIR);
}
if (typeAfter == null) {
if (typeAfter == null || typeAfter.getMaterial() == Material.CAVE_AIR || typeAfter.getMaterial() == Material.VOID_AIR) {
typeAfter = Bukkit.createBlockData(Material.AIR);
}
if (Config.fireCustomEvents) {

33
src/main/java/de/diddiz/LogBlock/WorldEditor.java
View File

@ -176,23 +176,11 @@ public class WorldEditor implements Runnable {
world.loadChunk(block.getChunk());
}
if (setBlock.equals(replacedBlock)) {
if (BukkitUtils.isEmpty(setBlock.getMaterial())) {
block.setType(Material.AIR);
} else if (ca != null) {
if (state instanceof InventoryHolder) {
if (ca != null) {
if (state instanceof InventoryHolder && state.getType() == replacedBlock.getMaterial()) {
int leftover;
try {
leftover = modifyContainer(state, new ItemStack(ca.itemStack), !ca.remove);
// Special-case blocks which might be double chests
if (leftover > 0 && (setBlock.getMaterial() == Material.CHEST || setBlock.getMaterial() == Material.TRAPPED_CHEST)) {
for (final BlockFace face : new BlockFace[]{BlockFace.NORTH, BlockFace.SOUTH, BlockFace.EAST, BlockFace.WEST}) {
if (block.getRelative(face).getType() == setBlock.getMaterial()) {
ItemStack remaining = new ItemStack(ca.itemStack);
remaining.setAmount(leftover);
leftover = modifyContainer(block.getRelative(face).getState(), remaining, !ca.remove);
}
}
}
} catch (final Exception ex) {
throw new WorldEditorException(ex.getMessage(), block.getLocation());
}
@ -200,26 +188,13 @@ public class WorldEditor implements Runnable {
throw new WorldEditorException("Not enough space left in " + block.getType(), block.getLocation());
}
}
} else if (BlockStateCodecs.hasCodec(replacedBlock.getMaterial())) {
block.setBlockData(replacedBlock);
state = block.getState();
try {
BlockStateCodecs.deserialize(state, replacedState);
state.update();
} catch (Exception e) {
throw new WorldEditorException("Failed to restore blockstate of " + block.getType() + ": " + e, block.getLocation());
}
} else if (!block.getBlockData().equals(replacedBlock)) {
block.setBlockData(replacedBlock);
} else {
return PerformResult.NO_ACTION;
return PerformResult.SUCCESS;
}
return PerformResult.SUCCESS;
}
if (block.getType() != setBlock.getMaterial() && !replaceAnyway.contains(block.getType())) {
return PerformResult.NO_ACTION;
}
if (state instanceof InventoryHolder) {
if (state instanceof InventoryHolder && replacedBlock.getMaterial() != block.getType()) {
((InventoryHolder) state).getInventory().clear();
state.update();
}