From 0f0841386d75312d405d38b38228a626439523e1 Mon Sep 17 00:00:00 2001 From: sigonasr2 Date: Sun, 17 Nov 2013 01:06:33 -0700 Subject: [PATCH] Continued work on Fatal Survivor. --- BankEconomyMod/src/me/kaZep/Base/PlayerListener.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/BankEconomyMod/src/me/kaZep/Base/PlayerListener.java b/BankEconomyMod/src/me/kaZep/Base/PlayerListener.java index 47219a2..116fa40 100644 --- a/BankEconomyMod/src/me/kaZep/Base/PlayerListener.java +++ b/BankEconomyMod/src/me/kaZep/Base/PlayerListener.java @@ -6600,7 +6600,7 @@ public ItemStack getGoodie() { final EntityDamageEvent f = e; if (e.getEntity().getType()==EntityType.PLAYER) { final Player p = (Player)e.getEntity(); - Bukkit.broadcastMessage("Player Damaged: "+p.getHealth()+" HP, -"+p.getLastDamageCause().getDamage()+" damage from "+p.getLastDamageCause().getEntity().getType()); + //Bukkit.broadcastMessage("Player Damaged: "+p.getHealth()+" HP, -"+p.getLastDamageCause().getDamage()+" damage"); if (e.getCause()==DamageCause.ENTITY_EXPLOSION || e.getCause()==DamageCause.BLOCK_EXPLOSION) { e.setDamage(e.getDamage()*2); } @@ -11319,6 +11319,7 @@ public void onEntityExpode(ExplosionPrimeEvent e) { public void onPlayerDeath(PlayerDeathEvent e) { //Delay this for 5 ticks. See if Fatal Survivor kicked in in time. (Or you got healed). final PlayerDeathEvent e2 = e; + e2.getEntity().setHealth(1); Bukkit.broadcastMessage("Player Death: "+e2.getEntity().getHealth()+" HP, Last Damage: -"+e2.getEntity().getLastDamage()+" from "+e2.getEntity().getLastDamageCause()); final Main plugin = this.plugin; Bukkit.getScheduler().scheduleSyncDelayedTask(this.plugin, new Runnable() {