From 12b5f8350ffd5705fb5459237729c48b289d83c6 Mon Sep 17 00:00:00 2001 From: cmastudios Date: Tue, 10 Sep 2013 18:11:21 -0500 Subject: [PATCH] Handle deaths after they have been counted and rewarded. This prevents a problem where players could be rewarded after the game ends --- .../com/tommytony/war/event/WarEntityListener.java | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/war/src/main/java/com/tommytony/war/event/WarEntityListener.java b/war/src/main/java/com/tommytony/war/event/WarEntityListener.java index d2d4400..28e3930 100644 --- a/war/src/main/java/com/tommytony/war/event/WarEntityListener.java +++ b/war/src/main/java/com/tommytony/war/event/WarEntityListener.java @@ -171,15 +171,6 @@ public class WarEntityListener implements Listener { team.teamcast(killMessage); } } - // this is just an idea for further discussion -// if (defenderWarzone.getKillCount(d.getName()) >= 5) { -// defenderTeam.addPoint(); -// for (Team team : defenderWarzone.getTeams()) { -// team.teamcast(defenderTeam.getKind().getColor() + d.getName() + ChatColor.WHITE + " killed " + attackerTeam.getKind().getColor() + a.getName() -// + ChatColor.WHITE + " and scored an extra point for their team."); -// } -// } - defenderWarzone.handleDeath(d); if (attacker.getEntityId() != defender.getEntityId()) { defenderWarzone.addKillCount(a.getName(), 1); defenderWarzone.addKillDeathRecord(a, 1, 0); @@ -191,7 +182,7 @@ public class WarEntityListener implements Listener { War.war.getKillstreakReward().rewardPlayer(a, defenderWarzone.getKillCount(a.getName())); } } - + defenderWarzone.handleDeath(d); if (!defenderWarzone.getWarzoneConfig().getBoolean(WarzoneConfig.REALDEATHS)) { // fast respawn, don't really die event.setCancelled(true);