diff --git a/gradle.properties b/gradle.properties index 225b5946..79040f49 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,6 +3,6 @@ version=1.21-R0.1-SNAPSHOT mcVersion=1.21 org.gradle.jvmargs=-Xmx2G -paperRef=d08e8d1afabcce6a40bab5863f2c297cd7ba8cfa +paperRef=aa36ae65764f652a16517a994e8d9cf4a89136c8 preVersion=true updatingMinecraft=true diff --git a/patches/api/0007-Delete-Timings.patch b/patches/api/0007-Delete-Timings.patch index 72a2a222..21d33c3f 100644 --- a/patches/api/0007-Delete-Timings.patch +++ b/patches/api/0007-Delete-Timings.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Delete Timings diff --git a/src/main/java/co/aikar/timings/FullServerTickHandler.java b/src/main/java/co/aikar/timings/FullServerTickHandler.java deleted file mode 100644 -index 36b8fe86335df851f9c85d6bb2a91368b4d945d1..0000000000000000000000000000000000000000 +index 3e747abde6fefae90f1c15cb00158bc5303cbe50..0000000000000000000000000000000000000000 --- a/src/main/java/co/aikar/timings/FullServerTickHandler.java +++ /dev/null -@@ -1,86 +0,0 @@ +@@ -1,89 +0,0 @@ -package co.aikar.timings; - -import static co.aikar.timings.TimingsManager.*; @@ -17,6 +17,9 @@ index 36b8fe86335df851f9c85d6bb2a91368b4d945d1..00000000000000000000000000000000 -import org.bukkit.Bukkit; -import org.jetbrains.annotations.NotNull; - +-/** +- * @deprecated Timings will be removed in the future +- */ -@Deprecated(forRemoval = true) -public class FullServerTickHandler extends TimingHandler { - private static final TimingIdentifier IDENTITY = new TimingIdentifier("Minecraft", "Full Server Tick", null); @@ -98,10 +101,10 @@ index 36b8fe86335df851f9c85d6bb2a91368b4d945d1..00000000000000000000000000000000 -} diff --git a/src/main/java/co/aikar/timings/NullTimingHandler.java b/src/main/java/co/aikar/timings/NullTimingHandler.java deleted file mode 100644 -index 81671cf40feeed2844ee8d92348d48062aaf2c46..0000000000000000000000000000000000000000 +index 42e7e712403676171d34d5f2be27e48e7a071ebd..0000000000000000000000000000000000000000 --- a/src/main/java/co/aikar/timings/NullTimingHandler.java +++ /dev/null -@@ -1,69 +0,0 @@ +@@ -1,72 +0,0 @@ -/* - * This file is licensed under the MIT License (MIT). - * @@ -130,6 +133,9 @@ index 81671cf40feeed2844ee8d92348d48062aaf2c46..00000000000000000000000000000000 -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - +-/** +- * @deprecated Timings will be removed in the future +- */ -@Deprecated(forRemoval = true) -public final class NullTimingHandler implements Timing { - public static final Timing NULL = new NullTimingHandler(); @@ -173,10 +179,10 @@ index 81671cf40feeed2844ee8d92348d48062aaf2c46..00000000000000000000000000000000 -} diff --git a/src/main/java/co/aikar/timings/TimedEventExecutor.java b/src/main/java/co/aikar/timings/TimedEventExecutor.java deleted file mode 100644 -index 8f29c1561ba5916cb5634392edd8bd2a5a294a51..0000000000000000000000000000000000000000 +index 157617933a772451f6c073d97afaf305769b4d40..0000000000000000000000000000000000000000 --- a/src/main/java/co/aikar/timings/TimedEventExecutor.java +++ /dev/null -@@ -1,90 +0,0 @@ +@@ -1,93 +0,0 @@ -/* - * This file is licensed under the MIT License (MIT). - * @@ -213,6 +219,9 @@ index 8f29c1561ba5916cb5634392edd8bd2a5a294a51..00000000000000000000000000000000 -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - +-/** +- * @deprecated Timings will be removed in the future +- */ -@Deprecated(forRemoval = true) -public class TimedEventExecutor implements EventExecutor { - @@ -269,7 +278,7 @@ index 8f29c1561ba5916cb5634392edd8bd2a5a294a51..00000000000000000000000000000000 -} diff --git a/src/main/java/co/aikar/timings/Timing.java b/src/main/java/co/aikar/timings/Timing.java deleted file mode 100644 -index 7514fad26f955329f8bf17ff17db75f0c8301ee5..0000000000000000000000000000000000000000 +index 4195efcfe044618052bb03dea34a4fb2ca7c44f0..0000000000000000000000000000000000000000 --- a/src/main/java/co/aikar/timings/Timing.java +++ /dev/null @@ -1,86 +0,0 @@ @@ -304,7 +313,7 @@ index 7514fad26f955329f8bf17ff17db75f0c8301ee5..00000000000000000000000000000000 -/** - * Provides an ability to time sections of code within the Minecraft Server - * -- * @deprecated Timings will likely be replaced with Spark in the future +- * @deprecated Timings will be removed in the future - */ -@Deprecated(forRemoval = true) -public interface Timing extends AutoCloseable { @@ -720,10 +729,11 @@ index 199789d56d22fcb1b77ebd56805cc28aa5a5ab0a..00000000000000000000000000000000 - } -} diff --git a/src/main/java/co/aikar/timings/TimingHistory.java b/src/main/java/co/aikar/timings/TimingHistory.java -index 2d87237ea99d42c6ce896d52a1b2e5c3ec4d4568..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 +deleted file mode 100644 +index 6f6eb1a2e6c8d49014a7ae44540ee282bae5200e..0000000000000000000000000000000000000000 --- a/src/main/java/co/aikar/timings/TimingHistory.java -+++ b/src/main/java/co/aikar/timings/TimingHistory.java -@@ -1,352 +0,0 @@ ++++ /dev/null +@@ -1,357 +0,0 @@ -/* - * This file is licensed under the MIT License (MIT). - * @@ -776,6 +786,11 @@ index 2d87237ea99d42c6ce896d52a1b2e5c3ec4d4568..e69de29bb2d1d6434b8b29ae775ad8c2 -import static co.aikar.timings.TimingsManager.MINUTE_REPORTS; -import static co.aikar.util.JSONUtil.*; - +-/** +- * Internal. +- * +- * @deprecated Timings will be removed in the future +- */ -@Deprecated(forRemoval = true) -@SuppressWarnings({"deprecation", "SuppressionAnnotation", "Convert2Lambda", "Anonymous2MethodRef"}) -public class TimingHistory { @@ -1264,10 +1279,10 @@ index df142a89b8c43acb81eb383eac0ef048a1f49a6e..00000000000000000000000000000000 -} diff --git a/src/main/java/co/aikar/timings/Timings.java b/src/main/java/co/aikar/timings/Timings.java deleted file mode 100644 -index 9812d668ad945aba486fbf6d5bf83c4292cb5d03..0000000000000000000000000000000000000000 +index e81d0bc309de877ed2b5da6122f55c162e9b5f10..0000000000000000000000000000000000000000 --- a/src/main/java/co/aikar/timings/Timings.java +++ /dev/null -@@ -1,337 +0,0 @@ +@@ -1,331 +0,0 @@ -/* - * This file is licensed under the MIT License (MIT). - * @@ -1311,7 +1326,7 @@ index 9812d668ad945aba486fbf6d5bf83c4292cb5d03..00000000000000000000000000000000 -import org.jetbrains.annotations.Nullable; - -/** -- * @deprecated Timings will likely be replaced with Spark in the future +- * @deprecated Timings will be removed in the future - */ -@Deprecated(forRemoval = true) -@SuppressWarnings({"UnusedDeclaration", "WeakerAccess", "SameParameterValue"}) @@ -1429,23 +1444,17 @@ index 9812d668ad945aba486fbf6d5bf83c4292cb5d03..00000000000000000000000000000000 - - public static Component deprecationMessage() { - return Component.text() -- .color(TextColor.color(0xf3ef91)) +- .color(TextColor.color(0xffc93a)) - .append(Component.text("[!] The timings profiler has been enabled but has been scheduled for removal from Paper in the future.")) - .append(Component.newline()) -- .append( -- Component.text(" We recommend installing the spark profiler as a replacement: ") -- .append( -- Component.text() -- .content("https://spark.lucko.me/") -- .clickEvent(ClickEvent.openUrl("https://spark.lucko.me/"))) -- ) +- .append(Component.text(" We recommend migrating to the spark profiler.")) - .append(Component.newline()) - .append( - Component.text(" For more information please visit: ") - .append( - Component.text() -- .content("https://github.com/PaperMC/Paper/issues/8948") -- .clickEvent(ClickEvent.openUrl("https://github.com/PaperMC/Paper/issues/8948"))) +- .content("https://github.com/PaperMC/Paper/discussions/10565") +- .clickEvent(ClickEvent.openUrl("https://github.com/PaperMC/Paper/discussions/10565"))) - ) - .build(); - } @@ -1607,10 +1616,10 @@ index 9812d668ad945aba486fbf6d5bf83c4292cb5d03..00000000000000000000000000000000 - diff --git a/src/main/java/co/aikar/timings/TimingsCommand.java b/src/main/java/co/aikar/timings/TimingsCommand.java deleted file mode 100644 -index e801e79fa57c44b2e5d359647c920f88064826f1..0000000000000000000000000000000000000000 +index 95d87c9dbf2b237787294dfbe7fed87a36e6dedf..0000000000000000000000000000000000000000 --- a/src/main/java/co/aikar/timings/TimingsCommand.java +++ /dev/null -@@ -1,124 +0,0 @@ +@@ -1,126 +0,0 @@ -/* - * This file is licensed under the MIT License (MIT). - * @@ -1649,7 +1658,9 @@ index e801e79fa57c44b2e5d359647c920f88064826f1..00000000000000000000000000000000 - -import static net.kyori.adventure.text.Component.text; - -- +-/** +- * @deprecated Timings will be removed in the future +- */ -@Deprecated(forRemoval = true) -public class TimingsCommand extends BukkitCommand { - private static final List TIMINGS_SUBCOMMANDS = ImmutableList.of("report", "reset", "on", "off", "paste", "verbon", "verboff"); @@ -1737,7 +1748,7 @@ index e801e79fa57c44b2e5d359647c920f88064826f1..00000000000000000000000000000000 -} diff --git a/src/main/java/co/aikar/timings/TimingsManager.java b/src/main/java/co/aikar/timings/TimingsManager.java deleted file mode 100644 -index 5e1558ca3ffeeaf2645fa003965474a442d650bf..0000000000000000000000000000000000000000 +index e72ad05abada04426e32a73d02b21cb69079d268..0000000000000000000000000000000000000000 --- a/src/main/java/co/aikar/timings/TimingsManager.java +++ /dev/null @@ -1,192 +0,0 @@ @@ -1783,7 +1794,7 @@ index 5e1558ca3ffeeaf2645fa003965474a442d650bf..00000000000000000000000000000000 -import org.jetbrains.annotations.Nullable; - -/** -- * @deprecated Timings will likely be replaced with Spark in the future +- * @deprecated Timings will be removed in the future - */ -@Deprecated(forRemoval = true) -public final class TimingsManager { @@ -1935,10 +1946,10 @@ index 5e1558ca3ffeeaf2645fa003965474a442d650bf..00000000000000000000000000000000 -} diff --git a/src/main/java/co/aikar/timings/TimingsReportListener.java b/src/main/java/co/aikar/timings/TimingsReportListener.java deleted file mode 100644 -index 3af5b8ea795311582044c712de50d29412024b77..0000000000000000000000000000000000000000 +index df066d6f8d55afbc0c1897c486d638657a5f8df9..0000000000000000000000000000000000000000 --- a/src/main/java/co/aikar/timings/TimingsReportListener.java +++ /dev/null -@@ -1,87 +0,0 @@ +@@ -1,90 +0,0 @@ -package co.aikar.timings; - -import com.google.common.base.Preconditions; @@ -1953,6 +1964,9 @@ index 3af5b8ea795311582044c712de50d29412024b77..00000000000000000000000000000000 - -import java.util.List; - +-/** +- * @deprecated Timings will be removed in the future +- */ -@Deprecated(forRemoval = true) -@SuppressWarnings("WeakerAccess") -public class TimingsReportListener implements net.kyori.adventure.audience.ForwardingAudience, MessageCommandSender { @@ -2086,19 +2100,28 @@ index 632c4961515f5052551f841cfa840e60bba7a257..00000000000000000000000000000000 - } -} diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java -index c7cdc2ad8a2c43e8c0fcaa1761d3b81726c5ebcb..3ab75d571be4032e1bcfc5bb38168b81af63f0ad 100644 +index 0a26fffe9b1e5080b5639767a03af11006108b4a..3b73c0e59788f5f49ca2423032550f11855d52ae 100644 --- a/src/main/java/org/bukkit/command/Command.java +++ b/src/main/java/org/bukkit/command/Command.java -@@ -33,7 +33,6 @@ public abstract class Command { +@@ -33,16 +33,6 @@ public abstract class Command { protected String usageMessage; private String permission; private net.kyori.adventure.text.Component permissionMessage; // Paper +- /** +- * @deprecated Timings will be removed in the future +- */ +- @Deprecated(forRemoval = true) - public co.aikar.timings.Timing timings; // Paper - @NotNull public String getTimingName() {return getName();} // Paper +- /** +- * @deprecated Timings will be removed in the future +- */ +- @Deprecated(forRemoval = true) +- @NotNull public String getTimingName() {return getName();} // Paper protected Command(@NotNull String name) { + this(name, "", "/" + name, new ArrayList()); diff --git a/src/main/java/org/bukkit/command/FormattedCommandAlias.java b/src/main/java/org/bukkit/command/FormattedCommandAlias.java -index abe256e1e45ce28036da4aa1586715bc8a1a3414..b359306500e640f4b0761ae9aa996cf64e4fe63f 100644 +index abe256e1e45ce28036da4aa1586715bc8a1a3414..9eab8024e0675865f17669847759a26d28f74f3a 100644 --- a/src/main/java/org/bukkit/command/FormattedCommandAlias.java +++ b/src/main/java/org/bukkit/command/FormattedCommandAlias.java @@ -12,7 +12,6 @@ public class FormattedCommandAlias extends Command { @@ -2109,6 +2132,17 @@ index abe256e1e45ce28036da4aa1586715bc8a1a3414..b359306500e640f4b0761ae9aa996cf6 this.formatStrings = formatStrings; } +@@ -120,10 +119,6 @@ public class FormattedCommandAlias extends Command { + return formatString.trim(); // Paper - Causes an extra space at the end, breaks with brig commands + } + +- @NotNull +- @Override // Paper +- public String getTimingName() {return "Command Forwarder - " + super.getTimingName();} // Paper +- + private static boolean inRange(int i, int j, int k) { + return i >= j && i <= k; + } diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java index 5df19bd701c67506689fc7f49d91f99ebfbc83f0..940565704d0e8914a76cf25daf7d1f5ecd99bad4 100644 --- a/src/main/java/org/bukkit/command/SimpleCommandMap.java diff --git a/patches/server/0001-Build-changes.patch b/patches/server/0001-Build-changes.patch index 70640780..497c446c 100644 --- a/patches/server/0001-Build-changes.patch +++ b/patches/server/0001-Build-changes.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Build changes diff --git a/build.gradle.kts b/build.gradle.kts -index 1a734293c9416f13324bb0edf8f950c9029f8bc4..d0caefc335e85afede34ad3b804bd6996fa0181c 100644 +index 421f6b3dc8890d63d2e7aa774d0bf8f7e15890ab..cf8a410dedf26e48617ccad7e899edc26cf5f7c9 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -13,7 +13,7 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) { @@ -17,7 +17,7 @@ index 1a734293c9416f13324bb0edf8f950c9029f8bc4..d0caefc335e85afede34ad3b804bd699 // Paper start implementation("org.jline:jline-terminal-jansi:3.21.0") implementation("net.minecrell:terminalconsoleappender:1.3.0") -@@ -67,6 +67,15 @@ paperweight { +@@ -71,6 +71,15 @@ paperweight { craftBukkitPackageVersion.set("v1_21_R1") // also needs to be updated in MappingEnvironment } @@ -33,7 +33,7 @@ index 1a734293c9416f13324bb0edf8f950c9029f8bc4..d0caefc335e85afede34ad3b804bd699 tasks.jar { archiveClassifier.set("dev") -@@ -80,14 +89,14 @@ tasks.jar { +@@ -84,14 +93,14 @@ tasks.jar { val gitBranch = git("rev-parse", "--abbrev-ref", "HEAD").getText().trim() // Paper attributes( "Main-Class" to "org.bukkit.craftbukkit.Main", @@ -53,7 +53,7 @@ index 1a734293c9416f13324bb0edf8f950c9029f8bc4..d0caefc335e85afede34ad3b804bd699 "Build-Number" to (build ?: ""), "Build-Time" to Instant.now().toString(), "Git-Branch" to gitBranch, // Paper -@@ -144,7 +153,7 @@ fun TaskContainer.registerRunTask( +@@ -148,7 +157,7 @@ fun TaskContainer.registerRunTask( name: String, block: JavaExec.() -> Unit ): TaskProvider = register(name) { @@ -62,7 +62,7 @@ index 1a734293c9416f13324bb0edf8f950c9029f8bc4..d0caefc335e85afede34ad3b804bd699 mainClass.set("org.bukkit.craftbukkit.Main") standardInput = System.`in` workingDir = rootProject.layout.projectDirectory -@@ -213,13 +222,13 @@ tasks.registerRunTask("runReobfBundler") { +@@ -217,13 +226,13 @@ tasks.registerRunTask("runReobfBundler") { classpath(rootProject.tasks.named("createReobfBundlerJar").flatMap { it.outputZip }) mainClass.set(null as String?) } @@ -184,10 +184,10 @@ index 790bad0494454ca12ee152e3de6da3da634d9b20..c060857cb0551fff8f5033553b887f3a private static final String BUILD_DEV = "DEV"; diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 57e84cf2219d28c37e4c042371afddf585334954..56b030a8dc0a335a88179e49d9165e0e9310420f 100644 +index 9325d6f95165a7cee00d7de736af723681cc16b4..b5a216dbf3f73c32ac4e930a694527dc13df0b5d 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1241,7 +1241,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop implements ServerInfo, ChunkIOErrorReporter, CommandSource, AutoCloseable, ca.spottedleaf.moonrise.patches.chunk_system.server.ChunkSystemMinecraftServer { // Paper - rewrite chunk system private static MinecraftServer SERVER; // Paper -@@ -1036,7 +1031,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop { entityplayer.connection.suspendFlushing(); }); @@ -892,7 +892,7 @@ index 56b030a8dc0a335a88179e49d9165e0e9310420f..478ff73542685c99f30b7c500f79ba6f // Paper start - Folia scheduler API ((io.papermc.paper.threadedregions.scheduler.FoliaGlobalRegionScheduler) Bukkit.getGlobalRegionScheduler()).tick(); getAllLevels().forEach(level -> { -@@ -1736,21 +1724,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop("createMojmapBundlerJar").flatMap { it.outputZip }) diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index 29d61b407762504dffc26f3048a17327592d9b4a..ec9ade19778c71561b4045ade5ab6cd090768547 100644 +index a108ebfe472c908e86e0af2cfd9cb63083f58eb5..f97b2cb3ea855e6e250cabf357a050cd52be8f70 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -@@ -236,6 +236,9 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface - io.papermc.paper.command.PaperCommands.registerCommands(this); // Paper - setup /paper command +@@ -238,6 +238,9 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface + this.server.spark.registerCommandBeforePlugins(this.server); // Paper - spark com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // Paper - load version history now + org.leavesmc.leaves.LeavesConfig.init((java.io.File) options.valueOf("leaves-settings")); // Leaves - Server Config @@ -38,10 +38,10 @@ index 29d61b407762504dffc26f3048a17327592d9b4a..ec9ade19778c71561b4045ade5ab6cd0 this.setPvpAllowed(dedicatedserverproperties.pvp); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 3a91faeb6957e4e783b1de3e1145e7d1d164a857..40851fac8f0d4153d9e56d19fb79eea4a528da8f 100644 +index c8b82bc41f2042bb4b067f06265a3a22e51f7629..a02aafe76e1bd09e0f62a4b0bed648553ef92d47 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1096,6 +1096,7 @@ public final class CraftServer implements Server { +@@ -1098,6 +1098,7 @@ public final class CraftServer implements Server { playerMetadata.removeAll(plugin); } // Paper end @@ -49,7 +49,7 @@ index 3a91faeb6957e4e783b1de3e1145e7d1d164a857..40851fac8f0d4153d9e56d19fb79eea4 this.reloadData(); org.spigotmc.SpigotConfig.registerCommands(); // Spigot io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper -@@ -2986,6 +2987,14 @@ public final class CraftServer implements Server { +@@ -2990,6 +2991,14 @@ public final class CraftServer implements Server { { return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console); } @@ -65,7 +65,7 @@ index 3a91faeb6957e4e783b1de3e1145e7d1d164a857..40851fac8f0d4153d9e56d19fb79eea4 @Override public void restart() { diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index c2e2e0ea5f2bb8204cb698db7904b0f863d2506f..3f660dabd01087373a41f2eec949a6a1e49926ac 100644 +index c2c421b1caf76b40542fdc436801accbe97a38cb..29f139fb4d70a9a362ac0a30579eb0b47676cbf6 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -168,6 +168,14 @@ public class Main { diff --git a/patches/server/0007-Leaves-Protocol-Core.patch b/patches/server/0007-Leaves-Protocol-Core.patch index 36c60412..61432287 100644 --- a/patches/server/0007-Leaves-Protocol-Core.patch +++ b/patches/server/0007-Leaves-Protocol-Core.patch @@ -47,10 +47,10 @@ index 1967c43ee3a12e63365cc40ee6565307e2fd73cf..6e376d0db5321d8e9b6e0b54617ffd17 assert isValidPath(path); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 478ff73542685c99f30b7c500f79ba6f4f10ec7e..fc8bbbf40c1d74dbb03bcf699a000337a653b4b2 100644 +index e5dd0fdcf0e54b9d972880b336fea46d396a56e4..bac0a69424c0370055c2a0ebfbf711c5e8a3db4c 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1803,6 +1803,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop> set = (Set) playerAdvancements.criterionData.get(this); // Paper - fix AdvancementDataPlayer leak if (set != null && !set.isEmpty()) { diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index fc8bbbf40c1d74dbb03bcf699a000337a653b4b2..471ded84bdd3e59a75cfa34aac16bb726f80ba28 100644 +index bac0a69424c0370055c2a0ebfbf711c5e8a3db4c..e50fa6eb2716785fcfeab935e3e6c5b97eb5eae5 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -745,6 +745,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop= world.paperConfig().entities.behavior.playerInsomniaStartTicks) { // Paper - Ability to control player's insomnia and phantoms BlockPos blockposition1 = blockposition.above(20 + randomsource.nextInt(15)).east(-10 + randomsource.nextInt(21)).south(-10 + randomsource.nextInt(21)); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index fbefffa0c43419e77ec8430db37698befc85837c..9739ec88134c810c0d13b23a9c8ac75d78d319f1 100644 +index 7bd4373071204f13985e92bd64f6533cf43f39b5..47a3ba54cb0ffbbe6713f19db6f9396e5b75c89a 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -309,6 +309,7 @@ public final class CraftServer implements Server { - public static Exception excessiveVelEx; // Paper - Velocity warnings +@@ -310,6 +310,7 @@ public final class CraftServer implements Server { private final io.papermc.paper.logging.SysoutCatcher sysoutCatcher = new io.papermc.paper.logging.SysoutCatcher(); // Paper private final io.papermc.paper.potion.PaperPotionBrewer potionBrewer; // Paper - Custom Potion Mixes + public final io.papermc.paper.SparksFly spark; // Paper - spark + private final org.leavesmc.leaves.entity.CraftBotManager botManager = new org.leavesmc.leaves.entity.CraftBotManager(); // Leaves // Paper start - Folia region threading API private final io.papermc.paper.threadedregions.scheduler.FallbackRegionScheduler regionizedScheduler = new io.papermc.paper.threadedregions.scheduler.FallbackRegionScheduler(); -@@ -1459,7 +1460,7 @@ public final class CraftServer implements Server { +@@ -1463,7 +1464,7 @@ public final class CraftServer implements Server { return false; } @@ -403,7 +403,7 @@ index fbefffa0c43419e77ec8430db37698befc85837c..9739ec88134c810c0d13b23a9c8ac75d return false; } -@@ -3225,4 +3226,11 @@ public final class CraftServer implements Server { +@@ -3229,4 +3230,11 @@ public final class CraftServer implements Server { return this.potionBrewer; } // Paper end diff --git a/patches/server/0018-No-chat-sign.patch b/patches/server/0018-No-chat-sign.patch index 716dc6f5..f98fa4cd 100644 --- a/patches/server/0018-No-chat-sign.patch +++ b/patches/server/0018-No-chat-sign.patch @@ -107,10 +107,10 @@ index 5705cb920084b775cce4b361683b32c6b6e003ed..cbff868303d751d09b68f431c78bb13b } } diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index ec9ade19778c71561b4045ade5ab6cd090768547..2068081a072a0298e95fe40d67e020bf2331f093 100644 +index f97b2cb3ea855e6e250cabf357a050cd52be8f70..a80b7dfb5de950d0ebacfc041f903ed3322f77c9 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -@@ -666,7 +666,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface +@@ -668,7 +668,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface // Paper start - Add setting for proxy online mode status return dedicatedserverproperties.enforceSecureProfile && io.papermc.paper.configuration.GlobalConfiguration.get().proxies.isProxyOnlineMode() diff --git a/patches/server/0024-Config-to-disable-method-profiler.patch b/patches/server/0024-Config-to-disable-method-profiler.patch index 421ab77a..e39d7264 100644 --- a/patches/server/0024-Config-to-disable-method-profiler.patch +++ b/patches/server/0024-Config-to-disable-method-profiler.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Config to disable method profiler This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish) diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 471ded84bdd3e59a75cfa34aac16bb726f80ba28..30c2612260be88c68d94ba483add96bfe06243bd 100644 +index e50fa6eb2716785fcfeab935e3e6c5b97eb5eae5..a0e4e96addc467c6816ebb42263d5ddd1e2e8ff3 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -2551,6 +2551,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop { +@@ -77,6 +77,7 @@ tasks.withType { compilerArgs.add("-Xlint:-module") compilerArgs.add("-Xlint:-removal") compilerArgs.add("-Xlint:-dep-ann") @@ -16,7 +16,7 @@ index 268193499b9f1fae0c01963e8004a3e7422f77ca..b35bc56ca35e7ada015e011ab4c3136b } // Leaves end - hide irrelevant compilation warnings -@@ -182,6 +183,8 @@ fun TaskContainer.registerRunTask( +@@ -186,6 +187,8 @@ fun TaskContainer.registerRunTask( minHeapSize = "${memoryGb}G" maxHeapSize = "${memoryGb}G" diff --git a/patches/server/0081-Disable-packet-limit.patch b/patches/server/0081-Disable-packet-limit.patch index bc50930f..9372543b 100644 --- a/patches/server/0081-Disable-packet-limit.patch +++ b/patches/server/0081-Disable-packet-limit.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Disable packet limit diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java -index 0a3f2f5b474910af3cabf3bab5310c0e970aed68..14239b07c85db85de2b76d83d2d1b573ce4cdf8a 100644 +index 5a05d42634e82b8667aac0ca4071d6d71d753090..838df558d4bdeda2a8faacda1c16999b942388fe 100644 --- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java -@@ -267,7 +267,7 @@ public class GlobalConfiguration extends ConfigurationPart { +@@ -274,7 +274,7 @@ public class GlobalConfiguration extends ConfigurationPart { } public boolean isEnabled() { diff --git a/patches/server/0097-Replay-Mod-API.patch b/patches/server/0097-Replay-Mod-API.patch index 9568a4f7..78200e07 100644 --- a/patches/server/0097-Replay-Mod-API.patch +++ b/patches/server/0097-Replay-Mod-API.patch @@ -108,10 +108,10 @@ index c8d39e6e1c570c9219f6066da273dc0130920519..96a074281d16a7f64058619da4b102f3 if (((List) object).size() >= i) { return (List) object; diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 1a4a3a54a9eb397b20d83dd603a38c9366fda8a7..19c0b7b95fb96978853f05ee1c6829613103acff 100644 +index d45c979b37b157482f7ad04b4fe2b2d26f1581f0..8d07bfa8709bb1d522672df739ea8c794c4cfe05 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1685,7 +1685,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop builder = ImmutableMap.builder(); BiConsumer biConsumer = builder::put; diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index 2068081a072a0298e95fe40d67e020bf2331f093..59df97cf46923d3b84179a9407e210de9a2f3658 100644 +index a80b7dfb5de950d0ebacfc041f903ed3322f77c9..fc45960fb9fe03323b5f6e9733bf9c7665dba5b7 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -@@ -238,6 +238,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface +@@ -240,6 +240,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface org.leavesmc.leaves.LeavesConfig.init((java.io.File) options.valueOf("leaves-settings")); // Leaves - Server Config System.setProperty("spark.serverconfigs.extra", "leaves.yml"); // Leaves - spark config diff --git a/patches/server/0107-Disable-offline-warn-if-use-proxy.patch b/patches/server/0107-Disable-offline-warn-if-use-proxy.patch index fd9e1d8d..6537bb09 100644 --- a/patches/server/0107-Disable-offline-warn-if-use-proxy.patch +++ b/patches/server/0107-Disable-offline-warn-if-use-proxy.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Disable offline warn if use proxy diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index 59df97cf46923d3b84179a9407e210de9a2f3658..ecf6bad6e19a67ac122555bba7a8f9a42eed4e52 100644 +index fc45960fb9fe03323b5f6e9733bf9c7665dba5b7..18f053785df042c41f88341bb3c0f647beb52ebe 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -@@ -300,7 +300,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface +@@ -302,7 +302,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface String proxyFlavor = (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.velocity.enabled) ? "Velocity" : "BungeeCord"; String proxyLink = (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.velocity.enabled) ? "https://docs.papermc.io/velocity/security" : "http://www.spigotmc.org/wiki/firewall-guide/"; // Paper end - Add Velocity IP Forwarding Support diff --git a/patches/server/0120-Fast-resume.patch b/patches/server/0120-Fast-resume.patch index 2884aac9..7d574507 100644 --- a/patches/server/0120-Fast-resume.patch +++ b/patches/server/0120-Fast-resume.patch @@ -59,7 +59,7 @@ index 58d3d1a47e9f2423c467bb329c2d5f4b58a8b5ef..ea1ffe6b5e49ccf2b472829ed97e977b return this.removeTicketAtLevel(type, CoordinateUtils.getChunkKey(chunkPos), level, identifier); } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 19c0b7b95fb96978853f05ee1c6829613103acff..3f544556ba256d0a39fe9e1098a2e8ede5d27996 100644 +index 8d07bfa8709bb1d522672df739ea8c794c4cfe05..3842333958a2e62f8c84261fdbd297bbbb0c745a 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -747,6 +747,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop