mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 16:37:43 +01:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@a9f252e Replace third party repos with Paper repo (#7733) PaperMC/Paper@b8fa41e [ci skip] Remove Mojang repo from test-plugin PaperMC/Paper@c6e631a Use username instead of display name in PlayerList#getPlayerStats (#7740) PaperMC/Paper@1cfd363 Updated Upstream (Bukkit/CraftBukkit/Spigot)
This commit is contained in:
@@ -5,10 +5,10 @@ Subject: [PATCH] AFK API
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||||
index 3abb10c70b09c63462f0090a6b576ba2d6657cb8..89189f12f467b6b97569553d3af47b14068a6a23 100644
|
||||
index 38995873e2b4cf9e7ac83d074c817a0452948250..38c2e2b4e6577dd6db84b86147a6f0c5bd0b8879 100644
|
||||
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||||
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||||
@@ -1969,8 +1969,58 @@ public class ServerPlayer extends Player {
|
||||
@@ -1974,8 +1974,58 @@ public class ServerPlayer extends Player {
|
||||
|
||||
public void resetLastActionTime() {
|
||||
this.lastActionTime = Util.getMillis();
|
||||
@@ -68,7 +68,7 @@ index 3abb10c70b09c63462f0090a6b576ba2d6657cb8..89189f12f467b6b97569553d3af47b14
|
||||
return this.stats;
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||
index 334e73a646bb02fcfef331229a07e790d9ec6c67..81de9d96c1d3b36a3616ba824878c04b4d4fa745 100644
|
||||
index 142437f0224e186dd74500ac88d5c1d147db3e71..4cfa7f9480339d1d3e3e024c6afe258dfcec31ea 100644
|
||||
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||
@@ -292,6 +292,20 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
|
||||
@@ -213,10 +213,10 @@ index 1f4b72a0aca200b2e0860449c718e6e607d2fc47..e1dd8932594780b07db13f68efa117eb
|
||||
if (range < 0.0D || d < range * range) {
|
||||
return true;
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
index e83d1abd9602a8b460a21d10d5edcb75f1de0883..a95b245ca2fa333085b0fc47f2cc5c5e96dcd075 100644
|
||||
index c0eb31d6d8d78d97655c23925b2e1c573c9ca216..75a38684e790a1d551d0b694a0b2aa8545a10f74 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
@@ -435,10 +435,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
@@ -445,10 +445,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
|
||||
@Override
|
||||
public void setPlayerListName(String name) {
|
||||
@@ -233,7 +233,7 @@ index e83d1abd9602a8b460a21d10d5edcb75f1de0883..a95b245ca2fa333085b0fc47f2cc5c5e
|
||||
for (ServerPlayer player : (List<ServerPlayer>) server.getHandle().players) {
|
||||
if (player.getBukkitEntity().canSee(this)) {
|
||||
player.connection.send(new ClientboundPlayerInfoPacket(ClientboundPlayerInfoPacket.Action.UPDATE_DISPLAY_NAME, this.getHandle()));
|
||||
@@ -2709,5 +2714,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
@@ -2795,5 +2800,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
public boolean usesPurpurClient() {
|
||||
return getHandle().purpurClient;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user