Merge branch 'dev-upgrades' of https://gitlab.com/Fabrimat/fabledskyblock into dev-upgrades

This commit is contained in:
Fabrizio La Rosa 2020-06-16 19:44:23 +02:00
commit 14b14016f4
2 changed files with 7 additions and 0 deletions

View File

@ -728,6 +728,7 @@ public class Block implements Listener {
// placed.
// This shouldn't cause any issues besides the task number being increased
// insanely fast.
// TODO Do this only in 1.8.8
Bukkit.getScheduler().runTask(skyblock, () -> {
org.bukkit.block.Block block = location.getBlock();
CompatibleMaterial material = CompatibleMaterial.getMaterial(block);

View File

@ -338,11 +338,16 @@ Island:
# Should slime split bypass limits.yml
AllowSlimeSplit: true
Nether:
# Allow placing water in the Nether
AllowNetherWater: false
# Water disappear when a nether mob walks into it
WaterDisappearWithNetherMobs: false
# Block water from flowing near nether mobs EXPERIMENTAL!
WaterDoNotFlowNearNetherMobs: false
# Make blaze immune from water in the Nether
BlazeImmuneToWaterInNether: false
Restrict:
# Blocks that can be placed only if the island has nether unlocked
NetherBlocks:
NETHERRACK: true
SOUL_SAND: true
@ -365,6 +370,7 @@ Island:
NETHER_WART_BLOCK: true
WITHER_SKELETON_SKULL: true
WITHER_ROSE: true
# Blocks that can be placed only if the island has The End unlocked
EndBlocks:
END_STONE: true
END_STONE_BRICKS: true