mirror of
https://github.com/PaperMC/Paper.git
synced 2024-07-08 04:34:56 +02:00
23 lines
913 B
Diff
23 lines
913 B
Diff
From 2e0688b36f97187cb8f065e164e5fd0fa9059935 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 a6b15efd5d..edc5f696c0 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
|
|
|