Archiviert
13
0

[Bleeding] Stop filtering out 0 damage for Humans. Fixes BUKKIT-1348

Dieser Commit ist enthalten in:
feildmaster 2012-03-26 15:23:31 -05:00 committet von Warren Loo
Ursprung 9d0ea52021
Commit bdccfd29ec

Datei anzeigen

@ -566,7 +566,7 @@ public abstract class EntityHuman extends EntityLiving {
if (entity instanceof EntityMonster || entity instanceof EntityArrow) {
if (this.world.difficulty == 0) {
i = 0;
return false; // CraftBukkit - i = 0 -> return false
}
if (this.world.difficulty == 1) {
@ -577,10 +577,10 @@ public abstract class EntityHuman extends EntityLiving {
i = i * 3 / 2;
}
}
/* CraftBukkit start - Don't filter out 0 damage
if (i == 0) {
return false;
} else {
} else { CraftBukkit end */
Entity entity1 = entity;
if (entity instanceof EntityArrow && ((EntityArrow) entity).shooter != null) {
@ -593,7 +593,7 @@ public abstract class EntityHuman extends EntityLiving {
this.a(StatisticList.x, i);
return super.damageEntity(damagesource, i);
}
//} // CraftBukkit
}
}
}