Paper/Spigot-Server-Patches/0172-Ocelot-despawns-should-honor-nametags-and-leash.patch

From f7877d26120925dbabe0977916bc73476426ac68 Mon Sep 17 00:00:00 2001
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
index f50efe782a..0f1c259595 100644
--- a/src/main/java/net/minecraft/server/EntityOcelot.java
+++ b/src/main/java/net/minecraft/server/EntityOcelot.java
@@ -82,7 +82,7 @@ public class EntityOcelot extends EntityAnimal {
 
     @Override
     public boolean isTypeNotPersistent(double d0) {
-        return !this.isTrusting() /*&& this.ticksLived > 2400*/; // CraftBukkit
+        return !this.isTrusting() && !this.hasCustomName() && !this.isLeashed() /*&& this.ticksLived > 2400*/; // CraftBukkit // Paper - honor name and leash
     }
 
     @Override
-- 
2.22.0