From ca03c96173946d26ce55aa576b75bc3edb27a07c Mon Sep 17 00:00:00 2001
From: Connor Monahan <admin@cmastudios.me>
Date: Fri, 27 Dec 2013 15:31:11 -0600
Subject: [PATCH] [Behavior] Blockheads:true now gives leather hat

Warzones that previously used blockheads:false during the preview to get a properly colored hat now need to switch to blockheads:true for a hat. Old warzones that have blockheads:true will now have colored helmets instead of block heads.
Closes #528.
---
 war/src/main/java/com/tommytony/war/Warzone.java | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/war/src/main/java/com/tommytony/war/Warzone.java b/war/src/main/java/com/tommytony/war/Warzone.java
index 1b0e0d9..ccb20c4 100644
--- a/war/src/main/java/com/tommytony/war/Warzone.java
+++ b/war/src/main/java/com/tommytony/war/Warzone.java
@@ -486,7 +486,6 @@ public class Warzone {
 		playerInv.clear(playerInv.getSize() + 1);
 		playerInv.clear(playerInv.getSize() + 2);
 		playerInv.clear(playerInv.getSize() + 3); // helmet/blockHead
-		boolean helmetIsInLoadout = false;
 		for (Integer slot : loadout.keySet()) {
 			if (slot == 100) {
 				playerInv.setBoots(loadout.get(slot).clone());
@@ -496,7 +495,6 @@ public class Warzone {
 				playerInv.setChestplate(loadout.get(slot).clone());
 			} else if (slot == 103) {
 				playerInv.setHelmet(loadout.get(slot).clone());
-				helmetIsInLoadout = true;
 			} else {
 				ItemStack item = loadout.get(slot);
 				if (item != null) {
@@ -505,8 +503,6 @@ public class Warzone {
 			}
 		}
 		if (this.getWarzoneConfig().getBoolean(WarzoneConfig.BLOCKHEADS)) {
-			playerInv.setHelmet(team.getKind().getBlockHead());
-		} else if (!helmetIsInLoadout) {
 			ItemStack helmet = new ItemStack(Material.LEATHER_HELMET);
 			LeatherArmorMeta meta = (LeatherArmorMeta) helmet.getItemMeta();
 			meta.setColor(team.getKind().getBukkitColor());