mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-01 20:50:41 +01:00
5c7081fecc
* Updated Upstream (Bukkit/CraftBukkit) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 45690fe9 SPIGOT-5047: Correct slot types for 1.14 inventories CraftBukkit Changes:4090d01fSPIGOT-5047: Correct slot types for 1.14 inventoriese8c08362SPIGOT-5046: World#getLoadedChunks returning inaccessible cached chunks.d445af3bSPIGOT-5067: Add item meta for 1.14 spawn eggs * Bring Chunk load checks in-line with spigot As of the last upstream merge spigot now checks ticket level status when returning loaded chunks for a world from api. Now our checks will respect that decision. * Fix spawn ticket levels Vanilla would keep the inner chunks of spawn available for ticking, however my changes made all chunks non-ticking. Resolve by changing ticket levels for spawn chunks inside the border to respect this behavior. * Make World#getChunkIfLoadedImmediately return only entity ticking chunks Mojang appears to be using chunks with level > 33 (non-ticking chunks) as cached chunks and not actually loaded chunks. * Bring all loaded checks in line with spigot Loaded chunks must be at least border chunks, or level <= 33
45 lines
1.4 KiB
Diff
45 lines
1.4 KiB
Diff
From a94f5fca9e22f84e1ed553bb53228938c3a7e079 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Sat, 24 Feb 2018 00:55:52 -0500
|
|
Subject: [PATCH] Tameable#getOwnerUniqueId API
|
|
|
|
This is faster if all you need is the UUID, as .getOwner() will cause
|
|
an OfflinePlayer to be loaded from disk.
|
|
|
|
diff --git a/src/main/java/org/bukkit/entity/Tameable.java b/src/main/java/org/bukkit/entity/Tameable.java
|
|
index 0c066bdfc..be436f8df 100644
|
|
--- a/src/main/java/org/bukkit/entity/Tameable.java
|
|
+++ b/src/main/java/org/bukkit/entity/Tameable.java
|
|
@@ -1,5 +1,6 @@
|
|
package org.bukkit.entity;
|
|
|
|
+import org.jetbrains.annotations.NotNull;
|
|
import org.jetbrains.annotations.Nullable;
|
|
|
|
public interface Tameable extends Entity {
|
|
@@ -25,9 +26,22 @@ public interface Tameable extends Entity {
|
|
*/
|
|
public void setTamed(boolean tame);
|
|
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Gets the owners UUID
|
|
+ *
|
|
+ * @return the owners UUID, or null if not owned
|
|
+ */
|
|
+ @NotNull
|
|
+ public java.util.UUID getOwnerUniqueId();
|
|
+ // Paper end
|
|
+
|
|
/**
|
|
* Gets the current owning AnimalTamer
|
|
*
|
|
+ * @see #getOwnerUniqueId() Recommended to use UUID version instead of this for performance.
|
|
+ * This method will cause OfflinePlayer to be loaded from disk if the owner is not online.
|
|
+ *
|
|
* @return the owning AnimalTamer, or null if not owned
|
|
*/
|
|
@Nullable
|
|
--
|
|
2.21.0
|
|
|