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. By: FearThe1337 <admin@fearthe1337.com>
This commit is contained in:
23
paper-server/nms-patches/EntityAnimal.patch
Normal file
23
paper-server/nms-patches/EntityAnimal.patch
Normal file
@@ -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;
|
||||
Reference in New Issue
Block a user