spigot-mirror/craftbukkit
1
0
Fork 0
mirror of https://hub.spigotmc.org/stash/scm/spigot/craftbukkit.git synced 2025-08-21 05:44:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[Bleeding] Use event values for damage.

Browse source
This commit is contained in:
Feildmaster 2012-02-09 17:18:50 -06:00 • committed by EvilSeph
parent fa6fd24f2a
commit 80bae060c6
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/net/minecraft/server/EntityEnderPearl.java
View file

@ -61,7 +61,7 @@ public class EntityEnderPearl extends EntityProjectile {
if (!damageEvent.isCancelled()) { if (!damageEvent.isCancelled()) {
org.bukkit.entity.Player bPlayer = Bukkit.getPlayerExact(((EntityPlayer) this.shooter).name); org.bukkit.entity.Player bPlayer = Bukkit.getPlayerExact(((EntityPlayer) this.shooter).name);
((CraftPlayer) bPlayer).getHandle().invulnerableTicks = -1; // Remove spawning invulnerability. ((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 // CraftBukkit end

4
src/main/java/net/minecraft/server/EntityWolf.java
View file

@ -347,9 +347,9 @@ public class EntityWolf extends EntityAnimal {
if (event.isCancelled()) { if (event.isCancelled()) {
return; return;
} }
// CraftBukkit end
entity.damageEntity(DamageSource.mobAttack(this), b0); entity.damageEntity(DamageSource.mobAttack(this), event.getDamage());
// CraftBukkit end
} }
} }