From 8899f2d4c4a929d4f6b8e1982456d507027b0589 Mon Sep 17 00:00:00 2001 From: nossr50 Date: Thu, 2 Dec 2010 19:09:35 -0800 Subject: [PATCH] Revisions to onDamage v2 --- vMinecraftListener.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/vMinecraftListener.java b/vMinecraftListener.java index e96c0ed67..f6ddd5b28 100644 --- a/vMinecraftListener.java +++ b/vMinecraftListener.java @@ -109,9 +109,7 @@ public class vMinecraftListener extends PluginListener { vMinecraftUsers.addUser(player); } public boolean onDamage(PluginLoader.DamageType type, BaseEntity attacker, BaseEntity defender, int amount) { - Player player; - for(Player p : etc.getServer().getPlayerList()){ - if (p.getId() == defender.getId() && p.getHealth() < 1){ + if(defender.isPlayer()){ if(type == type.CREEPER_EXPLOSION){ damagetype = 1; //Creeper } else if(type == type.FALL){ @@ -124,8 +122,7 @@ public class vMinecraftListener extends PluginListener { damagetype = 5; //Lava } else if (type == type.WATER){ damagetype = 6; //Water - } - } + } } return false; }