mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-29 07:48:53 +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
65 lines
2.4 KiB
Diff
65 lines
2.4 KiB
Diff
From d365f8709924fca24da48483363f820370e6f518 Mon Sep 17 00:00:00 2001
|
|
From: Zach Brown <zach@zachbr.io>
|
|
Date: Wed, 2 Jan 2019 00:31:12 -0600
|
|
Subject: [PATCH] Add APIs to replace OfflinePlayer#getLastPlayed
|
|
|
|
Currently OfflinePlayer#getLastPlayed could more accurately be described
|
|
as "OfflinePlayer#getLastTimeTheirDataWasSaved".
|
|
|
|
The API doc says it should return the last time the server "witnessed"
|
|
the player, whilst also saying it should return the last time they
|
|
logged in. The current implementation does neither.
|
|
|
|
Given this interesting contradiction in the API documentation and the
|
|
current defacto implementation, I've elected to deprecate (with no
|
|
intent to remove) and replace it with two new methods, clearly named and
|
|
documented as to their purpose.
|
|
|
|
diff --git a/src/main/java/org/bukkit/OfflinePlayer.java b/src/main/java/org/bukkit/OfflinePlayer.java
|
|
index 222a9a7bf..3ab914fb2 100644
|
|
--- a/src/main/java/org/bukkit/OfflinePlayer.java
|
|
+++ b/src/main/java/org/bukkit/OfflinePlayer.java
|
|
@@ -146,7 +146,9 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
|
|
* UTC.
|
|
*
|
|
* @return Date of last log-in for this player, or 0
|
|
+ * @deprecated The API contract is ambiguous and the implementation may or may not return the correct value given this API ambiguity. It is instead recommended use {@link #getLastLogin()} or {@link #getLastSeen()} depending on your needs.
|
|
*/
|
|
+ @Deprecated
|
|
public long getLastPlayed();
|
|
|
|
/**
|
|
@@ -165,4 +167,30 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
|
|
@Nullable
|
|
public Location getBedSpawnLocation();
|
|
|
|
+ // Paper start
|
|
+
|
|
+ /**
|
|
+ * Gets the last date and time that this player logged into the server.
|
|
+ * <p>
|
|
+ * If the player has never played before, this will return 0. Otherwise,
|
|
+ * it will be the amount of milliseconds since midnight, January 1, 1970
|
|
+ * UTC.
|
|
+ *
|
|
+ * @return last login time
|
|
+ */
|
|
+ public long getLastLogin();
|
|
+
|
|
+ /**
|
|
+ * Gets the last date and time that this player was seen on the server.
|
|
+ * <p>
|
|
+ * If the player has never played before, this will return 0. If the
|
|
+ * player is currently online, this will return the current time.
|
|
+ * Otherwise it will be the amount of milliseconds since midnight,
|
|
+ * January 1, 1970 UTC.
|
|
+ *
|
|
+ * @return last seen time
|
|
+ */
|
|
+ public long getLastSeen();
|
|
+ // Paper end
|
|
+
|
|
}
|
|
--
|
|
2.21.0
|
|
|