Upstream/war
1
0
Fork 0
mirror of https://github.com/taoneill/war.git synced 2024-11-27 12:46:11 +01:00
Code Issues Projects Releases Wiki Activity

Now checking if War is laoded in entity_death.

Browse Source
This commit is contained in:
taoneill 2011-12-20 02:34:39 -05:00
parent b057cac73d
commit f7e0b73465
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
war/src/main/java/bukkit/tommytony/war/WarEntityListener.java
View File

@ -440,16 +440,18 @@ public class WarEntityListener extends EntityListener {
@Override
public void onEntityDeath(EntityDeathEvent event) {
if (event.getEntity() instanceof Player) {
Player player = (Player) event.getEntity();
Warzone zone = Warzone.getZoneByPlayerName(player.getName());
if (zone != null) {
event.getDrops().clear();
zone.handleDeath(player);
if (!War.war.isLoaded() || !(event.getEntity() instanceof Player)) {
return;
}
for (Team team : zone.getTeams()) {
team.teamcast(player.getName() + " died");
}
Player player = (Player) event.getEntity();
Warzone zone = Warzone.getZoneByPlayerName(player.getName());
if (zone != null) {
event.getDrops().clear();
zone.handleDeath(player);
for (Team team : zone.getTeams()) {
team.teamcast(player.getName() + " died");
}
}
}