mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-19 18:31:18 +02:00
24 lines
939 B
Diff
24 lines
939 B
Diff
|
--- ../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;
|