OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-11 09:23:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixed drowning damage event.

Browse source
This commit is contained in:
sk89q 2011-01-30 01:26:45 -08:00
parent d92376e106
commit d0cd8c6cc7
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/main/java/net/minecraft/server/EntityLiving.java
View file

@ -167,7 +167,19 @@ public abstract class EntityLiving extends Entity {
this.l.a("bubble", p + (double) f1, q + (double) f2, r + (double) f3, this.s, t, u);
}
a(((Entity) (null)), 2);
// CraftBukkit start
CraftServer server = ((WorldServer) l).getServer();
org.bukkit.entity.Entity damagee = this.getBukkitEntity();
DamageCause damageType = EntityDamageEvent.DamageCause.DROWNING;
int damageDone = 2;
EntityDamageEvent ede = new EntityDamageEvent(damagee, damageType, damageDone);
server.getPluginManager().callEvent(ede);
if (!ede.isCancelled()){
a(((Entity) (null)), ede.getDamage());
}
// CraftBukkit end
}
Z = 0;
} else {