Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder

This commit is contained in:
Virizion 2015-12-13 19:54:57 -05:00
commit 54911bb213

View File

@ -304,14 +304,16 @@ public class HolidayManager implements Listener
if (Manager.GetGame() != null && !Manager.GetGame().IsAlive(event.getPlayer()))
return;
if (!_active.contains(event.getClickedBlock()))
return;
specialBlockBreak(event.getPlayer(), event.getClickedBlock());
}
private void specialBlockBreak(Player player, final Block block)
{
if (!_active.contains(block))
return;
_active.remove(block);
block.getWorld().playEffect(block.getLocation(), Effect.STEP_SOUND, type.getBlockType());
block.setType(Material.AIR);