Closes gh-344. Updated pom for Bukkit 1.1-R1. Fixed compatibility with Heroes and other plugins by introducing new config REALDEATHS. If you turn it on, there no longer fast respawns (i.e. the player actually dies, letting other plugins register the death). Now you can also turn off death messages with DEATHMESSAGES. Fixed bug in inventory checking job.

war/pom.xml

@@ -56,13 +56,13 @@
     <dependency>
       <groupId>org.bukkit</groupId>
       <artifactId>bukkit</artifactId>
-      <version>1.1-R1-SNAPSHOT</version>
+      <version>1.1-R1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
     	<groupId>org.bukkit</groupId>
     	<artifactId>craftbukkit</artifactId>
-    	<version>1.1-R1-SNAPSHOT</version>
+    	<version>1.1-R1</version>
     	<scope>compile</scope>
     </dependency>
     <dependency>

war/src/main/java/com/tommytony/war/Warzone.java

@@ -276,6 +276,9 @@ public class Warzone {
 		}
 
 		this.flagThieves.clear();
+		this.bombThieves.clear();
+		this.cakeThieves.clear();
+		this.reallyDeadFighters.clear();
 
 		// nom drops
 		for(Entity entity : (this.getWorld().getEntities())) {
@@ -804,6 +807,7 @@ public class Warzone {
 				playerWarzone.respawnPlayer(playerTeam, player);
 			} else {
 				// onPlayerRespawn takes care of real deaths
+				//player.setHealth(0);
 				playerWarzone.getReallyDeadFighters().add(player.getName());
 			}
 			
@@ -825,6 +829,7 @@ public class Warzone {
 							}
 						}
 					}
+					
 					t.teamcast("The battle is over. Team " + playerTeam.getName() + " lost: " + player.getName() + " died and there were no lives left in their life pool.");
 
 					if (t.getPlayers().size() != 0 && !t.getTeamConfig().resolveBoolean(TeamConfig.FLAGPOINTSONLY)) {

war/src/main/java/com/tommytony/war/event/WarEntityListener.java

@@ -125,7 +125,9 @@ public class WarEntityListener implements Listener {
 				if (event.getDamage() >= d.getHealth()) {
 					if (defenderWarzone.getReallyDeadFighters().contains(d.getName())) {
 						// don't re-kill a dead person 
-						event.setCancelled(true);
+						if (d.getHealth() != 0) {
+							d.setHealth(0);
+						}
 						return;
 					}
 					
@@ -253,7 +255,9 @@ public class WarEntityListener implements Listener {
 			if (d != null && defenderWarzone != null && event.getDamage() >= d.getHealth()) {
 				if (defenderWarzone.getReallyDeadFighters().contains(d.getName())) {
 					// don't re-kill a dead person 
-					event.setCancelled(true);
+					if (d.getHealth() != 0) {
+						d.setHealth(0);
+					}
 					return;
 				}
 								
@@ -427,8 +431,11 @@ public class WarEntityListener implements Listener {
 			
 			if (zone != null && event.getDamage() >= player.getHealth()) {
 				if (zone.getReallyDeadFighters().contains(player.getName())) {
-					// don't re-kill a dead person 
-					event.setCancelled(true);
+					// don't re-count the death points of an already dead person, make sure they are dead though
+					// (reason for this is that onEntityDamage sometimes fires more than once for one death)
+					if (player.getHealth() != 0) {
+						player.setHealth(0);
+					}
 					return;
 				}
 				
@@ -561,11 +568,11 @@ public class WarEntityListener implements Listener {
 			if (!zone.getWarzoneConfig().getBoolean(WarzoneConfig.REALDEATHS)) {
 				// catch the odd death that gets away from us when usually intercepting and preventing deaths
 				zone.handleDeath(player);
-			}
-			
-			if (zone.getWarzoneConfig().getBoolean(WarzoneConfig.DEATHMESSAGES)) {
-				for (Team team : zone.getTeams()) {
-					team.teamcast(player.getName() + " died");
+				
+				if (zone.getWarzoneConfig().getBoolean(WarzoneConfig.DEATHMESSAGES)) {
+					for (Team team : zone.getTeams()) {
+						team.teamcast(player.getName() + " died");
+					}
 				}
 			}
 		}

war/src/main/java/com/tommytony/war/job/HelmetProtectionTask.java

@@ -51,7 +51,12 @@ public class HelmetProtectionTask implements Runnable {
 								}
 								i++;
 							}
-							playerInv.setItem(playerInv.firstEmpty(), this.createBlockHead(team));
+							
+							int firstEmpty = playerInv.firstEmpty();
+							if (firstEmpty > 0) {
+								playerInv.setItem(firstEmpty, this.createBlockHead(team));	
+							}
+							
 							if (removed > 1) {
 								War.war.badMsg(player, "All that " + team.getName() + " wool must have been heavy!");
 							}