Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-02-05 07:01:45 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
feildmaster 2012-03-26 15:23:31 -05:00 committed by Warren Loo
parent 9d0ea52021
commit bdccfd29ec
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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