Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@52a60ad Updated Upstream (Bukkit/CraftBukkit) (#8172)
PaperMC/Paper@5deafd1 Teleportation API (#6562)
This commit is contained in:
BillyGalbreath
2022-07-22 16:44:39 -05:00
parent 028780d4e1
commit 9a15789561
27 changed files with 100 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/server/0013-AFK-API.patch
View File

@@ -5,7 +5,7 @@ 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 2842ba7028bf833478758f2e839796b25084b1b3..faaf63fe5afd825de34a5c4c586d106f859d0d47 100644
index 96e7815bde8274d303b1b7080358a3f7f1837146..a11030df2eaaae4a0b5710f4d5d32033c30be9b1 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -2006,8 +2006,58 @@ public class ServerPlayer extends Player {
@@ -68,7 +68,7 @@ index 2842ba7028bf833478758f2e839796b25084b1b3..faaf63fe5afd825de34a5c4c586d106f
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 b639bb8582389c7f675fb9a7f60aebb9615b766e..250182281905fd9f02491a5dcd03cd3091a80029 100644
index 472a5dac726c77caa34b2f1343495cae4a9e2e98..bd7769c9511685bbf96e5bb80108a99508cb82d4 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -313,6 +313,20 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -213,7 +213,7 @@ index 3f458ddd4dc04ed28510a212be76bb19e7f6a61e..a36469186f72eccf8c4428d920d0583b
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 00c9bf988de09a6214a7ac21acfeb288862900c2..d95fd0174a067d53c2c08ec2bf6758bce6ce944c 100644
index 123295c56e638d4b97196b62dfe79822c9002242..271387c0f5e011846507a0dd8dbf2445ca2ff7ed 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -442,10 +442,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -233,7 +233,7 @@ index 00c9bf988de09a6214a7ac21acfeb288862900c2..d95fd0174a067d53c2c08ec2bf6758bc
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()));
@@ -2802,5 +2807,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2881,5 +2886,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public boolean usesPurpurClient() {
return getHandle().purpurClient;
}
@@ -255,7 +255,7 @@ index 00c9bf988de09a6214a7ac21acfeb288862900c2..d95fd0174a067d53c2c08ec2bf6758bc
// Purpur end
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index b079c084e47019938546bf9156178a077a0e2022..9839fb413d06b5dfc1d89a4aee4d05e53d613232 100644
index 8a7144a65594236a1ec7187348285174594d7a97..cf7925c5631815a53926543b79179c58e923402e 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -169,8 +169,16 @@ public class PurpurConfig {