Commits

Jason Scheirer committed 4a776a8 Draft Merge

Merge back into main

  • Participants
  • Parent commits 9f5f834, 8b75b61

Comments (0)

Files changed (1)

src/org/blumel/minecraft/NoCreeps.java

 				String playerName = player.getName();
 
 				Date now = new Date();
-				Material helmet = player.getInventory().getHelmet().getType();
+				ItemStack helmet = player.getInventory().getHelmet();
 
 				boolean needNotify = (!lastExplosionNotification.containsKey(playerName) ||
 					                  now.getTime() - lastExplosionNotification.get(playerName).getTime() >= 1000);
 
 				if (player.hasPermission("dangerzone"))
 				{
-					if (helmet == Material.GOLD_HELMET)
+					if (helmet != null && helmet.getType() == Material.GOLD_HELMET)
 					{
 						if (needNotify)
 							player.sendMessage(ChatColor.RED + "BOOM");