mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-03 02:20:51 +02:00
Upstream has released updates that appear 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: dfe1fb48 PR-906: Add missing MinecraftExperimental annotation to Bundles 825ab30d PR-905: Add missing MapCursor.Type and update documentation e03d10e6 PR-903: Make BARRIER Waterlogged 1961ead6 PR-898: Use Java Consumer instead of Bukkit Consumer CraftBukkit Changes: f71a799f0 Make BARRIER Waterlogged 172f76a45 Upgrade specialsource-maven-plugin f0702775c SPIGOT-7486: Alternate approach to null profile names 069495671 SPIGOT-7485: Allow air entity items since required for Vanilla logic 5dfd33dc2 SPIGOT-7484: Cancelling PlayerEditBookEvent does not update client's book contents 02d490788 PR-1250: Standardize and centralize Bukkit / Minecraft registry conversion 9024a09b9 PR-1251: Use Java Consumer instead of Bukkit Consumer 6d4b25bf1 Increase diff stability
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 ca3fe38fa443eb08408eca029a34afb58cd5a118..bc17ba1dc7b744a4325b30703cda73b501da5104 100644
|
|
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
|
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
|
@@ -241,6 +241,7 @@ public class ServerPlayer extends Player {
|
|
private int containerCounter;
|
|
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 98c4a1b8542486f5af1274f974b898a69f2684f1..45bfb32505dfd2a66d8a6ee4627ec293a88da818 100644
|
|
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
|
|
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
|
|
@@ -181,6 +181,7 @@ public abstract class PlayerList {
|
|
|
|
public void placeNewPlayer(Connection connection, ServerPlayer player, CommonListenerCookie clientData) {
|
|
player.isRealPlayer = true; // Paper
|
|
+ player.loginTime = System.currentTimeMillis(); // Paper
|
|
GameProfile gameprofile = player.getGameProfile();
|
|
GameProfileCache usercache = this.server.getProfileCache();
|
|
String s;
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
|
|
index c1ef6c8c8e5f030e18b6066a509350ee1e195987..779b6bac307e252fe614cfce958d2eeed94c5f77 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
|
|
@@ -261,6 +261,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 92e64162181b73e5201e1e3e52db9e372c765a75..d939e5385d250095674c1f0c6f4209cdf87ad7cb 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
@@ -195,6 +195,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) {
|
|
@@ -1952,6 +1953,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")) {
|
|
@@ -1974,6 +1987,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());
|
|
}
|
|
@@ -1988,6 +2003,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
|