Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/emergency-support-fixes

This commit is contained in:
AlexTheCoder 2016-09-05 20:27:09 -04:00
commit 64db10c91a

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);
} }