2019-04-22 23:36:14 +02:00
|
|
|
From ad5ce22ff3f19ec60b6b8d096b019cedb7964ebb Mon Sep 17 00:00:00 2001
|
2017-08-08 05:26:44 +02:00
|
|
|
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
|
|
|
Date: Mon, 31 Jul 2017 01:54:40 -0500
|
|
|
|
Subject: [PATCH] Ocelot despawns should honor nametags and leash
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityOcelot.java b/src/main/java/net/minecraft/server/EntityOcelot.java
|
2019-04-22 23:36:14 +02:00
|
|
|
index 47aac5b057..ba074c10c6 100644
|
2017-08-08 05:26:44 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/EntityOcelot.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/EntityOcelot.java
|
2018-07-18 02:08:13 +02:00
|
|
|
@@ -61,7 +61,7 @@ public class EntityOcelot extends EntityTameableAnimal {
|
2017-08-08 05:26:44 +02:00
|
|
|
}
|
|
|
|
|
2018-10-23 01:16:21 +02:00
|
|
|
public boolean isTypeNotPersistent() {
|
2017-08-08 05:26:44 +02:00
|
|
|
- return !this.isTamed() /*&& this.ticksLived > 2400*/; // CraftBukkit
|
2018-10-23 01:16:21 +02:00
|
|
|
+ return !this.isTamed() && !this.hasCustomName() && !this.isLeashed() /*&& this.ticksLived > 2400*/; // CraftBukkit - Paper (honor name and leash)
|
2017-08-08 05:26:44 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
protected void initAttributes() {
|
|
|
|
--
|
2019-03-20 02:46:00 +01:00
|
|
|
2.21.0
|
2017-08-08 05:26:44 +02:00
|
|
|
|