From e893e179ea9e94bff4dbcebe615b246d3b7f151a Mon Sep 17 00:00:00 2001 From: TheBusyBiscuit Date: Thu, 12 Mar 2020 03:32:28 +0100 Subject: [PATCH] Fixes #1570 --- CHANGELOG.md | 2 ++ .../implementation/items/blocks/Crucible.java | 26 +++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b5465664f..4a09d0443 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -49,9 +49,11 @@ * Internal clean up and further documentation * Changed Automatic Ignition Chamber to be a Dropper * Teleporters are now significantly faster +* Item permissions have been moved to a seperate permissions.yml file ### Fixes * Fixed some languages showing numbers larger than 100% +* Fixed #1570 ## Release Candidate 9 (07 Mar 2020) diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/Crucible.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/Crucible.java index 9030085c0..e811d087e 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/Crucible.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/Crucible.java @@ -121,32 +121,27 @@ public class Crucible extends SimpleSlimefunItem implements Rec Slimefun.runSync(() -> { if (block.getType() == Material.AIR || block.getType() == Material.CAVE_AIR || block.getType() == Material.VOID_AIR) { - if (water) { - if (block.getBlockData() instanceof Waterlogged) { - Waterlogged wl = (Waterlogged) block.getBlockData(); - wl.setWaterlogged(true); - block.setBlockData(wl, false); - block.getWorld().playSound(block.getLocation(), Sound.ENTITY_PLAYER_SPLASH, 1F, 1F); - return; - } - - block.getWorld().playSound(block.getLocation(), Sound.BLOCK_METAL_BREAK, 1F, 1F); + block.setType(water ? Material.WATER : Material.LAVA); + } + else { + if (water && block.getBlockData() instanceof Waterlogged) { + Waterlogged wl = (Waterlogged) block.getBlockData(); + wl.setWaterlogged(true); + block.setBlockData(wl, false); + block.getWorld().playSound(block.getLocation(), Sound.ENTITY_PLAYER_SPLASH, 1F, 1F); return; } if (BlockStorage.hasBlockInfo(block)) { BlockStorage.clearBlockInfo(block); } - - block.getWorld().playSound(block.getLocation(), Sound.BLOCK_LAVA_EXTINGUISH, 1F, 1F); } - block.setType(water ? Material.WATER : Material.LAVA); runPostTask(block, water ? Sound.ENTITY_PLAYER_SPLASH : Sound.BLOCK_LAVA_POP, 1); }, 50L); - break; + return; } } @@ -171,6 +166,9 @@ public class Crucible extends SimpleSlimefunItem implements Rec if (times < 8) { Slimefun.runSync(() -> runPostTask(block, sound, times + 1), 50L); } + else { + block.getWorld().playSound(block.getLocation(), Sound.ENTITY_ARROW_HIT_PLAYER, 1F, 1F); + } } }