mirror of
https://github.com/StarWishsama/Slimefun4.git
synced 2024-09-20 03:35:51 +00:00
Merge branch 'master' into master
This commit is contained in:
commit
1c649a4537
@ -93,7 +93,11 @@ public class RitualAnimation implements Runnable {
|
||||
|
||||
private void abort() {
|
||||
running = false;
|
||||
pedestals.forEach((pblock) -> Variables.altarinuse.remove(pblock.getLocation()));
|
||||
|
||||
pedestals.forEach((pblock)->{
|
||||
Variables.altarinuse.remove(pblock.getLocation());
|
||||
});
|
||||
|
||||
Variables.altarinuse.remove(altar.getLocation()); // should re-enable altar blocks on craft failure.
|
||||
l.getWorld().playSound(l, Sound.ENTITY_ZOMBIE_ATTACK_IRON_DOOR, 5F, 1F);
|
||||
altars.remove(altar);
|
||||
@ -105,7 +109,9 @@ public class RitualAnimation implements Runnable {
|
||||
l.getWorld().playEffect(l, Effect.STEP_SOUND, Material.EMERALD_BLOCK);
|
||||
l.getWorld().dropItemNaturally(l.add(0, 1, 0), output);
|
||||
|
||||
pedestals.forEach((pblock)-> Variables.altarinuse.remove(pblock.getLocation()));
|
||||
pedestals.forEach((pblock)->{
|
||||
Variables.altarinuse.remove(pblock.getLocation());
|
||||
});
|
||||
Variables.altarinuse.remove(altar.getLocation()); // should re-enable altar blocks on craft completion.
|
||||
altars.remove(altar);
|
||||
}
|
||||
|
@ -56,10 +56,8 @@ public class AndroidKillingListener implements Listener {
|
||||
items.add(new ItemStack(Material.GOLD_NUGGET, 1 + CSCoreLib.randomizer().nextInt(3)));
|
||||
break;
|
||||
}
|
||||
case SKELETON: {
|
||||
if (((Skeleton) e.getEntity()).getSkeletonType().equals(SkeletonType.WITHER)) {
|
||||
case WITHER_SKELETON: {
|
||||
if (CSCoreLib.randomizer().nextInt(250) < 2) items.add(new MaterialData(Material.SKULL_ITEM, (byte) 1).toItemStack(1));
|
||||
}
|
||||
break;
|
||||
}
|
||||
default:
|
||||
|
Loading…
Reference in New Issue
Block a user