diff options
Diffstat (limited to 'nms-patches/EntityHuman.patch')
| -rw-r--r-- | nms-patches/EntityHuman.patch | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/nms-patches/EntityHuman.patch b/nms-patches/EntityHuman.patch index 19bc4b5f..fce5fd79 100644 --- a/nms-patches/EntityHuman.patch +++ b/nms-patches/EntityHuman.patch @@ -274,20 +274,20 @@ } } -@@ -945,8 +1043,11 @@ +@@ -946,8 +1044,11 @@ EntityLiving entityliving = (EntityLiving) iterator.next(); if (entityliving != this && entityliving != entity && !this.r(entityliving) && this.h(entityliving) < 9.0D) { + // CraftBukkit start - Only apply knockback if the damage hits -+ if (entityliving.damageEntity(DamageSource.playerAttack(this), 1.0F)) { ++ if (entityliving.damageEntity(DamageSource.playerAttack(this), f4)) { entityliving.a(this, 0.4F, (double) MathHelper.sin(this.yaw * 0.017453292F), (double) (-MathHelper.cos(this.yaw * 0.017453292F))); -- entityliving.damageEntity(DamageSource.playerAttack(this), 1.0F); +- entityliving.damageEntity(DamageSource.playerAttack(this), f4); + } + // CraftBukkit end } } -@@ -955,11 +1056,28 @@ +@@ -956,11 +1057,28 @@ } if (entity instanceof EntityPlayer && entity.velocityChanged) { @@ -316,9 +316,9 @@ } if (flag2) { -@@ -1012,7 +1130,14 @@ +@@ -1013,7 +1131,14 @@ - this.a(StatisticList.y, Math.round(f4 * 10.0F)); + this.a(StatisticList.y, Math.round(f5 * 10.0F)); if (j > 0) { - entity.setOnFire(j * 4); + // CraftBukkit start - Call a combust event when somebody hits with a fire enchanted item @@ -331,8 +331,8 @@ + // CraftBukkit end } - if (this.world instanceof WorldServer && f4 > 2.0F) { -@@ -1028,6 +1153,11 @@ + if (this.world instanceof WorldServer && f5 > 2.0F) { +@@ -1029,6 +1154,11 @@ if (flag4) { entity.extinguish(); } @@ -344,7 +344,7 @@ } } -@@ -1118,6 +1248,20 @@ +@@ -1119,6 +1249,20 @@ this.stopRiding(); } @@ -365,7 +365,7 @@ this.setSize(0.2F, 0.2F); if (this.world.isLoaded(blockposition)) { float f = 0.5F + (float) enumdirection.getAdjacentX() * 0.4F; -@@ -1177,6 +1321,23 @@ +@@ -1178,6 +1322,23 @@ this.world.everyoneSleeping(); } @@ -389,7 +389,7 @@ this.sleepTicks = flag ? 0 : 100; if (flag2) { this.setRespawnPosition(this.bedPosition, false); -@@ -1228,9 +1389,11 @@ +@@ -1229,9 +1390,11 @@ if (blockposition != null) { this.e = blockposition; this.f = flag; |