diff options
author | FearThe1337 <admin@fearthe1337.com> | 2014-12-09 15:40:38 +0100 |
---|---|---|
committer | Thinkofdeath <thinkofdeath@spigotmc.org> | 2014-12-10 18:35:55 +0000 |
commit | e24569a9ed3e65942c0de667d2f4b66fc9dcec82 (patch) | |
tree | 88e0baeb4dbd5980ff5921ff680af1883f9f5bb5 /nms-patches/EntityAnimal.patch | |
parent | 0af8ea10d80db5e6ed1e49fdb432a820ac4681e6 (diff) | |
download | craftbukkit-e24569a9ed3e65942c0de667d2f4b66fc9dcec82.tar craftbukkit-e24569a9ed3e65942c0de667d2f4b66fc9dcec82.tar.gz craftbukkit-e24569a9ed3e65942c0de667d2f4b66fc9dcec82.tar.lz craftbukkit-e24569a9ed3e65942c0de667d2f4b66fc9dcec82.tar.xz craftbukkit-e24569a9ed3e65942c0de667d2f4b66fc9dcec82.zip |
SPIGOT-143: Fix various animal stuff not being canceled by damageEntity.
Fixes wolves and ocelots standing up when the damag event is being canceled.
Also stops breeding mode reset by the same event.
Diffstat (limited to 'nms-patches/EntityAnimal.patch')
-rw-r--r-- | nms-patches/EntityAnimal.patch | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/nms-patches/EntityAnimal.patch b/nms-patches/EntityAnimal.patch new file mode 100644 index 00000000..4b90e467 --- /dev/null +++ b/nms-patches/EntityAnimal.patch @@ -0,0 +1,23 @@ +--- ../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 @@ + + } + ++ /* CraftBukkit start ++ // Function disabled as it has no special function anymore after ++ // setSitting is disabled. + 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; + return super.damageEntity(damagesource, f); + } + } ++ // CraftBukkit end */ + + public float a(BlockPosition blockposition) { + return this.world.getType(blockposition.down()).getBlock() == Blocks.GRASS ? 10.0F : this.world.o(blockposition) - 0.5F; |