From 6f21d3ca8fb02001dd10f49019cfb05ed914a873 Mon Sep 17 00:00:00 2001 From: t00thpick1 Date: Thu, 19 Jun 2014 14:38:45 -0400 Subject: [Bleeding] Implement new damage api. Fixes BUKKIT-5326, BUKKIT-3878. This commit centralizes event handling to where damage is actually applied to the entity to avoid bugs that have resulted from nodamageticks, modifications to damage after the event has been called, and similar mishaps. This also implements new API for getting and setting of modifications made to the damage amount actually applied to the entity. This is done by storing the change in the damage amount as each modifier is applied by vanilla code. The method that actually damages the armor worn by an entity has been relocated beneath the event called as to not apply durability loss when the event has been cancelled. --- src/main/java/net/minecraft/server/EntityEnderPearl.java | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'src/main/java/net/minecraft/server/EntityEnderPearl.java') diff --git a/src/main/java/net/minecraft/server/EntityEnderPearl.java b/src/main/java/net/minecraft/server/EntityEnderPearl.java index 9e4526e3..63906678 100644 --- a/src/main/java/net/minecraft/server/EntityEnderPearl.java +++ b/src/main/java/net/minecraft/server/EntityEnderPearl.java @@ -2,7 +2,7 @@ package net.minecraft.server; // CraftBukkit start import org.bukkit.Bukkit; -import org.bukkit.event.entity.EntityDamageByEntityEvent; +import org.bukkit.craftbukkit.event.CraftEventFactory; import org.bukkit.event.player.PlayerTeleportEvent; // CraftBukkit end @@ -42,15 +42,9 @@ public class EntityEnderPearl extends EntityProjectile { if (!teleEvent.isCancelled() && !entityplayer.playerConnection.isDisconnected()) { entityplayer.playerConnection.teleport(teleEvent.getTo()); this.getShooter().fallDistance = 0.0F; - - EntityDamageByEntityEvent damageEvent = new EntityDamageByEntityEvent(this.getBukkitEntity(), player, EntityDamageByEntityEvent.DamageCause.FALL, 5.0D); - Bukkit.getPluginManager().callEvent(damageEvent); - - if (!damageEvent.isCancelled() && !entityplayer.playerConnection.isDisconnected()) { - entityplayer.invulnerableTicks = -1; // Remove spawning invulnerability - player.setLastDamageCause(damageEvent); - entityplayer.damageEntity(DamageSource.FALL, (float) damageEvent.getDamage()); - } + CraftEventFactory.entityDamage = this; + this.getShooter().damageEntity(DamageSource.FALL, 5.0F); + CraftEventFactory.entityDamage = null; } // CraftBukkit end } -- cgit v1.2.3