zhdev/griefus
1
0
Fork 0
Code Issues Pull requests Activity

Additional cleanup in ChestTool

Browse source
This commit is contained in:
Intelli 2021-07-25 21:15:53 -06:00
parent e178ed91ca
commit 40ff1e7778
1 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/main/java/net/coreprotect/utility/ChestTool.java
View file

@ -17,7 +17,6 @@ public class ChestTool {
} }
public static void updateDoubleChest(Block block, BlockData blockData, boolean forceValidation) { public static void updateDoubleChest(Block block, BlockData blockData, boolean forceValidation) {
// modifying container, trigger physics update on both sides of double chest
if (!(blockData instanceof Chest) || ((Chest) blockData).getType() == Type.SINGLE) { if (!(blockData instanceof Chest) || ((Chest) blockData).getType() == Type.SINGLE) {
return; return;
} }
@ -64,16 +63,18 @@ public class ChestTool {
} }
} }
if (newFace == null) { if (newFace != null) {
return;
}
Type newType = (chestType == Type.LEFT) ? Type.RIGHT : Type.LEFT; Type newType = (chestType == Type.LEFT) ? Type.RIGHT : Type.LEFT;
Block relativeBlock = block.getRelative(newFace); Block relativeBlock = block.getRelative(newFace);
if (!forceValidation && (relativeBlock.getBlockData() instanceof Chest) && ((Chest) relativeBlock.getBlockData()).getType() == newType) { if (!forceValidation && (relativeBlock.getBlockData() instanceof Chest) && ((Chest) relativeBlock.getBlockData()).getType() == newType) {
return; return;
} }
validateContainer(blockData, newType, block, relativeBlock);
}
}
private static void validateContainer(BlockData blockData, Type newType, Block block, Block relativeBlock) {
Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(CoreProtect.getInstance(), () -> { Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(CoreProtect.getInstance(), () -> {
try { try {
BlockData relativeBlockData = relativeBlock.getBlockData(); BlockData relativeBlockData = relativeBlock.getBlockData();