summaryrefslogtreecommitdiffstats
path: root/nms-patches
diff options
context:
space:
mode:
authorThinkofname <thinkofdeath@spigotmc.org>2016-04-20 13:01:20 +0100
committerThinkofname <thinkofdeath@spigotmc.org>2016-04-20 13:01:20 +0100
commitb103841da3263c7bce42ec5e4331ebc821bfd65e (patch)
tree4cb6681a86845bc526c1531f615c32e65e8797b1 /nms-patches
parent199b11bdd076cdf0cfdc66dbfa1064e57c4f2484 (diff)
downloadcraftbukkit-b103841da3263c7bce42ec5e4331ebc821bfd65e.tar
craftbukkit-b103841da3263c7bce42ec5e4331ebc821bfd65e.tar.gz
craftbukkit-b103841da3263c7bce42ec5e4331ebc821bfd65e.tar.lz
craftbukkit-b103841da3263c7bce42ec5e4331ebc821bfd65e.tar.xz
craftbukkit-b103841da3263c7bce42ec5e4331ebc821bfd65e.zip
SPIGOT-2171: Fix shield blocking sounds
Diffstat (limited to 'nms-patches')
-rw-r--r--nms-patches/EntityLiving.patch3
1 files changed, 2 insertions, 1 deletions
diff --git a/nms-patches/EntityLiving.patch b/nms-patches/EntityLiving.patch
index c03c0470..2d5dbe3e 100644
--- a/nms-patches/EntityLiving.patch
+++ b/nms-patches/EntityLiving.patch
@@ -266,7 +266,8 @@
f *= 0.75F;
}
- boolean flag = false;
+- boolean flag = false;
++ boolean flag = f > 0.0F && this.d(damagesource); // Copied from below
- if (f > 0.0F && this.d(damagesource)) {
+ // CraftBukkit - Moved into damageEntity0(DamageSource, float)