Continued work on Fatal Survivor.

anvil_rework
sigonasr2 11 years ago
parent 81477bbc94
commit 0f0841386d
  1. 3
      BankEconomyMod/src/me/kaZep/Base/PlayerListener.java

@ -6600,7 +6600,7 @@ public ItemStack getGoodie() {
final EntityDamageEvent f = e; final EntityDamageEvent f = e;
if (e.getEntity().getType()==EntityType.PLAYER) { if (e.getEntity().getType()==EntityType.PLAYER) {
final Player p = (Player)e.getEntity(); 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) { if (e.getCause()==DamageCause.ENTITY_EXPLOSION || e.getCause()==DamageCause.BLOCK_EXPLOSION) {
e.setDamage(e.getDamage()*2); e.setDamage(e.getDamage()*2);
} }
@ -11319,6 +11319,7 @@ public void onEntityExpode(ExplosionPrimeEvent e) {
public void onPlayerDeath(PlayerDeathEvent e) { public void onPlayerDeath(PlayerDeathEvent e) {
//Delay this for 5 ticks. See if Fatal Survivor kicked in in time. (Or you got healed). //Delay this for 5 ticks. See if Fatal Survivor kicked in in time. (Or you got healed).
final PlayerDeathEvent e2 = e; 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()); Bukkit.broadcastMessage("Player Death: "+e2.getEntity().getHealth()+" HP, Last Damage: -"+e2.getEntity().getLastDamage()+" from "+e2.getEntity().getLastDamageCause());
final Main plugin = this.plugin; final Main plugin = this.plugin;
Bukkit.getScheduler().scheduleSyncDelayedTask(this.plugin, new Runnable() { Bukkit.getScheduler().scheduleSyncDelayedTask(this.plugin, new Runnable() {

Loading…
Cancel
Save