diff options
| author | md_5 <git@md-5.net> | 2016-05-10 21:47:39 +1000 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2016-05-10 21:47:39 +1000 |
| commit | c5e9a169fa564f3b8119b6666f8df59d5a9b45c3 (patch) | |
| tree | 9f3b1ce732f0082b71512b1dddb7abb35526226e /nms-patches/EntityOcelot.patch | |
| parent | 4cb32587ac1ff543b2efa9498f8d0d358cb90c12 (diff) | |
| download | craftbukkit-c5e9a169fa564f3b8119b6666f8df59d5a9b45c3.tar craftbukkit-c5e9a169fa564f3b8119b6666f8df59d5a9b45c3.tar.gz craftbukkit-c5e9a169fa564f3b8119b6666f8df59d5a9b45c3.tar.lz craftbukkit-c5e9a169fa564f3b8119b6666f8df59d5a9b45c3.tar.xz craftbukkit-c5e9a169fa564f3b8119b6666f8df59d5a9b45c3.zip | |
Minecraft 1.9.4
Diffstat (limited to 'nms-patches/EntityOcelot.patch')
| -rw-r--r-- | nms-patches/EntityOcelot.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/nms-patches/EntityOcelot.patch b/nms-patches/EntityOcelot.patch index 96d329f5..69c08b9e 100644 --- a/nms-patches/EntityOcelot.patch +++ b/nms-patches/EntityOcelot.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/server/EntityOcelot.java +++ b/net/minecraft/server/EntityOcelot.java -@@ -54,7 +54,7 @@ +@@ -55,7 +55,7 @@ } protected boolean isTypeNotPersistent() { @@ -9,7 +9,7 @@ } protected void initAttributes() { -@@ -95,6 +95,9 @@ +@@ -97,6 +97,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; -@@ -106,6 +109,7 @@ +@@ -108,6 +111,7 @@ return super.damageEntity(damagesource, f); } } + // CraftBukkit end */ + @Nullable protected MinecraftKey J() { - return LootTables.K; -@@ -122,7 +126,8 @@ +@@ -125,7 +129,8 @@ } if (!this.world.isClientSide) { @@ -37,7 +37,7 @@ this.setTamed(true); this.setCatType(1 + this.world.random.nextInt(3)); this.setOwnerUUID(entityhuman.getUniqueID()); -@@ -230,7 +235,7 @@ +@@ -234,7 +239,7 @@ entityocelot.setPositionRotation(this.locX, this.locY, this.locZ, this.yaw, 0.0F); entityocelot.setAgeRaw(-24000); |