diff options
| author | Feildmaster <admin@feildmaster.com> | 2012-02-09 17:18:50 -0600 |
|---|---|---|
| committer | EvilSeph <evilseph@gmail.com> | 2012-02-09 20:30:02 -0500 |
| commit | 80bae060c6823321d039ebe3dcaa8ade567b8b9c (patch) | |
| tree | 27871523c92d1d792c87cc0c03ffefc2189d0de7 /src/main | |
| parent | fa6fd24f2a83c32c160dd8e88015b00d36a98547 (diff) | |
| download | craftbukkit-80bae060c6823321d039ebe3dcaa8ade567b8b9c.tar craftbukkit-80bae060c6823321d039ebe3dcaa8ade567b8b9c.tar.gz craftbukkit-80bae060c6823321d039ebe3dcaa8ade567b8b9c.tar.lz craftbukkit-80bae060c6823321d039ebe3dcaa8ade567b8b9c.tar.xz craftbukkit-80bae060c6823321d039ebe3dcaa8ade567b8b9c.zip | |
[Bleeding] Use event values for damage.
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/net/minecraft/server/EntityEnderPearl.java | 2 | ||||
| -rw-r--r-- | src/main/java/net/minecraft/server/EntityWolf.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/net/minecraft/server/EntityEnderPearl.java b/src/main/java/net/minecraft/server/EntityEnderPearl.java index 0e883728..57b4e2f3 100644 --- a/src/main/java/net/minecraft/server/EntityEnderPearl.java +++ b/src/main/java/net/minecraft/server/EntityEnderPearl.java @@ -61,7 +61,7 @@ public class EntityEnderPearl extends EntityProjectile { if (!damageEvent.isCancelled()) { org.bukkit.entity.Player bPlayer = Bukkit.getPlayerExact(((EntityPlayer) this.shooter).name); ((CraftPlayer) bPlayer).getHandle().invulnerableTicks = -1; // Remove spawning invulnerability. - ((CraftPlayer) bPlayer).getHandle().damageEntity(DamageSource.FALL, 5); // Damage the new player instead of the old + ((CraftPlayer) bPlayer).getHandle().damageEntity(DamageSource.FALL, damageEvent.getDamage()); // Damage the new player instead of the old } } // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/EntityWolf.java b/src/main/java/net/minecraft/server/EntityWolf.java index 3e934a80..2ce33461 100644 --- a/src/main/java/net/minecraft/server/EntityWolf.java +++ b/src/main/java/net/minecraft/server/EntityWolf.java @@ -347,9 +347,9 @@ public class EntityWolf extends EntityAnimal { if (event.isCancelled()) { return; } - // CraftBukkit end - entity.damageEntity(DamageSource.mobAttack(this), b0); + entity.damageEntity(DamageSource.mobAttack(this), event.getDamage()); + // CraftBukkit end } } |