165 lines
6.9 KiB
Diff
165 lines
6.9 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
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/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||
|
index 416c21f0a6be8d71a654e18f7ea0fa074f8fc5ff..1fa4f58658ff98396eb5abfc27e19e5832d56f5a 100644
|
||
|
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||
|
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||
|
@@ -211,6 +211,7 @@ public class ServerPlayer extends Player implements ContainerListener {
|
||
|
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 7c307a16ca3962db65be09a0ddd058a4ce81c7be..5b71b487836cdd2ddc75b2039f4dc0177719d345 100644
|
||
|
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
|
||
|
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
|
||
|
@@ -164,6 +164,7 @@ public abstract class PlayerList {
|
||
|
}
|
||
|
|
||
|
public void placeNewPlayer(Connection connection, ServerPlayer player) {
|
||
|
+ player.loginTime = System.currentTimeMillis(); // Paper
|
||
|
GameProfile gameprofile = player.getGameProfile();
|
||
|
GameProfileCache usercache = this.server.getProfileCache();
|
||
|
GameProfile gameprofile1 = 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 1eeb1d1fe54eba68652be8dba52dce8ca91d948d..19aee8c6d0989bcf263e27adab42b3e6e411b66f 100644
|
||
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
|
||
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
|
||
|
@@ -244,6 +244,61 @@ public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializa
|
||
|
return 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 getBedSpawnLocation() {
|
||
|
CompoundTag data = getData();
|
||
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||
|
index a3e65028d3e0c09a65cd9c28b037fe01a2ed1d76..ba03a1cdac68dc08ed878e311adeebc531e8f2f1 100644
|
||
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||
|
@@ -144,6 +144,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) {
|
||
|
@@ -1480,6 +1481,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) {
|
||
|
hasPlayedBefore = true;
|
||
|
if (nbttagcompound.contains("bukkit")) {
|
||
|
@@ -1502,6 +1515,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());
|
||
|
}
|
||
|
@@ -1516,6 +1531,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||
|
data.putLong("firstPlayed", 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
|