diff options
author | Thinkofdeath <thinkofdeath@spigotmc.org> | 2015-02-26 22:41:06 +0000 |
---|---|---|
committer | Thinkofdeath <thinkofdeath@spigotmc.org> | 2015-03-04 09:48:58 +0000 |
commit | d8a9c7be4227b2243968b63ab7cc7a00098c93ad (patch) | |
tree | 554a08a5f23ffa5dd66a28247d6358515b1ffb7a /nms-patches/EntityAnimal.patch | |
parent | 33d5de312e9fcc8aec3fc53136658cb6920562aa (diff) | |
download | craftbukkit-d8a9c7be4227b2243968b63ab7cc7a00098c93ad.tar craftbukkit-d8a9c7be4227b2243968b63ab7cc7a00098c93ad.tar.gz craftbukkit-d8a9c7be4227b2243968b63ab7cc7a00098c93ad.tar.lz craftbukkit-d8a9c7be4227b2243968b63ab7cc7a00098c93ad.tar.xz craftbukkit-d8a9c7be4227b2243968b63ab7cc7a00098c93ad.zip |
Update to Minecraft 1.8.3
Diffstat (limited to 'nms-patches/EntityAnimal.patch')
-rw-r--r-- | nms-patches/EntityAnimal.patch | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/nms-patches/EntityAnimal.patch b/nms-patches/EntityAnimal.patch index 4b90e467..a1280c4f 100644 --- a/nms-patches/EntityAnimal.patch +++ b/nms-patches/EntityAnimal.patch @@ -1,6 +1,6 @@ ---- ../work/decompile-8eb82bde/net/minecraft/server/EntityAnimal.java 2014-12-10 18:34:37.064492562 +0000 -+++ src/main/java/net/minecraft/server/EntityAnimal.java 2014-12-10 18:31:55.772494313 +0000 -@@ -38,14 +38,19 @@ +--- /home/matt/mc-dev-private//net/minecraft/server/EntityAnimal.java 2015-02-26 22:40:22.471608141 +0000 ++++ src/main/java/net/minecraft/server/EntityAnimal.java 2015-02-26 22:40:22.471608141 +0000 +@@ -38,6 +38,9 @@ } @@ -10,10 +10,7 @@ public boolean damageEntity(DamageSource damagesource, float f) { if (this.isInvulnerable(damagesource)) { return false; - } else { -- this.bk = 0; -+ //CraftBukkit - moved into EntityLiving.d(DamageSource, float) -+ //this.bk = 0; +@@ -46,6 +49,7 @@ return super.damageEntity(damagesource, f); } } |