2019-05-31 01:22:34 +02:00
From 3ce57cf192543240a80794ce558716f8e3f0e15a Mon Sep 17 00:00:00 2001
2019-01-02 08:04:11 +01:00
From: Zach Brown <zach@zachbr.io>
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/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
2019-05-31 01:22:34 +02:00
index 7f89d45ed..64d1b72a8 100644
2019-01-02 08:04:11 +01:00
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
2019-05-06 04:58:04 +02:00
@@ -75,6 +75,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
2019-01-02 08:04:11 +01:00
public int ping;
public boolean viewingCredits;
private int containerUpdateDelay; // Paper
+ public long loginTime; // Paper
// Paper start - cancellable death event
public boolean queueHealthUpdatePacket = false;
public net.minecraft.server.PacketPlayOutUpdateHealth queuedHealthUpdatePacket;
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
2019-05-31 01:22:34 +02:00
index 0db1e8334..0aafa1b60 100644
2019-01-02 08:04:11 +01:00
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
2019-05-05 19:19:34 +02:00
@@ -94,6 +94,7 @@ public abstract class PlayerList {
2019-01-02 08:04:11 +01:00
}
public void a(NetworkManager networkmanager, EntityPlayer entityplayer) {
+ entityplayer.loginTime = System.currentTimeMillis(); // Paper
GameProfile gameprofile = entityplayer.getProfile();
UserCache usercache = this.server.getUserCache();
GameProfile gameprofile1 = usercache.a(gameprofile.getId());
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
2019-05-27 11:13:41 +02:00
index c1ef1c950..3824180ee 100644
2019-01-02 08:04:11 +01:00
--- a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
2019-05-06 04:58:04 +02:00
@@ -256,6 +256,61 @@ public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializa
2019-01-02 08:04:11 +01:00
return getData() != null;
}
+ // Paper start
+ @Override
+ public long getLastLogin() {
+ Player player = getPlayer();
+ if (player != null) return player.getLastLogin();
+
+ NBTTagCompound data = getPaperData();
+
+ if (data != null) {
+ if (data.hasKey("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();
+
+ NBTTagCompound data = getPaperData();
+
+ if (data != null) {
+ if (data.hasKey("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 NBTTagCompound getPaperData() {
+ NBTTagCompound result = getData();
+
+ if (result != null) {
+ if (!result.hasKey("Paper")) {
+ result.set("Paper", new NBTTagCompound());
+ }
+ result = result.getCompound("Paper");
+ }
+
+ return result;
+ }
+ // Paper end
+
2019-05-06 04:58:04 +02:00
@Override
2019-01-02 08:04:11 +01:00
public Location getBedSpawnLocation() {
NBTTagCompound data = getData();
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
2019-05-27 11:13:41 +02:00
index deacc2187..367e8cfc1 100644
2019-01-02 08:04:11 +01:00
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
2019-05-05 19:19:34 +02:00
@@ -137,6 +137,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
2019-01-02 08:04:11 +01:00
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, EntityPlayer entity) {
2019-05-14 04:20:58 +02:00
@@ -1363,6 +1364,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
2019-01-02 08:04:11 +01:00
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(NBTTagCompound nbttagcompound) {
hasPlayedBefore = true;
if (nbttagcompound.hasKey("bukkit")) {
2019-05-14 04:20:58 +02:00
@@ -1385,6 +1398,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
2019-01-02 08:04:11 +01:00
}
public void setExtraData(NBTTagCompound nbttagcompound) {
+ this.lastSaveTime = System.currentTimeMillis(); // Paper
+
if (!nbttagcompound.hasKey("bukkit")) {
nbttagcompound.set("bukkit", new NBTTagCompound());
}
2019-05-14 04:20:58 +02:00
@@ -1399,6 +1414,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
2019-01-02 08:04:11 +01:00
data.setLong("firstPlayed", getFirstPlayed());
data.setLong("lastPlayed", System.currentTimeMillis());
data.setString("lastKnownName", handle.getName());
+
+ // Paper start - persist for use in offline save data
+ if (!nbttagcompound.hasKey("Paper")) {
+ nbttagcompound.set("Paper", new NBTTagCompound());
+ }
+
+ NBTTagCompound paper = nbttagcompound.getCompound("Paper");
+ paper.setLong("LastLogin", handle.loginTime);
+ paper.setLong("LastSeen", System.currentTimeMillis());
+ // Paper end
}
@Override
--
2019-03-20 01:28:15 +01:00
2.21.0
2019-01-02 08:04:11 +01:00