mirror of
https://github.com/PaperMC/Paper.git
synced 2025-08-11 18:22:08 -07:00
Update to Minecraft 1.9
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
--- a/net/minecraft/server/EntityOcelot.java
|
||||
+++ b/net/minecraft/server/EntityOcelot.java
|
||||
@@ -51,7 +51,7 @@
|
||||
@@ -54,7 +54,7 @@
|
||||
}
|
||||
|
||||
protected boolean isTypeNotPersistent() {
|
||||
@@ -9,7 +9,7 @@
|
||||
}
|
||||
|
||||
protected void initAttributes() {
|
||||
@@ -96,6 +96,9 @@
|
||||
@@ -95,6 +95,9 @@
|
||||
return entity.damageEntity(DamageSource.mobAttack(this), 3.0F);
|
||||
}
|
||||
|
||||
@@ -19,15 +19,15 @@
|
||||
public boolean damageEntity(DamageSource damagesource, float f) {
|
||||
if (this.isInvulnerable(damagesource)) {
|
||||
return false;
|
||||
@@ -104,6 +107,7 @@
|
||||
@@ -106,6 +109,7 @@
|
||||
return super.damageEntity(damagesource, f);
|
||||
}
|
||||
}
|
||||
+ // CraftBukkit end */
|
||||
|
||||
protected void dropDeathLoot(boolean flag, int i) {}
|
||||
|
||||
@@ -124,7 +128,8 @@
|
||||
protected MinecraftKey J() {
|
||||
return LootTables.J;
|
||||
@@ -122,7 +126,8 @@
|
||||
}
|
||||
|
||||
if (!this.world.isClientSide) {
|
||||
@@ -36,8 +36,8 @@
|
||||
+ if (this.random.nextInt(3) == 0 && !org.bukkit.craftbukkit.event.CraftEventFactory.callEntityTameEvent(this, entityhuman).isCancelled()) {
|
||||
this.setTamed(true);
|
||||
this.setCatType(1 + this.world.random.nextInt(3));
|
||||
this.setOwnerUUID(entityhuman.getUniqueID().toString());
|
||||
@@ -231,7 +236,7 @@
|
||||
this.setOwnerUUID(entityhuman.getUniqueID());
|
||||
@@ -230,7 +235,7 @@
|
||||
|
||||
entityocelot.setPositionRotation(this.locX, this.locY, this.locZ, this.yaw, 0.0F);
|
||||
entityocelot.setAgeRaw(-24000);
|
||||
|
Reference in New Issue
Block a user