stable

PlazmaMC · Oct 18, 2024 · 6a7a817 · 6a7a817
1 parent c531844
commit 6a7a817
Show file tree

Hide file tree

Showing 33 changed files with 472 additions and 471 deletions.
diff --git a/patches/server/0005-Rebrand-Logo.patch b/patches/server/0005-Rebrand-Logo.patch
diff --git a/...rver/0009-Port-SparklyPaper-patches.patch → ...rver/0008-Port-SparklyPaper-patches.patch b/...rver/0009-Port-SparklyPaper-patches.patch → ...rver/0008-Port-SparklyPaper-patches.patch
diff --git a/...ways-agree-EULA-on-development-mode.patch → ...ways-agree-EULA-on-development-mode.patch b/...ways-agree-EULA-on-development-mode.patch → ...ways-agree-EULA-on-development-mode.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Always agree EULA on development mode
 
 
 diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
-index 57deffa2f3d2f0074512440e668c71afb38510d4..4275364ada20fe5b67998ca1128322966dfc55e8 100644
+index 4911a6d25d12eb9d2b263aeb9b7f521ff828397a..29eef278940cab33a1f5f168f66ab2b80f0d60ce 100644
 --- a/src/main/java/net/minecraft/server/Main.java
 +++ b/src/main/java/net/minecraft/server/Main.java
