Merge branch 'v5' into v6

This commit is contained in:
N0tMyFaultOG
2020-09-02 17:19:12 +02:00
2 changed files with 10 additions and 8 deletions

View File

@ -555,6 +555,7 @@ public class BlockEventListener implements Listener {
}
if (!plot.getFlag(IceFormFlag.class)) {
event.setCancelled(true);
plot.debug("Ice could not form because ice-form = false");
}
}
@ -1033,6 +1034,7 @@ public class BlockEventListener implements Listener {
}
} else if (!plot.getFlag(BlockIgnitionFlag.class)) {
event.setCancelled(true);
plot.debug("Block ignition was cancelled because block-ignition = false");
}
} else {
if (plot == null) {