2018-08-06 01:46:43 +02:00
|
|
|
From afb4de1022909548147905e64811aeff915d6b3a 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
|
2018-07-23 10:39:55 +02:00
|
|
|
index 4e132eabb1..c28b72222e 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
|
|
|
}
|
|
|
|
|
|
|
|
protected boolean isTypeNotPersistent() {
|
|
|
|
- return !this.isTamed() /*&& this.ticksLived > 2400*/; // CraftBukkit
|
|
|
|
+ return !this.isTamed() && !this.hasCustomName() && !this.isLeashed() /*&& this.ticksLived > 2400*/; // CraftBukkit (ticks lived) - Paper (honor name and leash)
|
|
|
|
}
|
|
|
|
|
|
|
|
protected void initAttributes() {
|
|
|
|
--
|
2018-07-04 09:55:24 +02:00
|
|
|
2.18.0
|
2017-08-08 05:26:44 +02:00
|
|
|
|