mirror of
https://github.com/PaperMC/Paper.git
synced 2025-08-08 16:12:18 -07:00
Update to Minecraft 1.12-pre2
This commit is contained in:
@@ -1,14 +1,14 @@
|
||||
--- a/net/minecraft/server/EntityAnimal.java
|
||||
+++ b/net/minecraft/server/EntityAnimal.java
|
||||
@@ -5,6 +5,7 @@
|
||||
protected Block bz;
|
||||
private int bw;
|
||||
private EntityHuman bx;
|
||||
@@ -8,6 +8,7 @@
|
||||
protected Block bA;
|
||||
private int bx;
|
||||
private UUID by;
|
||||
+ public ItemStack breedItem; // CraftBukkit - Add breedItem variable
|
||||
|
||||
public EntityAnimal(World world) {
|
||||
super(world);
|
||||
@@ -38,6 +39,9 @@
|
||||
@@ -41,6 +42,9 @@
|
||||
|
||||
}
|
||||
|
||||
@@ -18,19 +18,19 @@
|
||||
public boolean damageEntity(DamageSource damagesource, float f) {
|
||||
if (this.isInvulnerable(damagesource)) {
|
||||
return false;
|
||||
@@ -46,6 +50,7 @@
|
||||
@@ -49,6 +53,7 @@
|
||||
return super.damageEntity(damagesource, f);
|
||||
}
|
||||
}
|
||||
+ // CraftBukkit end */
|
||||
|
||||
public float a(BlockPosition blockposition) {
|
||||
return this.world.getType(blockposition.down()).getBlock() == this.bz ? 10.0F : this.world.n(blockposition) - 0.5F;
|
||||
@@ -120,6 +125,7 @@
|
||||
public void c(EntityHuman entityhuman) {
|
||||
this.bw = 600;
|
||||
this.bx = entityhuman;
|
||||
return this.world.getType(blockposition.down()).getBlock() == this.bA ? 10.0F : this.world.n(blockposition) - 0.5F;
|
||||
@@ -130,6 +135,7 @@
|
||||
if (entityhuman != null) {
|
||||
this.by = entityhuman.getUniqueID();
|
||||
}
|
||||
+ this.breedItem = entityhuman.inventory.getItemInHand(); // CraftBukkit
|
||||
|
||||
this.world.broadcastEntityEffect(this, (byte) 18);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user