165 Zeilen
7.3 KiB
Diff
165 Zeilen
7.3 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] 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 3b71ea8263b2049c54432a64c7f01aed3848d1c7..05379ea4581db4277e6cc625ed0f3228bd0130fd 100644
|
|
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
|
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
|
@@ -263,6 +263,7 @@ public class ServerPlayer extends Player {
|
|
private int containerCounter;
|
|
public boolean wonGame;
|
|
private int containerUpdateDelay; // Paper - Configurable container update tick rate
|
|
+ public long loginTime; // Paper - Replace OfflinePlayer#getLastPlayed
|
|
// Paper start - cancellable death event
|
|
public boolean queueHealthUpdatePacket;
|
|
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 940896725c32981ddd2d5a23d72a87ba3e5e0fee..f472d6eb337de1274424dabe39d4e8a094710165 100644
|
|
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
|
|
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
|
|
@@ -182,6 +182,7 @@ public abstract class PlayerList {
|
|
|
|
public void placeNewPlayer(Connection connection, ServerPlayer player, CommonListenerCookie clientData) {
|
|
player.isRealPlayer = true; // Paper
|
|
+ player.loginTime = System.currentTimeMillis(); // Paper - Replace OfflinePlayer#getLastPlayed
|
|
GameProfile gameprofile = player.getGameProfile();
|
|
GameProfileCache usercache = this.server.getProfileCache();
|
|
// Optional optional; // CraftBukkit - decompile error
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
|
|
index 461656e1cb095243bfe7a9ee2906e5b00574ae78..411b280ac3e27e72091db813c0c9b69b62df6097 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
|
|
@@ -262,6 +262,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 47c747b355737a81cc1d71659a0c8762a37329a8..f6c70805e621365c2a4cc96fb51839cef4f04a5a 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
@@ -208,6 +208,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
|
private BorderChangeListener clientWorldBorderListener = this.createWorldBorderListener();
|
|
public org.bukkit.event.player.PlayerResourcePackStatusEvent.Status resourcePackStatus; // Paper - more resource pack API
|
|
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 - getLastPlayed replacement API
|
|
|
|
public CraftPlayer(CraftServer server, ServerPlayer entity) {
|
|
super(server, entity);
|
|
@@ -2034,6 +2035,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
|
this.firstPlayed = firstPlayed;
|
|
}
|
|
|
|
+ // Paper start - getLastPlayed replacement API
|
|
+ @Override
|
|
+ public long getLastLogin() {
|
|
+ return this.getHandle().loginTime;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public long getLastSeen() {
|
|
+ return this.isOnline() ? System.currentTimeMillis() : this.lastSaveTime;
|
|
+ }
|
|
+ // Paper end - getLastPlayed replacement API
|
|
+
|
|
public void readExtraData(CompoundTag nbttagcompound) {
|
|
this.hasPlayedBefore = true;
|
|
if (nbttagcompound.contains("bukkit")) {
|
|
@@ -2056,6 +2069,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());
|
|
}
|
|
@@ -2070,6 +2085,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
|