diff --git a/patches/server/0012-Add-more-metrics.patch b/patches/server/0011-Add-more-metrics.patch similarity index 100% rename from patches/server/0012-Add-more-metrics.patch rename to patches/server/0011-Add-more-metrics.patch diff --git a/patches/server/0011-Always-agree-EULA-on-development-mode.patch b/patches/server/0011-Always-agree-EULA-on-development-mode.patch deleted file mode 100644 index 52fdd77..0000000 --- a/patches/server/0011-Always-agree-EULA-on-development-mode.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: AlphaKR93 -Date: Sun, 5 Nov 2023 10:13:14 +0900 -Subject: [PATCH] Always agree EULA on development mode - - -diff --git a/build.gradle.kts b/build.gradle.kts -index a40dc8b2560b8cd124d961f3dfd5865efd2a3b9e..b732a760e6a091d24afce1305a367700db55b71f 100644 ---- a/build.gradle.kts -+++ b/build.gradle.kts -@@ -164,7 +164,7 @@ fun TaskContainer.registerRunTask( - languageVersion.set(JavaLanguageVersion.of(21)) - vendor.set(JvmVendorSpec.JETBRAINS) - }) -- jvmArgs("-XX:+AllowEnhancedClassRedefinition", "-XX:+AllowRedefinitionToAddDeleteMethods") -+ jvmArgs("-DPlazma.DevelopmentEnvironment", "-XX:+AllowEnhancedClassRedefinition", "-XX:+AllowRedefinitionToAddDeleteMethods") // Plazma - Always agree EULA on development mode - - if (rootProject.childProjects["test-plugin"] != null) { - val testPluginJar = rootProject.project(":test-plugin").tasks.jar.flatMap { it.archiveFile } -diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java -index fc378b08c10c7f670be93d52937c7642b986ed0d..05e760162ebbf3475129001b4e9de951e0e142d4 100644 ---- a/src/main/java/net/minecraft/server/Main.java -+++ b/src/main/java/net/minecraft/server/Main.java -@@ -181,6 +181,7 @@ public class Main { - - // Spigot Start - boolean eulaAgreed = Boolean.getBoolean( "com.mojang.eula.agree" ); -+ eulaAgreed = eulaAgreed || Boolean.getBoolean("Paper.pushPaperAssetsRoot"); // Plazma - Always agree EULA on development mode - if ( eulaAgreed ) - { - System.err.println( "You have used the Spigot command line EULA agreement flag." ); diff --git a/patches/server/0013-Optimize-default-configurations.patch b/patches/server/0012-Optimize-default-configurations.patch similarity index 99% rename from patches/server/0013-Optimize-default-configurations.patch rename to patches/server/0012-Optimize-default-configurations.patch index 23372a2..911f65a 100644 --- a/patches/server/0013-Optimize-default-configurations.patch +++ b/patches/server/0012-Optimize-default-configurations.patch @@ -307,7 +307,7 @@ index 24763d3d270c29c95e0b3e85111145234f660a62..80ddc627e02e3c749e6b074afa93d357 } diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java -index 05e760162ebbf3475129001b4e9de951e0e142d4..363ef48b096281132cea61aff405a50d7b51c4d4 100644 +index fc378b08c10c7f670be93d52937c7642b986ed0d..9a436132faa04efbf25d8be9d5488e13f2111dac 100644 --- a/src/main/java/net/minecraft/server/Main.java +++ b/src/main/java/net/minecraft/server/Main.java @@ -166,7 +166,7 @@ public class Main { diff --git a/patches/server/0014-Add-an-option-to-apply-the-configuration-to-the-vani.patch b/patches/server/0013-Add-an-option-to-apply-the-configuration-to-the-vani.patch similarity index 100% rename from patches/server/0014-Add-an-option-to-apply-the-configuration-to-the-vani.patch rename to patches/server/0013-Add-an-option-to-apply-the-configuration-to-the-vani.patch diff --git a/patches/server/0015-Tweak-console-logging.patch b/patches/server/0014-Tweak-console-logging.patch similarity index 100% rename from patches/server/0015-Tweak-console-logging.patch rename to patches/server/0014-Tweak-console-logging.patch diff --git a/patches/server/0016-Add-missing-Pufferfish-configurations.patch b/patches/server/0015-Add-missing-Pufferfish-configurations.patch similarity index 100% rename from patches/server/0016-Add-missing-Pufferfish-configurations.patch rename to patches/server/0015-Add-missing-Pufferfish-configurations.patch diff --git a/patches/server/0017-Add-missing-Purpur-configuration-options.patch b/patches/server/0016-Add-missing-Purpur-configuration-options.patch similarity index 100% rename from patches/server/0017-Add-missing-Purpur-configuration-options.patch rename to patches/server/0016-Add-missing-Purpur-configuration-options.patch diff --git a/patches/server/0018-Add-option-to-change-nether-portal-size.patch b/patches/server/0017-Add-option-to-change-nether-portal-size.patch similarity index 100% rename from patches/server/0018-Add-option-to-change-nether-portal-size.patch rename to patches/server/0017-Add-option-to-change-nether-portal-size.patch diff --git a/patches/server/0019-Apply-various-optimizations.patch b/patches/server/0018-Apply-various-optimizations.patch similarity index 100% rename from patches/server/0019-Apply-various-optimizations.patch rename to patches/server/0018-Apply-various-optimizations.patch diff --git a/patches/server/0020-Do-not-load-chunks-to-spawn-phantom.patch b/patches/server/0019-Do-not-load-chunks-to-spawn-phantom.patch similarity index 100% rename from patches/server/0020-Do-not-load-chunks-to-spawn-phantom.patch rename to patches/server/0019-Do-not-load-chunks-to-spawn-phantom.patch diff --git a/patches/server/0021-Add-option-to-disable-moved-to-quickly-check-for-spe.patch b/patches/server/0020-Add-option-to-disable-moved-to-quickly-check-for-spe.patch similarity index 100% rename from patches/server/0021-Add-option-to-disable-moved-to-quickly-check-for-spe.patch rename to patches/server/0020-Add-option-to-disable-moved-to-quickly-check-for-spe.patch diff --git a/patches/server/0022-Configurable-cave-lava-sea-level.patch b/patches/server/0021-Configurable-cave-lava-sea-level.patch similarity index 100% rename from patches/server/0022-Configurable-cave-lava-sea-level.patch rename to patches/server/0021-Configurable-cave-lava-sea-level.patch diff --git a/patches/server/0023-Configurable-entity-sensor-tick.patch b/patches/server/0022-Configurable-entity-sensor-tick.patch similarity index 100% rename from patches/server/0023-Configurable-entity-sensor-tick.patch rename to patches/server/0022-Configurable-entity-sensor-tick.patch diff --git a/patches/server/0024-Variable-entity-wakeup-duration.patch b/patches/server/0023-Variable-entity-wakeup-duration.patch similarity index 100% rename from patches/server/0024-Variable-entity-wakeup-duration.patch rename to patches/server/0023-Variable-entity-wakeup-duration.patch diff --git a/patches/server/0025-Skip-event-if-no-listeners.patch b/patches/server/0024-Skip-event-if-no-listeners.patch similarity index 100% rename from patches/server/0025-Skip-event-if-no-listeners.patch rename to patches/server/0024-Skip-event-if-no-listeners.patch diff --git a/patches/server/0026-Add-entity-spawn-deadlock-timer.patch b/patches/server/0025-Add-entity-spawn-deadlock-timer.patch similarity index 100% rename from patches/server/0026-Add-entity-spawn-deadlock-timer.patch rename to patches/server/0025-Add-entity-spawn-deadlock-timer.patch diff --git a/patches/server/0027-Lithium-HashedList.patch b/patches/server/0026-Lithium-HashedList.patch similarity index 100% rename from patches/server/0027-Lithium-HashedList.patch rename to patches/server/0026-Lithium-HashedList.patch diff --git a/patches/server/0028-Improve-SwingTime-ticking.patch b/patches/server/0027-Improve-SwingTime-ticking.patch similarity index 100% rename from patches/server/0028-Improve-SwingTime-ticking.patch rename to patches/server/0027-Improve-SwingTime-ticking.patch diff --git a/patches/server/0029-Save-Json-list-asynchronously.patch b/patches/server/0028-Save-Json-list-asynchronously.patch similarity index 100% rename from patches/server/0029-Save-Json-list-asynchronously.patch rename to patches/server/0028-Save-Json-list-asynchronously.patch diff --git a/patches/server/0029-Use-Akair-s-flag-when-running-the-test-server-with-g.patch b/patches/server/0029-Use-Akair-s-flag-when-running-the-test-server-with-g.patch new file mode 100644 index 0000000..afd74f3 --- /dev/null +++ b/patches/server/0029-Use-Akair-s-flag-when-running-the-test-server-with-g.patch @@ -0,0 +1,19 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: AlphaKR93 +Date: Mon, 6 May 2024 12:25:59 +0900 +Subject: [PATCH] Use Akair's flag when running the test server with gradle + + +diff --git a/build.gradle.kts b/build.gradle.kts +index a40dc8b2560b8cd124d961f3dfd5865efd2a3b9e..e4dfd79840913e776a84bacda776329cb32e2be9 100644 +--- a/build.gradle.kts ++++ b/build.gradle.kts +@@ -164,7 +164,7 @@ fun TaskContainer.registerRunTask( + languageVersion.set(JavaLanguageVersion.of(21)) + vendor.set(JvmVendorSpec.JETBRAINS) + }) +- jvmArgs("-XX:+AllowEnhancedClassRedefinition", "-XX:+AllowRedefinitionToAddDeleteMethods") ++ jvmArgs("-XX:+AllowEnhancedClassRedefinition", "-XX:+AllowRedefinitionToAddDeleteMethods", "--add-modules=jdk.incubator.vector", "-XX:+UseG1GC", "-XX:+ParallelRefProcEnabled", "-XX:MaxGCPauseMillis=200", "-XX:+UnlockExperimentalVMOptions", "-XX:+DisableExplicitGC", "-XX:+AlwaysPreTouch", "-XX:G1HeapWastePercent=5", "-XX:G1MixedGCCountTarget=4", "-XX:InitiatingHeapOccupancyPercent=15", "-XX:G1MixedGCLiveThresholdPercent=90", "-XX:G1RSetUpdatingPauseTimePercent=5", "-XX:SurvivorRatio=32", "-XX:+PerfDisableSharedMem", "-XX:MaxTenuringThreshold=1", "-Dusing.aikars.flags=https://mcflags.emc.gs", "-Daikars.new.flags=true", "-XX:G1NewSizePercent=40", "-XX:G1MaxNewSizePercent=50", "-XX:G1HeapRegionSize=16M", "-XX:G1ReservePercent=15") // Plazma - Always agree EULA on development mode; Use Akair's flag when running the test server with gradle + + if (rootProject.childProjects["test-plugin"] != null) { + val testPluginJar = rootProject.project(":test-plugin").tasks.jar.flatMap { it.archiveFile } diff --git a/patches/server/0030-Use-Akair-s-flag-when-running-the-test-server-with-g.patch b/patches/server/0030-Use-Akair-s-flag-when-running-the-test-server-with-g.patch deleted file mode 100644 index ef51eff..0000000 --- a/patches/server/0030-Use-Akair-s-flag-when-running-the-test-server-with-g.patch +++ /dev/null @@ -1,19 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: AlphaKR93 -Date: Mon, 6 May 2024 12:25:59 +0900 -Subject: [PATCH] Use Akair's flag when running the test server with gradle - - -diff --git a/build.gradle.kts b/build.gradle.kts -index b732a760e6a091d24afce1305a367700db55b71f..57eed05e07d0ff36b5a2902554baff49edcbb6a9 100644 ---- a/build.gradle.kts -+++ b/build.gradle.kts -@@ -164,7 +164,7 @@ fun TaskContainer.registerRunTask( - languageVersion.set(JavaLanguageVersion.of(21)) - vendor.set(JvmVendorSpec.JETBRAINS) - }) -- jvmArgs("-DPlazma.DevelopmentEnvironment", "-XX:+AllowEnhancedClassRedefinition", "-XX:+AllowRedefinitionToAddDeleteMethods") // Plazma - Always agree EULA on development mode -+ jvmArgs("-DPlazma.DevelopmentEnvironment", "--add-modules=jdk.incubator.vector", "-XX:+AllowEnhancedClassRedefinition", "-XX:+AllowRedefinitionToAddDeleteMethods", "-XX:+UseG1GC", "-XX:+ParallelRefProcEnabled", "-XX:MaxGCPauseMillis=200", "-XX:+UnlockExperimentalVMOptions", "-XX:+DisableExplicitGC", "-XX:+AlwaysPreTouch", "-XX:G1HeapWastePercent=5", "-XX:G1MixedGCCountTarget=4", "-XX:InitiatingHeapOccupancyPercent=15", "-XX:G1MixedGCLiveThresholdPercent=90", "-XX:G1RSetUpdatingPauseTimePercent=5", "-XX:SurvivorRatio=32", "-XX:+PerfDisableSharedMem", "-XX:MaxTenuringThreshold=1", "-Dusing.aikars.flags=https://mcflags.emc.gs", "-Daikars.new.flags=true", "-XX:G1NewSizePercent=40", "-XX:G1MaxNewSizePercent=50", "-XX:G1HeapRegionSize=16M", "-XX:G1ReservePercent=15") // Plazma - Always agree EULA on development mode; Use Akair's flag when running the test server with gradle - - if (rootProject.childProjects["test-plugin"] != null) { - val testPluginJar = rootProject.project(":test-plugin").tasks.jar.flatMap { it.archiveFile } diff --git a/patches/server/0031-Use-Plazma-logo-instead-if-server-favicon-doesn-t-ex.patch b/patches/server/0030-Use-Plazma-logo-instead-if-server-favicon-doesn-t-ex.patch similarity index 100% rename from patches/server/0031-Use-Plazma-logo-instead-if-server-favicon-doesn-t-ex.patch rename to patches/server/0030-Use-Plazma-logo-instead-if-server-favicon-doesn-t-ex.patch diff --git a/patches/server/0032-Implement-FreedomChat.patch b/patches/server/0031-Implement-FreedomChat.patch similarity index 100% rename from patches/server/0032-Implement-FreedomChat.patch rename to patches/server/0031-Implement-FreedomChat.patch diff --git a/patches/server/0033-Reset-dirty-flag-when-loading-maps-from-the-disk.patch b/patches/server/0032-Reset-dirty-flag-when-loading-maps-from-the-disk.patch similarity index 100% rename from patches/server/0033-Reset-dirty-flag-when-loading-maps-from-the-disk.patch rename to patches/server/0032-Reset-dirty-flag-when-loading-maps-from-the-disk.patch diff --git a/patches/server/0034-Allow-throttling-hopper-checks-if-the-target-contain.patch b/patches/server/0033-Allow-throttling-hopper-checks-if-the-target-contain.patch similarity index 100% rename from patches/server/0034-Allow-throttling-hopper-checks-if-the-target-contain.patch rename to patches/server/0033-Allow-throttling-hopper-checks-if-the-target-contain.patch diff --git a/patches/server/0035-Suppress-errors-from-dirty-attributes.patch b/patches/server/0034-Suppress-errors-from-dirty-attributes.patch similarity index 100% rename from patches/server/0035-Suppress-errors-from-dirty-attributes.patch rename to patches/server/0034-Suppress-errors-from-dirty-attributes.patch diff --git a/patches/server/0036-Implement-Rail-Optimazition.patch b/patches/server/0035-Implement-Rail-Optimazition.patch similarity index 100% rename from patches/server/0036-Implement-Rail-Optimazition.patch rename to patches/server/0035-Implement-Rail-Optimazition.patch diff --git a/patches/server/0037-Load-player-data-asynchronously.patch b/patches/server/0036-Load-player-data-asynchronously.patch similarity index 100% rename from patches/server/0037-Load-player-data-asynchronously.patch rename to patches/server/0036-Load-player-data-asynchronously.patch diff --git a/patches/server/0038-Configurable-RandomSource-factory-provider.patch b/patches/server/0037-Configurable-RandomSource-factory-provider.patch similarity index 100% rename from patches/server/0038-Configurable-RandomSource-factory-provider.patch rename to patches/server/0037-Configurable-RandomSource-factory-provider.patch diff --git a/patches/server/0039-Optimize-advancement-criteria-triggering.patch b/patches/server/0038-Optimize-advancement-criteria-triggering.patch similarity index 100% rename from patches/server/0039-Optimize-advancement-criteria-triggering.patch rename to patches/server/0038-Optimize-advancement-criteria-triggering.patch diff --git a/patches/server/0040-Configurable-water-flowing-speed.patch b/patches/server/0039-Configurable-water-flowing-speed.patch similarity index 100% rename from patches/server/0040-Configurable-water-flowing-speed.patch rename to patches/server/0039-Configurable-water-flowing-speed.patch diff --git a/patches/server/0041-Cleanup-logs.patch b/patches/server/0040-Cleanup-logs.patch similarity index 100% rename from patches/server/0041-Cleanup-logs.patch rename to patches/server/0040-Cleanup-logs.patch diff --git a/patches/server/0042-Completely-remove-timings-implementation.patch b/patches/server/0041-Completely-remove-timings-implementation.patch similarity index 100% rename from patches/server/0042-Completely-remove-timings-implementation.patch rename to patches/server/0041-Completely-remove-timings-implementation.patch diff --git a/patches/server/0043-Remove-persist-isClientSide-flag.patch b/patches/server/0042-Remove-persist-isClientSide-flag.patch similarity index 100% rename from patches/server/0043-Remove-persist-isClientSide-flag.patch rename to patches/server/0042-Remove-persist-isClientSide-flag.patch diff --git a/patches/server/0044-Process-pathfinding-asynchronously.patch b/patches/server/0043-Process-pathfinding-asynchronously.patch similarity index 100% rename from patches/server/0044-Process-pathfinding-asynchronously.patch rename to patches/server/0043-Process-pathfinding-asynchronously.patch diff --git a/patches/server/0045-Implement-alternative-noise-chunk-generator.patch b/patches/server/0044-Implement-alternative-noise-chunk-generator.patch similarity index 100% rename from patches/server/0045-Implement-alternative-noise-chunk-generator.patch rename to patches/server/0044-Implement-alternative-noise-chunk-generator.patch diff --git a/patches/server/0046-Reduce-allocations.patch b/patches/server/0045-Reduce-allocations.patch similarity index 100% rename from patches/server/0046-Reduce-allocations.patch rename to patches/server/0045-Reduce-allocations.patch diff --git a/patches/server/0047-Hashed-rcon-password.patch b/patches/server/0046-Hashed-rcon-password.patch similarity index 100% rename from patches/server/0047-Hashed-rcon-password.patch rename to patches/server/0046-Hashed-rcon-password.patch diff --git a/patches/server/0048-Add-option-to-allow-shoot-fireball.patch b/patches/server/0047-Add-option-to-allow-shoot-fireball.patch similarity index 100% rename from patches/server/0048-Add-option-to-allow-shoot-fireball.patch rename to patches/server/0047-Add-option-to-allow-shoot-fireball.patch diff --git a/patches/server/0049-Remove-Mojang-Profiler-codes.patch b/patches/server/0048-Remove-Mojang-Profiler-codes.patch similarity index 100% rename from patches/server/0049-Remove-Mojang-Profiler-codes.patch rename to patches/server/0048-Remove-Mojang-Profiler-codes.patch diff --git a/patches/server/0050-Completely-remove-Mojang-profiler.patch b/patches/server/0049-Completely-remove-Mojang-profiler.patch similarity index 100% rename from patches/server/0050-Completely-remove-Mojang-profiler.patch rename to patches/server/0049-Completely-remove-Mojang-profiler.patch diff --git a/patches/server/0051-Port-minor-SparklyPaper-patches.patch b/patches/server/0050-Port-minor-SparklyPaper-patches.patch similarity index 100% rename from patches/server/0051-Port-minor-SparklyPaper-patches.patch rename to patches/server/0050-Port-minor-SparklyPaper-patches.patch diff --git a/patches/server/0052-SparklyPaper-Optimize-framed-map-tracker-ticking.patch b/patches/server/0051-SparklyPaper-Optimize-framed-map-tracker-ticking.patch similarity index 100% rename from patches/server/0052-SparklyPaper-Optimize-framed-map-tracker-ticking.patch rename to patches/server/0051-SparklyPaper-Optimize-framed-map-tracker-ticking.patch diff --git a/patches/server/0053-SparklyPaper-Skip-executeTick-check-if-there-s-no-ta.patch b/patches/server/0052-SparklyPaper-Skip-executeTick-check-if-there-s-no-ta.patch similarity index 100% rename from patches/server/0053-SparklyPaper-Skip-executeTick-check-if-there-s-no-ta.patch rename to patches/server/0052-SparklyPaper-Skip-executeTick-check-if-there-s-no-ta.patch diff --git a/patches/server/0054-SparklyPaper-MSPT-by-World.patch b/patches/server/0053-SparklyPaper-MSPT-by-World.patch similarity index 100% rename from patches/server/0054-SparklyPaper-MSPT-by-World.patch rename to patches/server/0053-SparklyPaper-MSPT-by-World.patch diff --git a/patches/server/0055-SparklyPaper-Optimize-farm-check.patch b/patches/server/0054-SparklyPaper-Optimize-farm-check.patch similarity index 100% rename from patches/server/0055-SparklyPaper-Optimize-farm-check.patch rename to patches/server/0054-SparklyPaper-Optimize-farm-check.patch diff --git a/patches/server/0056-SparklyPaper-Optimize-season-check.patch b/patches/server/0055-SparklyPaper-Optimize-season-check.patch similarity index 100% rename from patches/server/0056-SparklyPaper-Optimize-season-check.patch rename to patches/server/0055-SparklyPaper-Optimize-season-check.patch diff --git a/patches/server/0057-SparklyPaper-Optimize-tickingBlockEntity.patch b/patches/server/0056-SparklyPaper-Optimize-tickingBlockEntity.patch similarity index 100% rename from patches/server/0057-SparklyPaper-Optimize-tickingBlockEntity.patch rename to patches/server/0056-SparklyPaper-Optimize-tickingBlockEntity.patch diff --git a/patches/server/0058-Ticking-Controller.patch b/patches/server/0057-Ticking-Controller.patch similarity index 100% rename from patches/server/0058-Ticking-Controller.patch rename to patches/server/0057-Ticking-Controller.patch diff --git a/patches/server/0059-Add-option-to-disable-beacon-effect-ambient.patch b/patches/server/0058-Add-option-to-disable-beacon-effect-ambient.patch similarity index 100% rename from patches/server/0059-Add-option-to-disable-beacon-effect-ambient.patch rename to patches/server/0058-Add-option-to-disable-beacon-effect-ambient.patch diff --git a/patches/server/0060-Tick-toggle-subcommand.patch b/patches/server/0059-Tick-toggle-subcommand.patch similarity index 100% rename from patches/server/0060-Tick-toggle-subcommand.patch rename to patches/server/0059-Tick-toggle-subcommand.patch diff --git a/patches/server/0061-Add-options-to-modify-configurations-path.patch b/patches/server/0060-Add-options-to-modify-configurations-path.patch similarity index 86% rename from patches/server/0061-Add-options-to-modify-configurations-path.patch rename to patches/server/0060-Add-options-to-modify-configurations-path.patch index 924abae..0c198cd 100644 --- a/patches/server/0061-Add-options-to-modify-configurations-path.patch +++ b/patches/server/0060-Add-options-to-modify-configurations-path.patch @@ -172,6 +172,33 @@ index d5d09bf63f4b7fba73188f75d5fe9599b8da2844..8ab6df63d9a22ac76b2ba14bc8fef318 this.server = server; this.registries = registryManager; this.maxPlayers = maxPlayers; +diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +index 15527e902484496a6804c879d1de589bed3f8713..b2f924d0236683dc0a994350efe9a9db54b2ab98 100644 +--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java ++++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +@@ -276,12 +276,12 @@ public final class CraftServer implements Server { + private final ServicesManager servicesManager = new SimpleServicesManager(); + private final CraftScheduler scheduler = new CraftScheduler(); + private final CraftCommandMap commandMap; // Paper - Move down +- private final SimpleHelpMap helpMap = new SimpleHelpMap(this); ++ private final SimpleHelpMap helpMap; + private final StandardMessenger messenger = new StandardMessenger(); + private final SimplePluginManager pluginManager; // Paper - Move down + public final io.papermc.paper.plugin.manager.PaperPluginManagerImpl paperPluginManager; // Paper + private final StructureManager structureManager; +- protected final DedicatedServer console; ++ public final DedicatedServer console; // Plazma - AT (protected -> public) + protected final DedicatedPlayerList playerList; + private final Map worlds = new LinkedHashMap(); + // private final Map, Registry> registries = new HashMap<>(); // Paper - replace with RegistryAccess +@@ -421,6 +421,7 @@ public final class CraftServer implements Server { + + Bukkit.setServer(this); + // Paper start ++ this.helpMap = new SimpleHelpMap(this); // Plazma - Add options to modify the configuration files + this.commandMap = new CraftCommandMap(this); + this.pluginManager = new SimplePluginManager(this, commandMap); + this.paperPluginManager = new io.papermc.paper.plugin.manager.PaperPluginManagerImpl(this, this.commandMap, pluginManager); diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java index a75f3328ba32466b6ceeddb0069c856524f19c0a..913213c77fa2cf8038768a34b38bb59d698e714b 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java @@ -222,7 +249,7 @@ index a75f3328ba32466b6ceeddb0069c856524f19c0a..913213c77fa2cf8038768a34b38bb59d }; diff --git a/src/main/java/org/bukkit/craftbukkit/help/HelpYamlReader.java b/src/main/java/org/bukkit/craftbukkit/help/HelpYamlReader.java -index 5923d3c17756c489fcb392044c0679fe52e2d58f..a433d691831c620112a1c824f8f26cb50cfa8dbd 100644 +index 5923d3c17756c489fcb392044c0679fe52e2d58f..3ec5cf874dfd9d2e016daa9f7c7aee2646e67861 100644 --- a/src/main/java/org/bukkit/craftbukkit/help/HelpYamlReader.java +++ b/src/main/java/org/bukkit/craftbukkit/help/HelpYamlReader.java @@ -25,7 +25,7 @@ public class HelpYamlReader { @@ -230,7 +257,7 @@ index 5923d3c17756c489fcb392044c0679fe52e2d58f..a433d691831c620112a1c824f8f26cb5 this.server = server; - File helpYamlFile = new File("help.yml"); -+ File helpYamlFile = (File) ((org.bukkit.craftbukkit.CraftServer) server).getHandle().getServer().options.valueOf("help"); // Plazma - Add options to modify the configuration files ++ File helpYamlFile = (File) ((org.bukkit.craftbukkit.CraftServer) server).console.options.valueOf("help"); // Plazma - Add options to modify the configuration files YamlConfiguration defaultConfig = YamlConfiguration.loadConfiguration(new InputStreamReader(this.getClass().getClassLoader().getResourceAsStream("configurations/help.yml"), Charsets.UTF_8)); try { diff --git a/patches/server/0062-Add-option-to-set-player-can-bypass-limit.patch b/patches/server/0061-Add-option-to-set-player-can-bypass-limit.patch similarity index 100% rename from patches/server/0062-Add-option-to-set-player-can-bypass-limit.patch rename to patches/server/0061-Add-option-to-set-player-can-bypass-limit.patch diff --git a/patches/server/0063-Add-heal-command.patch b/patches/server/0062-Add-heal-command.patch similarity index 100% rename from patches/server/0063-Add-heal-command.patch rename to patches/server/0062-Add-heal-command.patch diff --git a/patches/server/0064-Add-missing-argument-place-for-compass-command.patch b/patches/server/0063-Add-missing-argument-place-for-compass-command.patch similarity index 100% rename from patches/server/0064-Add-missing-argument-place-for-compass-command.patch rename to patches/server/0063-Add-missing-argument-place-for-compass-command.patch