Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-29 19:51:30 +01:00
Code Issues Projects Releases Wiki Activity

Fixed entity damaged by entity event firing twice when players damage each other. Thanks Xolsom!

Browse Source
This commit is contained in:
EvilSeph 2011-06-07 00:57:36 -04:00
parent 8b3f90f232
commit ef9295707a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/net/minecraft/server/EntityHuman.java
View File

@ -516,8 +516,8 @@ public abstract class EntityHuman extends EntityLiving {
++i;
}
// CraftBukkit start
if (entity instanceof EntityLiving) {
// CraftBukkit start - Don't call the event when the entity is human since it will be called with damageEntity
if (entity instanceof EntityLiving && !(entity instanceof EntityHuman)) {
CraftServer server = ((WorldServer) this.world).getServer();
org.bukkit.entity.Entity damager = this.getBukkitEntity();
org.bukkit.entity.Entity damagee = (entity == null) ? null : entity.getBukkitEntity();