Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-04-20 18:28:15 +02: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@babffb5 Undeprecate and fix Boat#getBoatMaterial (#8217)
PaperMC/Paper@d60497e Updated Upstream (Bukkit/CraftBukkit)
PaperMC/Paper@dd3e4e7 Initial support for signed messages (#8198)
PaperMC/Paper@ceef4b9 Don't call AsyncTabCompleteEvent from netty IO thread (#8218)
PaperMC/Paper@e0486ae Fix suggest command message for brigadier syntax exceptions (#8221)
This commit is contained in:
BillyGalbreath
2022-08-02 05:40:22 -05:00
parent a0e4e69dfb
commit e3f739bafd
27 changed files with 99 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/server/0126-Implement-TPSBar.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Implement TPSBar
diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
index 2fa8babafb53cb33272c25f5e0dc31ff2f954c42..2b3c7f0bf0841a52a540f042156f55e978364d24 100644
index 55b1ebd17af11ac29fb6b1d4572fb1fc260c16ac..e970c11307cd69685878902234271195752f9f51 100644
--- a/src/main/java/net/minecraft/commands/Commands.java
+++ b/src/main/java/net/minecraft/commands/Commands.java
@@ -211,6 +211,7 @@ public class Commands {
@@ -17,7 +17,7 @@ index 2fa8babafb53cb33272c25f5e0dc31ff2f954c42..2b3c7f0bf0841a52a540f042156f55e9
if (environment.includeIntegrated) {
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index cde48cbdce50e38e07eaaf81cc922bf39e1fa87f..9cfeb50509aac1a509b1d26c3a71ebfa5aa7ca01 100644
index 2ee6df3e1a79047de97f4776c6f7e2e549d78c68..91495867871320d3a52d2de3ef1d91d57e369b16 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1048,6 +1048,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -41,7 +41,7 @@ index 629024e5c3f480bd50ae2df9dadb72f06a62c3bf..19bf680e222d7f91a0e7f67b29e3a5e3
}
}
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index ee85918725ef2176c79b33bd12e3ed38d89f69e0..a57e0a37a3cacbfea82a3dcc4646dd2fd0977e33 100644
index 9296eedcb77dcb7068d7816cd10459d48e93ebba..b7f93bd215b01be450e2a1a58aadf84ccf811525 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -264,6 +264,7 @@ public class ServerPlayer extends Player {
@@ -68,7 +68,7 @@ index ee85918725ef2176c79b33bd12e3ed38d89f69e0..a57e0a37a3cacbfea82a3dcc4646dd2f
}
// CraftBukkit start - World fallback code, either respawn location or global spawn
@@ -2608,5 +2611,13 @@ public class ServerPlayer extends Player {
@@ -2613,5 +2616,13 @@ public class ServerPlayer extends Player {
this.server.getPlayerList().respawn(this, toLevel, true, to, !toLevel.paperConfig().environment.disableTeleportationSuffocationCheck);
}
}
@@ -83,7 +83,7 @@ index ee85918725ef2176c79b33bd12e3ed38d89f69e0..a57e0a37a3cacbfea82a3dcc4646dd2f
// Purpur end
}
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 7b617767451d5fa7e6d5b6777deb39d9d126695e..d1495cb8ce938906d3ca0583700b853957efca0d 100644
index 4b1c9e75bb4148335a106083dd8199fa1f7d808d..0e690d78c295ca13262230e105a3a26b89c26496 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -497,6 +497,7 @@ public abstract class PlayerList {