From 28e37130863e63dda7b8108fbb460a708d6a63ad Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Mon, 8 Aug 2022 09:23:12 -0500 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@a15152e Allow old behavior for CommandRegisteredEvent (#8249) PaperMC/Paper@0118c0b Improve MojangAPI docs and replace @Deprecated with @ApiStatus.Experimental on draft APIs (#8261) PaperMC/Paper@3624637 Improve documentation of Inventory#removeItem (#8263) PaperMC/Paper@a47301e Fix Player#chat kicking all clients (#8262) PaperMC/Paper@78b19f8 Separate Command Sending to Separate Thread Pool (#8170) --- gradle.properties | 2 +- .../0001-Pufferfish-Server-Changes.patch | 10 ++-- patches/server/0003-Rebrand.patch | 10 ++-- patches/server/0008-Ridables.patch | 4 +- .../0014-Configurable-server-mod-name.patch | 4 +- patches/server/0016-Lagging-threshold.patch | 4 +- ...x-vanilla-command-permission-handler.patch | 6 +-- ...-Skip-events-if-there-s-no-listeners.patch | 6 +-- .../0052-Configurable-TPS-Catchup.patch | 4 +- ...0065-Add-5-second-tps-average-in-tps.patch | 6 +-- patches/server/0068-Add-ping-command.patch | 4 +- patches/server/0069-Add-demo-command.patch | 4 +- patches/server/0070-Add-credits-command.patch | 4 +- .../0103-Configurable-daylight-cycle.patch | 4 +- patches/server/0125-Implement-TPSBar.patch | 12 ++--- patches/server/0199-Add-uptime-command.patch | 6 +-- patches/server/0210-Add-compass-command.patch | 6 +-- .../server/0233-UPnP-Port-Forwarding.patch | 6 +-- ...counts-in-beehives-to-Purpur-clients.patch | 4 +- .../0286-Allow-custom-ChatDecorators.patch | 4 +- patches/server/0287-Cache-server-motd.patch | 4 +- patches/server/0288-Remove-Timings.patch | 18 +++---- .../server/0289-Remove-Mojang-Profiler.patch | 48 +++++++++---------- 23 files changed, 90 insertions(+), 90 deletions(-) diff --git a/gradle.properties b/gradle.properties index 34af334b7..e6fff0e09 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ group = org.purpurmc.purpur version = 1.19.2-R0.1-SNAPSHOT -paperCommit = bef2c9d005bdd039f188ee53094a928e76bd8e59 +paperCommit = 78b19f89a4658892c5ec79d5062f8c5b95ca149b org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/server/0001-Pufferfish-Server-Changes.patch b/patches/server/0001-Pufferfish-Server-Changes.patch index 859d299b7..7cf7bad73 100644 --- a/patches/server/0001-Pufferfish-Server-Changes.patch +++ b/patches/server/0001-Pufferfish-Server-Changes.patch @@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . diff --git a/build.gradle.kts b/build.gradle.kts -index 2374cc9bab5039d0a0dc11d4b2ec573ab75778a7..74c91f79576e85618fefb79be8d313ba871701c7 100644 +index 2374cc9bab5039d0a0dc11d4b2ec573ab75778a7..27d1663fea7cbddfa4e2000cf73d215886c70aa5 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -9,8 +9,12 @@ plugins { @@ -31,7 +31,7 @@ index 2374cc9bab5039d0a0dc11d4b2ec573ab75778a7..74c91f79576e85618fefb79be8d313ba - implementation(project(":paper-mojangapi")) + implementation(project(":pufferfish-api")) // Pufferfish // Paper + // Pufferfish start -+ implementation("io.papermc.paper:paper-mojangapi:1.19-R0.1-SNAPSHOT") { ++ implementation("io.papermc.paper:paper-mojangapi:1.19.2-R0.1-SNAPSHOT") { // Purpur + exclude("io.papermc.paper", "paper-api") + } + // Pufferfish end @@ -2783,7 +2783,7 @@ index 7034af8ad42940c5af6b9032b9873ce36c55a2a7..c0fdc5a79107f8694a514a12d5526bd4 public static long getCoordinateKey(final ChunkPos pair) { diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index f23be38ef96a81ce3867a3b6fdccf632fe285f31..96ce3c0f5f17bb5c3b8be5dc137de3d457304a78 100644 +index 081c7160cf727646cdec4cd551dbc2aad56326f6..06d31a03ec7d049649e94d013429d2197b697545 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -298,6 +298,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop S spin(Function serverFactory) { AtomicReference atomicreference = new AtomicReference(); -@@ -1655,7 +1657,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop 0; // Paper worldserver.hasEntityMoveEvent = io.papermc.paper.event.entity.EntityMoveEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper diff --git a/patches/server/0014-Configurable-server-mod-name.patch b/patches/server/0014-Configurable-server-mod-name.patch index e5afd487c..ee524f170 100644 --- a/patches/server/0014-Configurable-server-mod-name.patch +++ b/patches/server/0014-Configurable-server-mod-name.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Configurable server mod name diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 3b24edf04cb2f2ebd9adb16839bd92be4d444390..23bbe6196f5141934aa623eed124b6bb99e3220e 100644 +index 1e0dd0f16081281c18e6c131a3d8b7f83b11805b..48bf3a9938aae8d6cc847a80cf95cfda305414f5 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1658,7 +1658,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop implements Comparable> { - private final RedirectModifier modifier; +@@ -35,6 +35,7 @@ public abstract class CommandNode implements Comparable> { private final boolean forks; private Command command; + public LiteralCommandNode clientNode = null; // Paper + private String permission = null; public String getPermission() { return permission; } public void setPermission(String permission) { this.permission = permission; } // Purpur // CraftBukkit start public void removeCommand(String name) { diff --git a/patches/server/0050-Skip-events-if-there-s-no-listeners.patch b/patches/server/0050-Skip-events-if-there-s-no-listeners.patch index 2e20f4867..5439719db 100644 --- a/patches/server/0050-Skip-events-if-there-s-no-listeners.patch +++ b/patches/server/0050-Skip-events-if-there-s-no-listeners.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Skip events if there's no listeners diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java -index fcc75660a69122eefc100e4de0a62f587bf97d7b..1ea357efcb8cdc275dabe3cb6b2c1a37aee45620 100644 +index 135b341e5b975fc542f66ef9c52e29f4c6dd4a53..18edc532315301abe2e0920da496aafd68627fe8 100644 --- a/src/main/java/net/minecraft/commands/Commands.java +++ b/src/main/java/net/minecraft/commands/Commands.java -@@ -404,6 +404,7 @@ public class Commands { +@@ -414,6 +414,7 @@ public class Commands { } private void runSync(ServerPlayer player, Collection bukkit, RootCommandNode rootcommandnode) { @@ -16,7 +16,7 @@ index fcc75660a69122eefc100e4de0a62f587bf97d7b..1ea357efcb8cdc275dabe3cb6b2c1a37 // Paper end - Async command map building new com.destroystokyo.paper.event.brigadier.AsyncPlayerSendCommandsEvent(player.getBukkitEntity(), (RootCommandNode) rootcommandnode, false).callEvent(); // Paper PlayerCommandSendEvent event = new PlayerCommandSendEvent(player.getBukkitEntity(), new LinkedHashSet<>(bukkit)); -@@ -416,6 +417,7 @@ public class Commands { +@@ -426,6 +427,7 @@ public class Commands { } } // CraftBukkit end diff --git a/patches/server/0052-Configurable-TPS-Catchup.patch b/patches/server/0052-Configurable-TPS-Catchup.patch index dbc7df873..1860c3ef8 100644 --- a/patches/server/0052-Configurable-TPS-Catchup.patch +++ b/patches/server/0052-Configurable-TPS-Catchup.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Configurable TPS Catchup diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 53096efdc2d2e27537e36259ebda9137100de846..8e6271f717451cb59aa11656879f0ccd3655a8a3 100644 +index 0d57f093490e7db8d4d726111ba94e9edbceeda9..35bd4446652d291c77174c0aa366a9030d5b0bcc 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1195,7 +1195,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop parseresults, String s, String label) { // CraftBukkit CommandSourceStack commandlistenerwrapper = (CommandSourceStack) parseresults.getContext().getSource(); @@ -29,7 +29,7 @@ index 5b4a89c696f6457bef24bb8792303dfde7ae510c..b5dea3cea431d8f92628ada67e298079 byte b0; -@@ -364,7 +364,7 @@ public class Commands { +@@ -363,7 +363,7 @@ public class Commands { b0 = 0; } } finally { @@ -39,7 +39,7 @@ index 5b4a89c696f6457bef24bb8792303dfde7ae510c..b5dea3cea431d8f92628ada67e298079 return b0; diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index a9caa5529c91f8f1adaea8ae9ba0615bb2604f52..b6d5c5df02ff2dde7ac7846e9494248c1397b9f2 100644 +index 04e9d7aff458e59a43df6830ff82ac9d5708ee47..626f97882f2335ccf22d25c40aa389e6b4884207 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -328,13 +328,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop 0 && this.tickCount % autosavePeriod == 0; try { this.isSaving = true; -@@ -1482,7 +1482,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop 0; // Purpur net.minecraft.world.level.block.entity.HopperBlockEntity.skipHopperEvents = worldserver.paperConfig().hopper.disableMoveEvent || org.bukkit.event.inventory.InventoryMoveItemEvent.getHandlerList().getRegisteredListeners().length == 0; // Paper @@ -192,7 +192,7 @@ index a9caa5529c91f8f1adaea8ae9ba0615bb2604f52..b6d5c5df02ff2dde7ac7846e9494248c try { //worldserver.timings.doTick.startTiming(); // Spigot // Purpur -@@ -1599,17 +1599,17 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop { this.executeBlocking(() -> { this.saveDebugReport(path.resolve("server")); -@@ -2507,40 +2507,40 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop