mirror of
https://github.com/PaperMC/Paper.git
synced 2024-07-01 17:24:53 +02:00
23 lines
934 B
Diff
23 lines
934 B
Diff
From fff9aa7f3454f4c830481b7c206ec73af4ccf3d9 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 5a76821e..858bbef5 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityOcelot.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityOcelot.java
|
|
@@ -58,7 +58,7 @@ public class EntityOcelot extends EntityTameableAnimal {
|
|
}
|
|
|
|
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() {
|
|
--
|
|
2.11.0
|
|
|