mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-17 17:31:06 +02:00
23 lines
911 B
Diff
23 lines
911 B
Diff
|
From 3fa0d4dcc51608fefd241573f1184466504f9194 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 af1ff9518..1713bead2 100644
|
||
|
--- a/src/main/java/net/minecraft/server/EntityOcelot.java
|
||
|
+++ b/src/main/java/net/minecraft/server/EntityOcelot.java
|
||
|
@@ -81,7 +81,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.21.0
|
||
|
|