mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Updated Upstream (Bukkit/CraftBukkit)

Browse source 
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:
e0598aa2 SPIGOT-6692: Add sendSignChange overload with a hasGlowingText parameter

CraftBukkit Changes:
2cdc6b1e4 SPIGOT-6692: Add sendSignChange overload with a hasGlowingText parameter
This commit is contained in:
Mariell Hoversholm 2021-08-05 21:53:50 +02:00 • committed by MiniDigger | Martin
parent 80650e8936
commit 415f7ca165
44 changed files with 228 additions and 163 deletions
Download patch file Download diff file Expand all files Collapse all files

10
patches/server/0302-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
View file

@ -16,7 +16,7 @@ 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 efb759fe76540b51509029d40884eb85a31cda86..d2667305c73821df221cf9aaca2ca494aa1836ad 100644
index 4f93f576bbbf7e8d0217f8d30f4c578ad917477a..95690ac3b3404ebe3d2308aaee09d9ec52b8f76d 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -219,6 +219,7 @@ public class ServerPlayer extends Player {
@ -106,7 +106,7 @@ index 93de44b05a698515457052c9c684c4ef44c5cc40..b20bfe5ab165bf86985e5ff2f93f415d
public Location getBedSpawnLocation() {
CompoundTag data = this.getData();
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index e3e158946ceff4c383e5da46bce09554f7526a6f..d98e7b91cb8e6f9369531a08887513b05ef0f96b 100644
index 6fac6afd5ea4e35f6bb0e9b859fb9b4c608d53a1..baa11848b63442fed7160a94e6447d6dd63d8ac6 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -151,6 +151,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -117,7 +117,7 @@ index e3e158946ceff4c383e5da46bce09554f7526a6f..d98e7b91cb8e6f9369531a08887513b0
// Paper end
public CraftPlayer(CraftServer server, ServerPlayer entity) {
@@ -1507,6 +1508,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1512,6 +1513,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
this.firstPlayed = firstPlayed;
}
@ -136,7 +136,7 @@ index e3e158946ceff4c383e5da46bce09554f7526a6f..d98e7b91cb8e6f9369531a08887513b0
public void readExtraData(CompoundTag nbttagcompound) {
this.hasPlayedBefore = true;
if (nbttagcompound.contains("bukkit")) {
@@ -1529,6 +1542,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1534,6 +1547,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
public void setExtraData(CompoundTag nbttagcompound) {
@ -145,7 +145,7 @@ index e3e158946ceff4c383e5da46bce09554f7526a6f..d98e7b91cb8e6f9369531a08887513b0
if (!nbttagcompound.contains("bukkit")) {
nbttagcompound.put("bukkit", new CompoundTag());
}
@@ -1543,6 +1558,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1548,6 +1563,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
data.putLong("firstPlayed", this.getFirstPlayed());
data.putLong("lastPlayed", System.currentTimeMillis());
data.putString("lastKnownName", handle.getScoreboardName());