aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0293-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0293-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch')
-rw-r--r--patches/server/0293-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch164
1 files changed, 164 insertions, 0 deletions
diff --git a/patches/server/0293-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/patches/server/0293-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
new file mode 100644
index 0000000000..44b74e5833
--- /dev/null
+++ b/patches/server/0293-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
@@ -0,0 +1,164 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Zach Brown <[email protected]>
+Date: Wed, 2 Jan 2019 00:35:43 -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/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
+index 135e61ffa69a56e7c5edcd9e2066334abf963340..e8ca0d8612e132fac5533b7672d0fccbf1bc9e24 100644
+--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
++++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
+@@ -230,6 +230,7 @@ public class ServerPlayer extends Player {
+ public int latency;
+ public boolean wonGame;
+ private int containerUpdateDelay; // Paper
++ public long loginTime; // Paper
+ // Paper start - cancellable death event
+ public boolean queueHealthUpdatePacket = false;
+ public net.minecraft.network.protocol.game.ClientboundSetHealthPacket queuedHealthUpdatePacket;
+diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
+index ffa3f9d147a0113d7b8cbf185ca751ed159576c2..97f045ee1af5479b2befe2e03f082933cfe91007 100644
+--- a/src/main/java/net/minecraft/server/players/PlayerList.java
++++ b/src/main/java/net/minecraft/server/players/PlayerList.java
+@@ -179,6 +179,7 @@ public abstract class PlayerList {
+
+ public void placeNewPlayer(Connection connection, ServerPlayer player) {
+ player.isRealPlayer = true; // Paper
++ player.loginTime = System.currentTimeMillis(); // Paper
+ GameProfile gameprofile = player.getGameProfile();
+ GameProfileCache usercache = this.server.getProfileCache();
+ Optional<GameProfile> optional = usercache.get(gameprofile.getId());
+diff --git a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
+index e7442952ef1f03969949014492a7ddc6d0796ba5..d7823d7dc88cfba6f6ac9dae220e03dea4a0bcdd 100644
+--- a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
++++ b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
+@@ -250,6 +250,61 @@ public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializa
+ return this.getData() != null;
+ }
+
++ // Paper start
++ @Override
++ public long getLastLogin() {
++ Player player = getPlayer();
++ if (player != null) return player.getLastLogin();
++
++ CompoundTag data = getPaperData();
++
++ if (data != null) {
++ if (data.contains("LastLogin")) {
++ return data.getLong("LastLogin");
++ } else {
++ // if the player file cannot provide accurate data, this is probably the closest we can approximate
++ File file = getDataFile();
++ return file.lastModified();
++ }
++ } else {
++ return 0;
++ }
++ }
++
++ @Override
++ public long getLastSeen() {
++ Player player = getPlayer();
++ if (player != null) return player.getLastSeen();
++
++ CompoundTag data = getPaperData();
++
++ if (data != null) {
++ if (data.contains("LastSeen")) {
++ return data.getLong("LastSeen");
++ } else {
++ // if the player file cannot provide accurate data, this is probably the closest we can approximate
++ File file = getDataFile();
++ return file.lastModified();
++ }
++ } else {
++ return 0;
++ }
++ }
++
++ private CompoundTag getPaperData() {
++ CompoundTag result = getData();
++
++ if (result != null) {
++ if (!result.contains("Paper")) {
++ result.put("Paper", new CompoundTag());
++ }
++ result = result.getCompound("Paper");
++ }
++
++ return result;
++ }
++ // Paper end
++
+ @Override
+ public Location getLastDeathLocation() {
+ if (this.getData().contains("LastDeathLocation", 10)) {
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+index 8676067be5cbb149a6a50a9582a22b69ebcfb61b..1b708fc4990e92815f2ad56aba52bf85e5ddea7f 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+@@ -174,6 +174,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+ private org.bukkit.event.player.PlayerResourcePackStatusEvent.Status resourcePackStatus;
+ private String resourcePackHash;
+ private static final boolean DISABLE_CHANNEL_LIMIT = System.getProperty("paper.disableChannelLimit") != null; // Paper - add a flag to disable the channel limit
++ private long lastSaveTime;
+ // Paper end
+
+ public CraftPlayer(CraftServer server, ServerPlayer entity) {
+@@ -1765,6 +1766,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+ this.firstPlayed = firstPlayed;
+ }
+
++ // Paper start
++ @Override
++ public long getLastLogin() {
++ return getHandle().loginTime;
++ }
++
++ @Override
++ public long getLastSeen() {
++ return isOnline() ? System.currentTimeMillis() : this.lastSaveTime;
++ }
++ // Paper end
++
+ public void readExtraData(CompoundTag nbttagcompound) {
+ this.hasPlayedBefore = true;
+ if (nbttagcompound.contains("bukkit")) {
+@@ -1787,6 +1800,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+ }
+
+ public void setExtraData(CompoundTag nbttagcompound) {
++ this.lastSaveTime = System.currentTimeMillis(); // Paper
++
+ if (!nbttagcompound.contains("bukkit")) {
+ nbttagcompound.put("bukkit", new CompoundTag());
+ }
+@@ -1801,6 +1816,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+ data.putLong("firstPlayed", this.getFirstPlayed());
+ data.putLong("lastPlayed", System.currentTimeMillis());
+ data.putString("lastKnownName", handle.getScoreboardName());
++
++ // Paper start - persist for use in offline save data
++ if (!nbttagcompound.contains("Paper")) {
++ nbttagcompound.put("Paper", new CompoundTag());
++ }
++
++ CompoundTag paper = nbttagcompound.getCompound("Paper");
++ paper.putLong("LastLogin", handle.loginTime);
++ paper.putLong("LastSeen", System.currentTimeMillis());
++ // Paper end
+ }
+
+ @Override