mirror of
https://github.com/PaperMC/Paper.git
synced 2024-07-09 21:24:50 +02:00
71c18fd5c9
This simply provides the base API to create the objects. Further commits will come that adds adds usage of this API to existing GameProfile based API's, as well as new API's.
23 lines
936 B
Diff
23 lines
936 B
Diff
From 6e332112aa0268917c09e440ff581f07038d1763 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 5a76821ea..858bbef5b 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.15.1
|
|
|