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

Fixed rollbacks not skipping processing for identical blocks

Browse source
This commit is contained in:
Intelli 2022-03-06 17:05:18 -07:00
parent 83fc221bf2
commit c69ea79329
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/main/java/net/coreprotect/database/Rollback.java
View file

@ -531,13 +531,18 @@ public class Rollback extends Queue {
if ((rowType == changeType) && ((!BukkitAdapter.ADAPTER.isItemFrame(oldTypeMaterial)) && (oldTypeMaterial != Material.PAINTING) && (oldTypeMaterial != Material.ARMOR_STAND)) && (oldTypeMaterial != Material.END_CRYSTAL)) { if ((rowType == changeType) && ((!BukkitAdapter.ADAPTER.isItemFrame(oldTypeMaterial)) && (oldTypeMaterial != Material.PAINTING) && (oldTypeMaterial != Material.ARMOR_STAND)) && (oldTypeMaterial != Material.END_CRYSTAL)) {
// block is already changed! // block is already changed!
if (blockData != null) { BlockData checkData = rowType == Material.AIR ? blockData : rawBlockData;
if (blockData.getAsString().equals(changeBlockData.getAsString()) || blockData instanceof MultipleFacing || blockData instanceof Stairs || blockData instanceof RedstoneWire) { if (checkData != null) {
if (checkData.getAsString().equals(changeBlockData.getAsString()) || checkData instanceof MultipleFacing || checkData instanceof Stairs || checkData instanceof RedstoneWire) {
if (rowType != Material.CHEST && rowType != Material.TRAPPED_CHEST) { // always update double chests if (rowType != Material.CHEST && rowType != Material.TRAPPED_CHEST) { // always update double chests
changeBlock = false; changeBlock = false;
} }
} }
} }
else if (rowType == Material.AIR) {
changeBlock = false;
}
countBlock = false; countBlock = false;
} }
else if ((changeType != Material.AIR) && (changeType != Material.CAVE_AIR)) { else if ((changeType != Material.AIR) && (changeType != Material.CAVE_AIR)) {