Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-11-16 04:50:05 +01:00
37 Zeilen
1.2 KiB
Diff
37 Zeilen
1.2 KiB
Diff
--- a/net/minecraft/server/EntityAnimal.java
|
|
+++ b/net/minecraft/server/EntityAnimal.java
|
|
@@ -7,6 +7,7 @@
|
|
protected Block bA;
|
|
private int bx;
|
|
private EntityHuman by;
|
|
+ public ItemStack breedItem; // CraftBukkit - Add breedItem variable
|
|
|
|
public EntityAnimal(World world) {
|
|
super(world);
|
|
@@ -40,6 +41,9 @@
|
|
|
|
}
|
|
|
|
+ /* 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;
|
|
@@ -48,6 +52,7 @@
|
|
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.n(blockposition) - 0.5F;
|
|
@@ -120,6 +125,7 @@
|
|
public void c(EntityHuman entityhuman) {
|
|
this.bx = 600;
|
|
this.by = entityhuman;
|
|
+ this.breedItem = entityhuman.inventory.getItemInHand(); // CraftBukkit
|
|
this.world.broadcastEntityEffect(this, (byte) 18);
|
|
}
|
|
|