diff options
| author | feildmaster <admin@feildmaster.com> | 2012-03-26 15:23:31 -0500 |
|---|---|---|
| committer | Warren Loo <evilseph@gmail.com> | 2012-03-26 16:32:42 -0400 |
| commit | bdccfd29ec0c6e59e321e474c0b46c790669d343 (patch) | |
| tree | 5d6778293522e178b6eefbc6b6a28bbb22991b86 /src/main/java/net/minecraft/server | |
| parent | 9d0ea520213227a39e346571c7c502f7a3a241c7 (diff) | |
| download | craftbukkit-bdccfd29ec0c6e59e321e474c0b46c790669d343.tar craftbukkit-bdccfd29ec0c6e59e321e474c0b46c790669d343.tar.gz craftbukkit-bdccfd29ec0c6e59e321e474c0b46c790669d343.tar.lz craftbukkit-bdccfd29ec0c6e59e321e474c0b46c790669d343.tar.xz craftbukkit-bdccfd29ec0c6e59e321e474c0b46c790669d343.zip | |
[Bleeding] Stop filtering out 0 damage for Humans. Fixes BUKKIT-1348
Diffstat (limited to 'src/main/java/net/minecraft/server')
| -rw-r--r-- | src/main/java/net/minecraft/server/EntityHuman.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java index 00cfa4f3..5c29744a 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -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 } } } |