-@@ -178,6 +178,7 @@ public class Main {
+@@ -166,6 +166,7 @@ public class Main {
 
              // Spigot Start
              boolean eulaAgreed = Boolean.getBoolean( "com.mojang.eula.agree" );

diff --git a/patches/server/0011-Add-more-metrics.patch → patches/server/0010-Add-more-metrics.patch b/patches/server/0011-Add-more-metrics.patch → patches/server/0010-Add-more-metrics.patch
diff --git a/...012-Optimize-default-configurations.patch → ...011-Optimize-default-configurations.patch b/...012-Optimize-default-configurations.patch → ...011-Optimize-default-configurations.patch
@@ -337,10 +337,10 @@ index 24763d3d270c29c95e0b3e85111145234f660a62..80ddc627e02e3c749e6b074afa93d357
      }
 
 diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
-index 4275364ada20fe5b67998ca1128322966dfc55e8..ab5607df7819bdc25d4856007122a6dce89857a9 100644
+index 29eef278940cab33a1f5f168f66ab2b80f0d60ce..b4d47c53bb2a5c75e9f69506dbd69a8817f368dc 100644
 --- a/src/main/java/net/minecraft/server/Main.java
 +++ b/src/main/java/net/minecraft/server/Main.java
-@@ -163,7 +163,7 @@ public class Main {
+@@ -151,7 +151,7 @@ public class Main {
                  File configFile = (File) optionset.valueOf("bukkit-settings");
                  YamlConfiguration configuration = YamlConfiguration.loadConfiguration(configFile);
                  configuration.options().copyDefaults(true);
@@ -382,7 +382,7 @@ index 09aa0c9ec7d66ff82167c035481e5fcccf8618de..3ed078e33a99e4cc7b536ab6590ef939
          this.enableJmxMonitoring = this.get("enable-jmx-monitoring", false);
          this.enableStatus = this.get("enable-status", true);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 58878900a1985d4dd23104ac594d52368db580d5..6669851b5682d197a5ccc85ac3e68ea3baf428fc 100644
+index 02037da80f2f3cada359bbe0f58160fd15761b77..8de087636686b78c12bc1c293258713ff7dddff0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -428,7 +428,7 @@ public final class CraftServer implements Server {
@@ -395,13 +395,13 @@ index 58878900a1985d4dd23104ac594d52368db580d5..6669851b5682d197a5ccc85ac3e68ea3
          if (!this.configuration.isString("aliases")) {
              legacyAlias = this.configuration.getConfigurationSection("aliases");
 diff --git a/src/main/java/org/plazmamc/plazma/Options.java b/src/main/java/org/plazmamc/plazma/Options.java
-index b02a0dddd99df1691c125660828a61cc4a5a4d02..d6ead6b1bc73df85a8e8938acd2e8465dd82df97 100644
+index 5942d0997f07bd51d934dac32cd349792a10643e..40a6ef72b4d495140c486c0880fdc5fc1a32931c 100644
 --- a/src/main/java/org/plazmamc/plazma/Options.java
 +++ b/src/main/java/org/plazmamc/plazma/Options.java
-@@ -6,5 +6,6 @@ public interface Options {
+@@ -5,5 +5,6 @@ import static java.lang.Boolean.getBoolean;
+ public interface Options {
 
      boolean NO_OPTIMIZE = getBoolean("Plazma.disableConfigOptimization");
-     boolean NO_WARN = getBoolean("Plazma.iKnowWhatIAmDoing");
 +    boolean AGGRESSIVE = Boolean.getBoolean("Plazma.aggressiveOptimize") && !NO_OPTIMIZE;
 
  }

diff --git a/...apply-the-configuration-to-the-vani.patch → ...apply-the-configuration-to-the-vani.patch b/...apply-the-configuration-to-the-vani.patch → ...apply-the-configuration-to-the-vani.patch
@@ -19,7 +19,7 @@ index 8445a0b25d647b2c1f9a44f849084cdec0842e18..86822868e47b269891a71fdc04371b1e
      }
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 6669851b5682d197a5ccc85ac3e68ea3baf428fc..24b8c2dfb41e97adee90849d56f13583b6cafcc0 100644
+index 8de087636686b78c12bc1c293258713ff7dddff0..60da66fea37f8b9f68a543ff6cdb844a32d654ad 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -428,7 +428,19 @@ public final class CraftServer implements Server {
@@ -44,12 +44,12 @@ index 6669851b5682d197a5ccc85ac3e68ea3baf428fc..24b8c2dfb41e97adee90849d56f13583
          if (!this.configuration.isString("aliases")) {
              legacyAlias = this.configuration.getConfigurationSection("aliases");
 diff --git a/src/main/java/org/plazmamc/plazma/Options.java b/src/main/java/org/plazmamc/plazma/Options.java
-index d6ead6b1bc73df85a8e8938acd2e8465dd82df97..1fe9af0ffc91626c712847df94ea31e19bb3c8a0 100644
+index 40a6ef72b4d495140c486c0880fdc5fc1a32931c..3e0e67c089e269d0bccd4a0d2de5ac1ac515997e 100644
 --- a/src/main/java/org/plazmamc/plazma/Options.java
 +++ b/src/main/java/org/plazmamc/plazma/Options.java
-@@ -7,5 +7,7 @@ public interface Options {
+@@ -6,5 +6,7 @@ public interface Options {
+
      boolean NO_OPTIMIZE = getBoolean("Plazma.disableConfigOptimization");
-     boolean NO_WARN = getBoolean("Plazma.iKnowWhatIAmDoing");
      boolean AGGRESSIVE = Boolean.getBoolean("Plazma.aggressiveOptimize") && !NO_OPTIMIZE;
 +    boolean VANILLAIZE = Boolean.getBoolean("Plazma.vanillaize") && !AGGRESSIVE;
 +    boolean USE_VANILLA = Boolean.getBoolean("Plazma.useVanillaConfiguration") && !AGGRESSIVE && NO_OPTIMIZE;

diff --git a/...s/server/0014-Tweak-console-logging.patch → ...s/server/0013-Tweak-console-logging.patch b/...s/server/0014-Tweak-console-logging.patch → ...s/server/0013-Tweak-console-logging.patch
diff --git a/...issing-purpur-configuration-options.patch → ...issing-purpur-configuration-options.patch b/...issing-purpur-configuration-options.patch → ...issing-purpur-configuration-options.patch
diff --git a/...6-Completely-remove-Mojang-Profiler.patch → ...5-Completely-remove-Mojang-Profiler.patch b/...6-Completely-remove-Mojang-Profiler.patch → ...5-Completely-remove-Mojang-Profiler.patch
diff --git a/...option-to-change-nether-portal-size.patch → ...option-to-change-nether-portal-size.patch b/...option-to-change-nether-portal-size.patch → ...option-to-change-nether-portal-size.patch
diff --git a/.../0018-Reduce-create-random-instance.patch → .../0017-Reduce-create-random-instance.patch b/.../0018-Reduce-create-random-instance.patch → .../0017-Reduce-create-random-instance.patch
@@ -130,7 +130,7 @@ index 96e9fce5f9084737d2fcf4deb83305733b480179..43da8ea227b2b01d6975a3f4f209099d
      private int tickDelay;
      private int spawnDelay;
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
-index 882de08963c72614a3d26cd917916e42b7136042..9aa17706e442d2ea7ba898c867a1f8ba817084f1 100644
+index 7dd5e0b935d98d552c916f8412569ff4aa0e9b04..4d0f209df602f017500c1d56423fa482423f9702 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
 @@ -87,7 +87,7 @@ public class FishingHook extends Projectile {
@@ -178,7 +178,7 @@ index 6d28f1097caa3e37c2917eb401018ebf48c13a39..9397f1fa3b53423deabbedc6f7bb0f98
          this.costs = new int[3];
          this.enchantClue = new int[]{-1, -1, -1};
 diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
-index 133d994d9ac9d4f9527135ac0c77e5749917f8c3..9771279c913a5be86e516db74792fd045c27e4cd 100644
+index 0022263a41b74fc339c5a5629aee3cd2cd05c5ae..0b553c9e90b53cdf84b14a5d5d20dc3cf1ffb44f 100644
 --- a/src/main/java/net/minecraft/world/level/Explosion.java
 +++ b/src/main/java/net/minecraft/world/level/Explosion.java
 @@ -93,7 +93,7 @@ public class Explosion {

diff --git a/...er/0019-Apply-various-optimizations.patch → ...er/0018-Apply-various-optimizations.patch b/...er/0019-Apply-various-optimizations.patch → ...er/0018-Apply-various-optimizations.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Apply various optimizations
 Akarin - Swaps the predicate order of collision
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index c9b3577a3992c11f6c299945362ac9be6c0c96e1..49717623c387b935592bdb4f19b36ee393ba51cb 100644
+index f7201a74f66892c9d93616e9afb99d9499f0cdbc..3a9d8e64d0a02a40a89cd82e014ed1bebcd6b8b3 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2209,8 +2209,9 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

diff --git a/...Do-not-load-chunks-to-spawn-phantom.patch → ...Do-not-load-chunks-to-spawn-phantom.patch b/...Do-not-load-chunks-to-spawn-phantom.patch → ...Do-not-load-chunks-to-spawn-phantom.patch
diff --git a/...able-moved-to-quickly-check-for-spe.patch → ...able-moved-to-quickly-check-for-spe.patch b/...able-moved-to-quickly-check-for-spe.patch → ...able-moved-to-quickly-check-for-spe.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add option to disable moved to quickly check for specific
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 972d8975d1bc04eb6c0c05f9ca8044f699c504a8..d4a78c02df4badf3f6ac45e6b1780d731e35cc87 100644
+index 176e54f1c5f4feb98bee8876c304f6e248909e9c..2133251cc2ee2e50f0b830c9f5123d3d9e7a6430 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1469,6 +1469,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl

diff --git a/...22-Configurable-cave-lava-sea-level.patch → ...21-Configurable-cave-lava-sea-level.patch b/...22-Configurable-cave-lava-sea-level.patch → ...21-Configurable-cave-lava-sea-level.patch
diff --git a/.../0023-Ignore-useless-entity-packets.patch → .../0022-Ignore-useless-entity-packets.patch b/.../0023-Ignore-useless-entity-packets.patch → .../0022-Ignore-useless-entity-packets.patch
diff --git a/...024-Configurable-entity-sensor-tick.patch → ...023-Configurable-entity-sensor-tick.patch b/...024-Configurable-entity-sensor-tick.patch → ...023-Configurable-entity-sensor-tick.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable entity sensor tick
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 2f5250d3baba15e914290ce30f813ad63f6bd943..8b9d790351cd416e5d6051e9ad27d66a7097f558 100644
+index 05c41e1c2f4a1c714dc842dc019acda46fc41e7b..ba6295ce11236c7eadaeaa042482d6cec0945bd1 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -997,10 +997,11 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Targeti

diff --git a/...025-Variable-entity-wakeup-duration.patch → ...024-Variable-entity-wakeup-duration.patch b/...025-Variable-entity-wakeup-duration.patch → ...024-Variable-entity-wakeup-duration.patch
diff --git a/...ver/0026-Optimise-state-lookup-more.patch → ...ver/0025-Optimise-state-lookup-more.patch b/...ver/0026-Optimise-state-lookup-more.patch → ...ver/0025-Optimise-state-lookup-more.patch
diff --git a/...ppress-errors-from-dirty-attributes.patch → ...ppress-errors-from-dirty-attributes.patch b/...ppress-errors-from-dirty-attributes.patch → ...ppress-errors-from-dirty-attributes.patch
diff --git a/...ver/0028-Skip-event-if-no-listeners.patch → ...ver/0027-Skip-event-if-no-listeners.patch b/...ver/0028-Skip-event-if-no-listeners.patch → ...ver/0027-Skip-event-if-no-listeners.patch
diff --git a/...029-Add-entity-spawn-deadlock-timer.patch → ...028-Add-entity-spawn-deadlock-timer.patch b/...029-Add-entity-spawn-deadlock-timer.patch → ...028-Add-entity-spawn-deadlock-timer.patch
diff --git a/patches/server/0030-Lithium-HashedList.patch → patches/server/0029-Lithium-HashedList.patch b/patches/server/0030-Lithium-HashedList.patch → patches/server/0029-Lithium-HashedList.patch
diff --git a/...rver/0031-Improve-SwingTime-ticking.patch → ...rver/0030-Improve-SwingTime-ticking.patch b/...rver/0031-Improve-SwingTime-ticking.patch → ...rver/0030-Improve-SwingTime-ticking.patch
diff --git a/.../0032-Save-Json-list-asynchronously.patch → .../0031-Save-Json-list-asynchronously.patch b/.../0032-Save-Json-list-asynchronously.patch → .../0031-Save-Json-list-asynchronously.patch
diff --git a/patches/server/0033-Add-more-MSPT.patch → patches/server/0032-Add-more-MSPT.patch b/patches/server/0033-Add-more-MSPT.patch → patches/server/0032-Add-more-MSPT.patch
diff --git a/...-Process-pathfinding-asynchronously.patch → ...-Process-pathfinding-asynchronously.patch b/...-Process-pathfinding-asynchronously.patch → ...-Process-pathfinding-asynchronously.patch
diff --git a/...when-running-the-test-server-with-g.patch → ...when-running-the-test-server-with-g.patch b/...when-running-the-test-server-with-g.patch → ...when-running-the-test-server-with-g.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Use Akair's flag when running the test server with gradle
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index afa4877ade6cf8b615ba70c1cf7a8c92040e924a..17463aa6bc8792df47676d0f8b031f05c58fae76 100644
+index 54a30184392815a01f20b8fc841690e4ae5b3cc6..10bff15cd8b52fd6973aa3565ae75aabdf7dff53 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -137,7 +137,7 @@ fun TaskContainer.registerRunTask(

diff --git a/...nstead-if-server-favicon-doesn-t-ex.patch → ...nstead-if-server-favicon-doesn-t-ex.patch b/...nstead-if-server-favicon-doesn-t-ex.patch → ...nstead-if-server-favicon-doesn-t-ex.patch
@@ -69,10 +69,10 @@ index f926376ee95b28a9c09a1ad87223f89f1c28f50e..cf13166d1fdd663f1f99fd6d00a52966
 
      public Optional<Path> getWorldScreenshotFile() {
 diff --git a/src/main/java/org/plazmamc/plazma/Options.java b/src/main/java/org/plazmamc/plazma/Options.java
-index 1fe9af0ffc91626c712847df94ea31e19bb3c8a0..f446d1a793514ab19a4428294540d16c2f160a77 100644
+index 3e0e67c089e269d0bccd4a0d2de5ac1ac515997e..2e75ca5d2b7d8f35814fe9a0814b19a9135d80cb 100644
 --- a/src/main/java/org/plazmamc/plazma/Options.java
 +++ b/src/main/java/org/plazmamc/plazma/Options.java
-@@ -9,5 +9,6 @@ public interface Options {
+@@ -8,5 +8,6 @@ public interface Options {
      boolean AGGRESSIVE = Boolean.getBoolean("Plazma.aggressiveOptimize") && !NO_OPTIMIZE;
      boolean VANILLAIZE = Boolean.getBoolean("Plazma.vanillaize") && !AGGRESSIVE;
      boolean USE_VANILLA = Boolean.getBoolean("Plazma.useVanillaConfiguration") && !AGGRESSIVE && NO_OPTIMIZE;

diff --git a/...s/server/0037-Implement-FreedomChat.patch → ...s/server/0036-Implement-FreedomChat.patch b/...s/server/0037-Implement-FreedomChat.patch → ...s/server/0036-Implement-FreedomChat.patch
diff --git a/...e-missing-Pufferfish-configurations.patch → ...e-missing-Pufferfish-configurations.patch b/...e-missing-Pufferfish-configurations.patch → ...e-missing-Pufferfish-configurations.patch
diff --git a/...039-Improve-biome-temperature-cache.patch → ...038-Improve-biome-temperature-cache.patch b/...039-Improve-biome-temperature-cache.patch → ...038-Improve-biome-temperature-cache.patch
diff --git a/patches/server/0008-Warn-on-startup.patch → ...er/placeholder/0008-Warn-on-startup.patch b/patches/server/0008-Warn-on-startup.patch → ...er/placeholder/0008-Warn-on-startup.patch