Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq

This commit is contained in:
Sam 2016-09-06 21:37:33 +01:00
commit be268991b0

View File

@ -266,7 +266,7 @@ public class MavericksManager extends MiniPlugin
@EventHandler @EventHandler
public void onBlockIgnite(BlockIgniteEvent event) public void onBlockIgnite(BlockIgniteEvent event)
{ {
if(isInsideDisplaySlot(event.getBlock()) || isInsideDisplaySlot(event.getIgnitingBlock())) if(isInsideDisplaySlot(event.getBlock()) || (event.getIgnitingBlock() != null && isInsideDisplaySlot(event.getIgnitingBlock())))
event.setCancelled(true); event.setCancelled(true);
} }