From 1969bf8c0f1477d39f9ebd81ab42359ef7a30d3d Mon Sep 17 00:00:00 2001 From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com> Date: Sun, 10 Dec 2023 01:48:01 +0300 Subject: [PATCH] almost all patches applied --- gradle.properties | 4 +-- gradle/wrapper/gradle-wrapper.properties | 2 +- .../0003-Optimize-Paper-Event-Manager.patch | 4 +-- patches/server/0001-Divine-Branding.patch | 32 ++++++++--------- .../server/0002-Divine-Configuration.patch | 34 +++++++++---------- .../0003-Fix-MC-98160-and-MC-105103.patch | 4 +-- ...-Optimize-default-values-for-configs.patch | 4 +-- ...05-Add-missing-purpur-config-options.patch | 28 +++++++-------- .../0007-Fix-entity-serialization.patch | 8 ++--- .../0010-Remove-Spigot-tick-limiter.patch | 12 +++---- patches/server/0011-Boat-Settings.patch | 8 ++--- ...-110386.patch => 0012-Fix-MC-110386.patch} | 0 ...pawn-shulker-bullets-on-owner-death.patch} | 0 ...MC-31819.patch => 0014-Fix-MC-31819.patch} | 4 +-- ...h => 0015-lithium-collections.goals.patch} | 2 +- ...rk.patch => 0016-Reduce-sensor-work.patch} | 2 +- ....raid.patch => 0017-lithium-ai.raid.patch} | 0 ...Do-not-drop-items-from-Give-command.patch} | 0 ...x-MC-2025.patch => 0019-Fix-MC-2025.patch} | 12 +++---- ... 0020-lithium-collections.gamerules.patch} | 4 +-- ...> 0021-Optimize-Paper-Event-Manager.patch} | 0 ...MC-65198.patch => 0022-Fix-MC-65198.patch} | 2 +- ...ch => 0023-Make-entity-goals-public.patch} | 20 +++++------ ...x-MC-7569.patch => 0024-Fix-MC-7569.patch} | 0 ...MC-93018.patch => 0025-Fix-MC-93018.patch} | 0 ...at-commands-before-player-has-joine.patch} | 20 +++++------ ...ning.patch => 0027-Fix-chat-signing.patch} | 6 ++-- .../server/0012-Allow-any-username.patch | 0 28 files changed, 106 insertions(+), 106 deletions(-) rename patches/server/{0013-Fix-MC-110386.patch => 0012-Fix-MC-110386.patch} (100%) rename patches/server/{0014-Despawn-shulker-bullets-on-owner-death.patch => 0013-Despawn-shulker-bullets-on-owner-death.patch} (100%) rename patches/server/{0015-Fix-MC-31819.patch => 0014-Fix-MC-31819.patch} (84%) rename patches/server/{0016-lithium-collections.goals.patch => 0015-lithium-collections.goals.patch} (94%) rename patches/server/{0017-Reduce-sensor-work.patch => 0016-Reduce-sensor-work.patch} (96%) rename patches/server/{0018-lithium-ai.raid.patch => 0017-lithium-ai.raid.patch} (100%) rename patches/server/{0019-Do-not-drop-items-from-Give-command.patch => 0018-Do-not-drop-items-from-Give-command.patch} (100%) rename patches/server/{0020-Fix-MC-2025.patch => 0019-Fix-MC-2025.patch} (80%) rename patches/server/{0021-lithium-collections.gamerules.patch => 0020-lithium-collections.gamerules.patch} (88%) rename patches/server/{0022-Optimize-Paper-Event-Manager.patch => 0021-Optimize-Paper-Event-Manager.patch} (100%) rename patches/server/{0023-Fix-MC-65198.patch => 0022-Fix-MC-65198.patch} (97%) rename patches/server/{0024-Make-entity-goals-public.patch => 0023-Make-entity-goals-public.patch} (91%) rename patches/server/{0025-Fix-MC-7569.patch => 0024-Fix-MC-7569.patch} (100%) rename patches/server/{0026-Fix-MC-93018.patch => 0025-Fix-MC-93018.patch} (100%) rename patches/server/{0027-Do-not-process-chat-commands-before-player-has-joine.patch => 0026-Do-not-process-chat-commands-before-player-has-joine.patch} (70%) rename patches/server/{0028-Fix-chat-signing.patch => 0027-Fix-chat-signing.patch} (83%) rename patches/{ => unapplied}/server/0012-Allow-any-username.patch (100%) diff --git a/gradle.properties b/gradle.properties index 7b19f25..fcf6a04 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ group = gq.bxteam.divinemc -version = 1.20.2-R0.1-SNAPSHOT -purpurRef = 4f12f5d3d0431cf17c2f6f80f3bdd3c834c9b8fa +version = 1.20.4-R0.1-SNAPSHOT +purpurRef = a0b716fb618bf763efd683ed95d9be32e0953fd7 org.gradle.caching = true org.gradle.parallel = true diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3fa8f86..1af9e09 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/patches/api/0003-Optimize-Paper-Event-Manager.patch b/patches/api/0003-Optimize-Paper-Event-Manager.patch index eaa8697..6f2dafb 100644 --- a/patches/api/0003-Optimize-Paper-Event-Manager.patch +++ b/patches/api/0003-Optimize-Paper-Event-Manager.patch @@ -97,10 +97,10 @@ index 3b3d9642a8d63798dc28f2f8df77f0466451cbff..9c43c51858b20ace8e32eb2d7f5a2fba } diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java -index 90953bfc81168068a281be4d2d3942d5e7dd69ff..685d0c86a14c7a562a881f725add0fc5ac725f3f 100644 +index f9b57b872780aa6b9b959494874b57c7a8ff0c53..1379823a8f2033706c51a1e69c086bf211f5397e 100644 --- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java +++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java -@@ -323,4 +323,11 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm +@@ -318,4 +318,11 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm } // Paper end diff --git a/patches/server/0001-Divine-Branding.patch b/patches/server/0001-Divine-Branding.patch index d6e8161..dec66a5 100644 --- a/patches/server/0001-Divine-Branding.patch +++ b/patches/server/0001-Divine-Branding.patch @@ -5,37 +5,37 @@ Subject: [PATCH] Divine Branding diff --git a/build.gradle.kts b/build.gradle.kts -index 0eeca0c0dfbb62b7551cda95576932d3f14e6de2..d8f5839870db5000d0e38180c23044fad689294e 100644 +index fb1837bd5d0cb1970a6c236e72654a1c09502c48..8370eebc87f16568c933e9ad93f999542fd1dafd 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -14,7 +14,7 @@ val alsoShade: Configuration by configurations.creating - +@@ -28,7 +28,7 @@ repositories { dependencies { + extraRuntime(platform("net.kyori:adventure-bom:4.15.0-SNAPSHOT")) // Purpur start - implementation(project(":purpur-api")) + implementation(project(":divinemc-api")) // DivineMC implementation("io.papermc.paper:paper-mojangapi:${project.version}") { exclude("io.papermc.paper", "paper-api") } -@@ -93,7 +93,7 @@ tasks.jar { +@@ -92,7 +92,7 @@ tasks.jar { attributes( "Main-Class" to "org.bukkit.craftbukkit.Main", "Implementation-Title" to "CraftBukkit", -- "Implementation-Version" to "git-Purpur-$implementationVersion", // Pufferfish // Purpur -+ "Implementation-Version" to "git-DivineMC-$implementationVersion", // Pufferfish // Purpur // DivineMC +- "Implementation-Version" to "git-Purpur-$implementationVersion", // Purpur ++ "Implementation-Version" to "git-DivineMC-$implementationVersion", // Purpur // DivineMC "Implementation-Vendor" to date, // Paper "Specification-Title" to "Bukkit", "Specification-Version" to project.version, diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java -index 8cde30544e14f8fc2dac32966ae3c21f8cf3a551..ad62e0b7deb141d22be4f19ea30f61440b192af2 100644 +index 9713263c3bd34ab8a3bfc0a8797ba0b1b88ed733..3a3931b504296f2672ed3453da078663bdfdc873 100644 --- a/src/main/java/com/destroystokyo/paper/Metrics.java +++ b/src/main/java/com/destroystokyo/paper/Metrics.java @@ -593,7 +593,7 @@ public class Metrics { boolean logFailedRequests = config.getBoolean("logFailedRequests", false); // Only start Metrics, if it's enabled in the config if (config.getBoolean("enabled", true)) { -- Metrics metrics = new Metrics("Purpur", serverUUID, logFailedRequests, Bukkit.getLogger()); // Pufferfish // Purpur -+ Metrics metrics = new Metrics("DivineMC", serverUUID, logFailedRequests, Bukkit.getLogger()); // Pufferfish // Purpur // DivineMC +- Metrics metrics = new Metrics("Purpur", serverUUID, logFailedRequests, Bukkit.getLogger()); // Purpur ++ Metrics metrics = new Metrics("DivineMC", serverUUID, logFailedRequests, Bukkit.getLogger()); // Purpur // DivineMC metrics.addCustomChart(new Metrics.SimplePie("minecraft_version", () -> { String minecraftVersion = Bukkit.getVersion(); @@ -138,28 +138,28 @@ index 3cb56595822799926a8141e60a42f5d1edfc6de5..05478a1ea04ec0396bc8c97090edef4a .completer(new ConsoleCommandCompleter(this.server)) .option(LineReader.Option.COMPLETE_IN_WORD, true); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 79f00c72d28426095a3f3742d77f2369164b2a9c..d39e5e70ed8a52839f189f898b42de179e93da37 100644 +index 1677e737daa272d7669777a75214170a8e9c7d74..06d69272239161363c2d45638920eda541748ca8 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -269,7 +269,7 @@ import javax.annotation.Nullable; // Paper +@@ -270,7 +270,7 @@ import javax.annotation.Nullable; // Paper import javax.annotation.Nonnull; // Paper public final class CraftServer implements Server { -- private final String serverName = "Purpur"; // Paper // Pufferfish // Purpur -+ private final String serverName = "DivineMC"; // Paper // Pufferfish // Purpur // DivineMC +- private final String serverName = "Purpur"; // Paper // Purpur ++ private final String serverName = "DivineMC"; // Paper // Purpur // DivineMC private final String serverVersion; private final String bukkitVersion = Versioning.getBukkitVersion(); private final Logger logger = Logger.getLogger("Minecraft"); diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java -index 99597258e8e88cd9e2c901c4ac3ff7faeeabee2b..b79b9f27c5cf09dfcf4cb0bdf7a3aa507db2b0c8 100644 +index fb87620c742ff7912f5e8ccd2a7930dd605576d9..909a4b84d1cfa4a42a28af97be16572bb728aac6 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java +++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java @@ -11,7 +11,7 @@ public final class Versioning { public static String getBukkitVersion() { String result = "Unknown-Version"; -- InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/org.purpurmc.purpur/purpur-api/pom.properties"); // Pufferfish // Purpur -+ InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/gq.bxteam.divinemc/divinemc-api/pom.properties"); // Pufferfish // Purpur // DivineMC +- InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/org.purpurmc.purpur/purpur-api/pom.properties"); // Purpur ++ InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/gq.bxteam.divinemc/divinemc-api/pom.properties"); // Purpur // DivineMC Properties properties = new Properties(); if (stream != null) { diff --git a/patches/server/0002-Divine-Configuration.patch b/patches/server/0002-Divine-Configuration.patch index 7dc4672..cdb2003 100644 --- a/patches/server/0002-Divine-Configuration.patch +++ b/patches/server/0002-Divine-Configuration.patch @@ -327,12 +327,12 @@ index 0000000000000000000000000000000000000000..5d16d2250bae9c982a0af9ad2580a635 +} \ No newline at end of file diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index 5c6027a3ab7c52087dfebb1e21468a511ec09fa1..e75007ac7eae3f9c6ac9f4174379270b030b6a75 100644 +index 2e70ac06c1a6414d9fbbc7a929968e804f0a91f5..5292225793624228bda6d6fd970b5a0c8149e553 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -@@ -235,6 +235,16 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface - gg.pufferfish.pufferfish.PufferfishConfig.load(); // Pufferfish - gg.pufferfish.pufferfish.PufferfishCommand.init(); // Pufferfish +@@ -232,6 +232,16 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface + io.papermc.paper.brigadier.PaperBrigadierProviderImpl.INSTANCE.getClass(); // init PaperBrigadierProvider + // Paper end + // DivineMC start + try { @@ -348,7 +348,7 @@ index 5c6027a3ab7c52087dfebb1e21468a511ec09fa1..e75007ac7eae3f9c6ac9f4174379270b this.setFlightAllowed(dedicatedserverproperties.allowFlight); this.setMotd(dedicatedserverproperties.motd); diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index 25540a7f5631acd856726cdb44bace9be7dab401..4ed2a063f21ae4bb840e5ec1f84e04221f753ca0 100644 +index 8e411a60cdd39ba1a365b29a6dbbb468a8ef6736..f96f6b817c9afd05269503e8a4a34ae0c468ee6c 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -15,6 +15,8 @@ import java.util.function.Consumer; @@ -360,7 +360,7 @@ index 25540a7f5631acd856726cdb44bace9be7dab401..4ed2a063f21ae4bb840e5ec1f84e0422 import net.minecraft.CrashReport; import net.minecraft.CrashReportCategory; import net.minecraft.ReportedException; -@@ -177,6 +179,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -180,6 +182,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { public final com.destroystokyo.paper.antixray.ChunkPacketBlockController chunkPacketBlockController; // Paper - Anti-Xray public final org.purpurmc.purpur.PurpurWorldConfig purpurConfig; // Purpur @@ -368,7 +368,7 @@ index 25540a7f5631acd856726cdb44bace9be7dab401..4ed2a063f21ae4bb840e5ec1f84e0422 public final co.aikar.timings.WorldTimingsHandler timings; // Paper public static BlockPos lastPhysicsProblem; // Spigot private org.spigotmc.TickLimiter entityLimiter; -@@ -260,6 +263,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -261,6 +264,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName()); // Spigot this.paperConfig = paperWorldConfigCreator.apply(this.spigotConfig); // Paper this.purpurConfig = new org.purpurmc.purpur.PurpurWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName(), env); // Purpur @@ -377,18 +377,18 @@ index 25540a7f5631acd856726cdb44bace9be7dab401..4ed2a063f21ae4bb840e5ec1f84e0422 this.generator = gen; this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 918c0cc242b7e2c070d0dd8acc8089d245b37653..bc0e648081fd60d6a082e3c385fc953ec7d8b927 100644 +index 06d69272239161363c2d45638920eda541748ca8..6f7f4642223f75063e96c4d3c6e251509ee6a162 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -15,6 +15,7 @@ import com.mojang.brigadier.tree.LiteralCommandNode; - import com.mojang.datafixers.util.Pair; +@@ -16,6 +16,7 @@ import com.mojang.datafixers.util.Pair; + import com.mojang.serialization.Dynamic; import com.mojang.serialization.DynamicOps; import com.mojang.serialization.Lifecycle; +import gq.bxteam.divinemc.configuration.DivineConfig; import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; import java.awt.image.BufferedImage; import java.io.ByteArrayOutputStream; -@@ -1056,6 +1057,7 @@ public final class CraftServer implements Server { +@@ -1051,6 +1052,7 @@ public final class CraftServer implements Server { org.spigotmc.SpigotConfig.init((File) this.console.options.valueOf("spigot-settings")); // Spigot this.console.paperConfigurations.reloadConfigs(this.console); org.purpurmc.purpur.PurpurConfig.init((File) console.options.valueOf("purpur-settings")); // Purpur @@ -396,7 +396,7 @@ index 918c0cc242b7e2c070d0dd8acc8089d245b37653..bc0e648081fd60d6a082e3c385fc953e for (ServerLevel world : this.console.getAllLevels()) { // world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && config.spawnMonsters, config.spawnAnimals); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean)) -@@ -1072,6 +1074,7 @@ public final class CraftServer implements Server { +@@ -1067,6 +1069,7 @@ public final class CraftServer implements Server { } world.spigotConfig.init(); // Spigot world.purpurConfig.init(); // Purpur @@ -404,7 +404,7 @@ index 918c0cc242b7e2c070d0dd8acc8089d245b37653..bc0e648081fd60d6a082e3c385fc953e } Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper -@@ -1088,6 +1091,7 @@ public final class CraftServer implements Server { +@@ -1083,6 +1086,7 @@ public final class CraftServer implements Server { org.spigotmc.SpigotConfig.registerCommands(); // Spigot io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper org.purpurmc.purpur.PurpurConfig.registerCommands(); // Purpur @@ -412,7 +412,7 @@ index 918c0cc242b7e2c070d0dd8acc8089d245b37653..bc0e648081fd60d6a082e3c385fc953e this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*"); this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions"); -@@ -3062,6 +3066,13 @@ public final class CraftServer implements Server { +@@ -3089,6 +3093,13 @@ public final class CraftServer implements Server { } // Purpur end @@ -427,11 +427,11 @@ index 918c0cc242b7e2c070d0dd8acc8089d245b37653..bc0e648081fd60d6a082e3c385fc953e public void restart() { org.spigotmc.RestartCommand.restart(); diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index d41f9c4a3c992b5dadacb4fcb1107235fff79fa8..ca9cdaf00394a88daa72abf4b920de447496561c 100644 +index f93c8a4ca38e7d892b6941d3669445789c2fc227..fb42936e42293a4bdd4447a86d0f85027f2026e6 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java -@@ -188,6 +188,14 @@ public class Main { - .describedAs("Yml file"); +@@ -182,6 +182,14 @@ public class Main { + .describedAs("Yml file"); // Purpur end + // DivineMC start diff --git a/patches/server/0003-Fix-MC-98160-and-MC-105103.patch b/patches/server/0003-Fix-MC-98160-and-MC-105103.patch index 9e5be47..77e2b67 100644 --- a/patches/server/0003-Fix-MC-98160-and-MC-105103.patch +++ b/patches/server/0003-Fix-MC-98160-and-MC-105103.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Fix MC-98160 and MC-105103 diff --git a/src/main/java/net/minecraft/world/entity/vehicle/Boat.java b/src/main/java/net/minecraft/world/entity/vehicle/Boat.java -index c314febb75a85ef12051bde392c5b57e9c5d85ac..886a35937bfbb5b46d021fd42f89614f0df5d80f 100644 +index 7e9c88efd2a1edea673d1ef81635c2891a04d30e..26475c2d69537053a041ec9c2f8147842848a8fc 100644 --- a/src/main/java/net/minecraft/world/entity/vehicle/Boat.java +++ b/src/main/java/net/minecraft/world/entity/vehicle/Boat.java -@@ -923,7 +923,7 @@ public class Boat extends Entity implements VariantHolder { +@@ -862,7 +862,7 @@ public class Boat extends VehicleEntity implements VariantHolder { if (!this.isPassenger()) { if (onGround) { if (this.fallDistance > 3.0F) { diff --git a/patches/server/0004-Optimize-default-values-for-configs.patch b/patches/server/0004-Optimize-default-values-for-configs.patch index dc278d3..34f0028 100644 --- a/patches/server/0004-Optimize-default-values-for-configs.patch +++ b/patches/server/0004-Optimize-default-values-for-configs.patch @@ -244,7 +244,7 @@ index 68602dfb171d47e47fd0710b4324013ef05214d0..7ccad6b35263b595c4d60ded85333d92 public static boolean disablePlayerDataSaving; diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index f9b8e2bc039f1a37e47f84909c8785f3ef530284..12358c08e0e90d8d01db25534c6d5c4e726191dc 100644 +index 1cf6d4f854d89c515e48e1fb365eb95ff9340765..f9ba24d32f4170c641e420991e6c358f6bd91be2 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java @@ -150,14 +150,14 @@ public class SpigotWorldConfig @@ -337,7 +337,7 @@ index f9b8e2bc039f1a37e47f84909c8785f3ef530284..12358c08e0e90d8d01db25534c6d5c4e this.log( "Allow Zombie Pigmen to spawn from portal blocks: " + this.enableZombiePigmenPortalSpawns ); } -@@ -447,7 +447,7 @@ public class SpigotWorldConfig +@@ -449,7 +449,7 @@ public class SpigotWorldConfig public int hangingTickFrequency; private void hangingTickFrequency() { diff --git a/patches/server/0005-Add-missing-purpur-config-options.patch b/patches/server/0005-Add-missing-purpur-config-options.patch index c59c3ce..ad89b6d 100644 --- a/patches/server/0005-Add-missing-purpur-config-options.patch +++ b/patches/server/0005-Add-missing-purpur-config-options.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add missing purpur config options diff --git a/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java b/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java -index c783ce59ea766e6c46a3313628b961f27e01ee8b..4f6b6967f7f632752fcc4faac47dca51cfac1b79 100644 +index b3e92d3fb6fbadfc6df236754123bc12ad9bc7e7..7d4cf757f14ca651c04cab95f479bf042429f6b1 100644 --- a/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java +++ b/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java @@ -152,6 +152,23 @@ public class Allay extends PathfinderMob implements InventoryCarrier, VibrationS @@ -56,7 +56,7 @@ index cd9129bb5049c13f08c58b8581d511b59a5bb1b5..e681d81d257a797b1663bec895b7f487 public void addAdditionalSaveData(CompoundTag nbt) { super.addAdditionalSaveData(nbt); diff --git a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java -index 9417ce67cc231d5bfa6813f78ec27196eed423c8..fba383652611052877d8a9de0a41aee5ef1a861a 100644 +index b95b6d35635ebcc4ed70d3114f1b27bbffdcf076..e0d1c4eea8034a656119824bd7d3181aca94d59b 100644 --- a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java +++ b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java @@ -142,6 +142,23 @@ public class Frog extends Animal implements VariantHolder { @@ -84,7 +84,7 @@ index 9417ce67cc231d5bfa6813f78ec27196eed423c8..fba383652611052877d8a9de0a41aee5 protected Brain.Provider brainProvider() { return Brain.provider(MEMORY_TYPES, SENSOR_TYPES); diff --git a/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java b/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java -index 6b012bea26e8ef0c04571f43da67f6e108188830..2aa089f51100e67120f688d09fd3510f5abfad69 100644 +index 1e86f144d6139cff52ccc48f03f3283aa6517736..c7beb2c7e925a1d7955bcf805e0232ef82f37474 100644 --- a/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java +++ b/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java @@ -89,6 +89,23 @@ public class Tadpole extends AbstractFish { @@ -135,10 +135,10 @@ index dcb10e2ea1e0c7d0479adae5bc2ff57ece172aad..b6754b9cdf3924aa5b89473282009e53 @Override protected void defineSynchedData() { diff --git a/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java b/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java -index 5e66c2bd3807619cadee5b7081d93d21886e2806..ff098fc029a2a8bedbf5d08670fda78fb724dd38 100644 +index 656c4ee100364a3299cb78f7173ee0506d46ff04..ce8fad9a4ce04a2e6f56745794a783fa64025752 100644 --- a/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java +++ b/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java -@@ -148,6 +148,23 @@ public class Warden extends Monster implements VibrationSystem { +@@ -149,6 +149,23 @@ public class Warden extends Monster implements VibrationSystem { } // Purpur end @@ -163,7 +163,7 @@ index 5e66c2bd3807619cadee5b7081d93d21886e2806..ff098fc029a2a8bedbf5d08670fda78f public Packet getAddEntityPacket() { return new ClientboundAddEntityPacket(this, this.hasPose(Pose.EMERGING) ? 1 : 0); diff --git a/src/main/java/net/minecraft/world/entity/vehicle/ChestBoat.java b/src/main/java/net/minecraft/world/entity/vehicle/ChestBoat.java -index d70c1206df96b03c031399049a65e6a765d80347..427d74eb9d6e643a1461214b96b1377f7a52b347 100644 +index bc3fe45d12ffc2069a03d1587b7623d31130565a..81aecab9e7d11237a441aa6f92440add9223afe5 100644 --- a/src/main/java/net/minecraft/world/entity/vehicle/ChestBoat.java +++ b/src/main/java/net/minecraft/world/entity/vehicle/ChestBoat.java @@ -30,6 +30,9 @@ import org.bukkit.craftbukkit.entity.CraftHumanEntity; @@ -185,7 +185,7 @@ index d70c1206df96b03c031399049a65e6a765d80347..427d74eb9d6e643a1461214b96b1377f } public ChestBoat(Level world, double d0, double d1, double d2) { -@@ -160,7 +163,7 @@ public class ChestBoat extends Boat implements HasCustomInventoryScreen, Contain +@@ -161,7 +164,7 @@ public class ChestBoat extends Boat implements HasCustomInventoryScreen, Contain @Override public int getContainerSize() { @@ -215,10 +215,10 @@ index d8d19567cf49b41d730a936d46c8e37e5aec2f07..64459e4adb50304070b6c9c100ef9227 org.bukkit.event.inventory.InventoryType.ENDER_CHEST.setDefaultSize(enderChestSixRows ? 54 : 27); enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index b9d1117885a8dd15f207e55ce5e402d8cefe0226..6cf6fc55ac33dadf98c779f16a6c3277d9783108 100644 +index d24664bc4d373804e373266a189eb6de1e0b261d..1e2d0cc7560f2d077e257eb5b3cd1d5310744c40 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -@@ -1115,7 +1115,17 @@ public class PurpurWorldConfig { +@@ -1106,7 +1106,17 @@ public class PurpurWorldConfig { public boolean allayRidableInWater = true; public boolean allayControllable = true; public List allayRespectNBT = new ArrayList<>(); @@ -236,7 +236,7 @@ index b9d1117885a8dd15f207e55ce5e402d8cefe0226..6cf6fc55ac33dadf98c779f16a6c3277 allayRidable = getBoolean("mobs.allay.ridable", allayRidable); allayRidableInWater = getBoolean("mobs.allay.ridable-in-water", allayRidableInWater); allayControllable = getBoolean("mobs.allay.controllable", allayControllable); -@@ -1234,7 +1244,15 @@ public class PurpurWorldConfig { +@@ -1225,7 +1235,15 @@ public class PurpurWorldConfig { public double camelMovementSpeedMin = 0.09D; public double camelMovementSpeedMax = 0.09D; public int camelBreedingTicks = 6000; @@ -252,7 +252,7 @@ index b9d1117885a8dd15f207e55ce5e402d8cefe0226..6cf6fc55ac33dadf98c779f16a6c3277 camelRidableInWater = getBoolean("mobs.camel.ridable-in-water", camelRidableInWater); camelMaxHealthMin = getDouble("mobs.camel.attributes.max_health.min", camelMaxHealthMin); camelMaxHealthMax = getDouble("mobs.camel.attributes.max_health.max", camelMaxHealthMax); -@@ -1662,7 +1680,17 @@ public class PurpurWorldConfig { +@@ -1653,7 +1671,17 @@ public class PurpurWorldConfig { public boolean frogControllable = true; public float frogRidableJumpHeight = 0.65F; public int frogBreedingTicks = 6000; @@ -270,7 +270,7 @@ index b9d1117885a8dd15f207e55ce5e402d8cefe0226..6cf6fc55ac33dadf98c779f16a6c3277 frogRidable = getBoolean("mobs.frog.ridable", frogRidable); frogRidableInWater = getBoolean("mobs.frog.ridable-in-water", frogRidableInWater); frogControllable = getBoolean("mobs.frog.controllable", frogControllable); -@@ -2617,7 +2645,15 @@ public class PurpurWorldConfig { +@@ -2608,7 +2636,15 @@ public class PurpurWorldConfig { public boolean snifferControllable = true; public double snifferMaxHealth = 14.0D; public int snifferBreedingTicks = 6000; @@ -286,7 +286,7 @@ index b9d1117885a8dd15f207e55ce5e402d8cefe0226..6cf6fc55ac33dadf98c779f16a6c3277 snifferRidable = getBoolean("mobs.sniffer.ridable", snifferRidable); snifferRidableInWater = getBoolean("mobs.sniffer.ridable-in-water", snifferRidableInWater); snifferControllable = getBoolean("mobs.sniffer.controllable", snifferControllable); -@@ -2716,7 +2752,17 @@ public class PurpurWorldConfig { +@@ -2707,7 +2743,17 @@ public class PurpurWorldConfig { public boolean tadpoleRidable = false; public boolean tadpoleRidableInWater = true; public boolean tadpoleControllable = true; @@ -304,7 +304,7 @@ index b9d1117885a8dd15f207e55ce5e402d8cefe0226..6cf6fc55ac33dadf98c779f16a6c3277 tadpoleRidable = getBoolean("mobs.tadpole.ridable", tadpoleRidable); tadpoleRidableInWater = getBoolean("mobs.tadpole.ridable-in-water", tadpoleRidableInWater); tadpoleControllable = getBoolean("mobs.tadpole.controllable", tadpoleControllable); -@@ -2926,7 +2972,17 @@ public class PurpurWorldConfig { +@@ -2917,7 +2963,17 @@ public class PurpurWorldConfig { public boolean wardenRidable = false; public boolean wardenRidableInWater = true; public boolean wardenControllable = true; diff --git a/patches/server/0007-Fix-entity-serialization.patch b/patches/server/0007-Fix-entity-serialization.patch index a09d0ad..5058783 100644 --- a/patches/server/0007-Fix-entity-serialization.patch +++ b/patches/server/0007-Fix-entity-serialization.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Fix entity serialization diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index d61d7ae47285d9779221011212f871c4ef7de830..24cc1369b6561b8fb99f26253f7ba05be0a5d49b 100644 +index ef9c44206739d95efead0d6584566f97b6a56c6a..93cf451254e57a858c874c8c359db68f06fc8f9a 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -2330,15 +2330,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -2329,15 +2329,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S } } @@ -25,10 +25,10 @@ index d61d7ae47285d9779221011212f871c4ef7de830..24cc1369b6561b8fb99f26253f7ba05b return this.isPassenger() ? false : this.saveAsPassenger(nbt); } diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index 1e81801e5701b08feedd840c1e1663ae26507c16..2b5040c15657f73dfad12a97ce61161098832807 100644 +index 72bb60535d2f35435ae8b96faced60a1b8d70db6..7f31dbed85928301ef6110b267bbf19a36e131af 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -@@ -511,8 +511,13 @@ public final class CraftMagicNumbers implements UnsafeValues { +@@ -508,8 +508,13 @@ public final class CraftMagicNumbers implements UnsafeValues { Preconditions.checkNotNull(entity, "null cannot be serialized"); Preconditions.checkArgument(entity instanceof org.bukkit.craftbukkit.entity.CraftEntity, "only CraftEntities can be serialized"); diff --git a/patches/server/0010-Remove-Spigot-tick-limiter.patch b/patches/server/0010-Remove-Spigot-tick-limiter.patch index 2f6a2a0..eaf83a4 100644 --- a/patches/server/0010-Remove-Spigot-tick-limiter.patch +++ b/patches/server/0010-Remove-Spigot-tick-limiter.patch @@ -7,10 +7,10 @@ Original code by Titaniumtown, modified by NONPLAYT You can find the original code on https://gitlab.com/Titaniumtown/JettPack diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index 4ed2a063f21ae4bb840e5ec1f84e04221f753ca0..96c6195713127f41b4f60f9ed0d99543e3f147d2 100644 +index f96f6b817c9afd05269503e8a4a34ae0c468ee6c..e4a04e972a3b28cafda7dda86c26942a679541e1 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java -@@ -182,8 +182,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -185,8 +185,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable { public final gq.bxteam.divinemc.configuration.DivineWorldConfig divinemcConfig; // DivineMC public final co.aikar.timings.WorldTimingsHandler timings; // Paper public static BlockPos lastPhysicsProblem; // Spigot @@ -19,7 +19,7 @@ index 4ed2a063f21ae4bb840e5ec1f84e04221f753ca0..96c6195713127f41b4f60f9ed0d99543 private int tileTickPosition; public final Map explosionDensityCache = new HashMap<>(); // Paper - Optimize explosions public java.util.ArrayDeque redstoneUpdateInfos; // Paper - Move from Map in BlockRedstoneTorch to here -@@ -346,8 +344,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -347,8 +345,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable { // CraftBukkit end this.timings = new co.aikar.timings.WorldTimingsHandler(this); // Paper - code below can generate new world and access timings this.keepSpawnInMemory = this.paperConfig().spawn.keepSpawnLoaded; // Paper @@ -29,10 +29,10 @@ index 4ed2a063f21ae4bb840e5ec1f84e04221f753ca0..96c6195713127f41b4f60f9ed0d99543 // Paper start - optimise collisions this.minSection = io.papermc.paper.util.WorldUtil.getMinSection(this); diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index 12358c08e0e90d8d01db25534c6d5c4e726191dc..0bfdd15c71ed2fa866b6d4f201dd87b14e2a2f89 100644 +index f9ba24d32f4170c641e420991e6c358f6bd91be2..8b6de4295172dfa7eb33a20a822923e7a4954812 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java -@@ -450,6 +450,7 @@ public class SpigotWorldConfig +@@ -452,6 +452,7 @@ public class SpigotWorldConfig this.hangingTickFrequency = this.getInt( "hanging-tick-frequency", 200 ); // DivineMC - optimize default values for configs } @@ -40,7 +40,7 @@ index 12358c08e0e90d8d01db25534c6d5c4e726191dc..0bfdd15c71ed2fa866b6d4f201dd87b1 public int tileMaxTickTime; public int entityMaxTickTime; private void maxTickTimes() -@@ -458,6 +459,7 @@ public class SpigotWorldConfig +@@ -460,6 +461,7 @@ public class SpigotWorldConfig this.entityMaxTickTime = this.getInt("max-tick-time.entity", 50); this.log("Tile Max Tick Time: " + this.tileMaxTickTime + "ms Entity max Tick Time: " + this.entityMaxTickTime + "ms"); } diff --git a/patches/server/0011-Boat-Settings.patch b/patches/server/0011-Boat-Settings.patch index bc0b280..0ec1945 100644 --- a/patches/server/0011-Boat-Settings.patch +++ b/patches/server/0011-Boat-Settings.patch @@ -22,10 +22,10 @@ index 5d16d2250bae9c982a0af9ad2580a63532b140f7..9eede8eb7fefc414f3a1207cd3ca2b33 } \ No newline at end of file diff --git a/src/main/java/net/minecraft/world/entity/vehicle/Boat.java b/src/main/java/net/minecraft/world/entity/vehicle/Boat.java -index 886a35937bfbb5b46d021fd42f89614f0df5d80f..6a433c616b6d7603f7277719d12519005799126c 100644 +index 26475c2d69537053a041ec9c2f8147842848a8fc..2e03520073af9bad8c629e161ebaf747de5197b6 100644 --- a/src/main/java/net/minecraft/world/entity/vehicle/Boat.java +++ b/src/main/java/net/minecraft/world/entity/vehicle/Boat.java -@@ -401,7 +401,18 @@ public class Boat extends Entity implements VariantHolder { +@@ -338,7 +338,18 @@ public class Boat extends VehicleEntity implements VariantHolder { } if (!this.level().isClientSide && this.outOfControlTicks >= 60.0F) { @@ -45,7 +45,7 @@ index 886a35937bfbb5b46d021fd42f89614f0df5d80f..6a433c616b6d7603f7277719d1251900 } if (this.getHurtTime() > 0) { -@@ -914,7 +925,13 @@ public class Boat extends Entity implements VariantHolder { +@@ -853,7 +864,13 @@ public class Boat extends VehicleEntity implements VariantHolder { @Override public InteractionResult interact(Player player, InteractionHand hand) { @@ -60,7 +60,7 @@ index 886a35937bfbb5b46d021fd42f89614f0df5d80f..6a433c616b6d7603f7277719d1251900 } @Override -@@ -1010,7 +1027,13 @@ public class Boat extends Entity implements VariantHolder { +@@ -925,7 +942,13 @@ public class Boat extends VehicleEntity implements VariantHolder { @Override protected boolean canAddPassenger(Entity passenger) { diff --git a/patches/server/0013-Fix-MC-110386.patch b/patches/server/0012-Fix-MC-110386.patch similarity index 100% rename from patches/server/0013-Fix-MC-110386.patch rename to patches/server/0012-Fix-MC-110386.patch diff --git a/patches/server/0014-Despawn-shulker-bullets-on-owner-death.patch b/patches/server/0013-Despawn-shulker-bullets-on-owner-death.patch similarity index 100% rename from patches/server/0014-Despawn-shulker-bullets-on-owner-death.patch rename to patches/server/0013-Despawn-shulker-bullets-on-owner-death.patch diff --git a/patches/server/0015-Fix-MC-31819.patch b/patches/server/0014-Fix-MC-31819.patch similarity index 84% rename from patches/server/0015-Fix-MC-31819.patch rename to patches/server/0014-Fix-MC-31819.patch index 40de0df..36ef42a 100644 --- a/patches/server/0015-Fix-MC-31819.patch +++ b/patches/server/0014-Fix-MC-31819.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Fix MC-31819 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index 724329ded5d72eb230db392972d30e7ba4e69ceb..85578b0027d1e82936b07cc4b3a635644e2c4dd4 100644 +index f1fe8a0c1ff1514d9a158e18dc6d234d54388573..34e008e2c4d40f2912f437e344d6a149f91cdd20 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java -@@ -1974,6 +1974,11 @@ public abstract class Player extends LivingEntity { +@@ -1889,6 +1889,11 @@ public abstract class Player extends LivingEntity { } public void causeFoodExhaustion(float f, EntityExhaustionEvent.ExhaustionReason reason) { diff --git a/patches/server/0016-lithium-collections.goals.patch b/patches/server/0015-lithium-collections.goals.patch similarity index 94% rename from patches/server/0016-lithium-collections.goals.patch rename to patches/server/0015-lithium-collections.goals.patch index 17e984f..e216f4e 100644 --- a/patches/server/0016-lithium-collections.goals.patch +++ b/patches/server/0015-lithium-collections.goals.patch @@ -5,7 +5,7 @@ Subject: [PATCH] lithium: collections.goals diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java b/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java -index 02978315bc2b828cc603ce7478408f3f82c249c2..d8ee71cb3afc0f63669d26c4160f7cd7ed2fd453 100644 +index 8a70bc63e12838f45fa3eade74f2899438715886..93a97455587db28fed1b2fa7ee8063ad08c5120e 100644 --- a/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java +++ b/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java @@ -13,6 +13,7 @@ import java.util.function.Supplier; diff --git a/patches/server/0017-Reduce-sensor-work.patch b/patches/server/0016-Reduce-sensor-work.patch similarity index 96% rename from patches/server/0017-Reduce-sensor-work.patch rename to patches/server/0016-Reduce-sensor-work.patch index c433f4f..d4dc55a 100644 --- a/patches/server/0017-Reduce-sensor-work.patch +++ b/patches/server/0016-Reduce-sensor-work.patch @@ -7,7 +7,7 @@ Original project: Bloom-host/Petal Link: https://github.com/Bloom-host/Petal diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 02f4a2a0bfd66a557f5167ac9ccd13ff9f3dd763..de103337386b398dfae000ba84769ed35943d00d 100644 +index ac57b2d31019eeb12a0d63266b900c606d90b05e..f0dbd1afc4296b7203b871b9bd3d99b1f5432bed 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1037,20 +1037,19 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0018-lithium-ai.raid.patch b/patches/server/0017-lithium-ai.raid.patch similarity index 100% rename from patches/server/0018-lithium-ai.raid.patch rename to patches/server/0017-lithium-ai.raid.patch diff --git a/patches/server/0019-Do-not-drop-items-from-Give-command.patch b/patches/server/0018-Do-not-drop-items-from-Give-command.patch similarity index 100% rename from patches/server/0019-Do-not-drop-items-from-Give-command.patch rename to patches/server/0018-Do-not-drop-items-from-Give-command.patch diff --git a/patches/server/0020-Fix-MC-2025.patch b/patches/server/0019-Fix-MC-2025.patch similarity index 80% rename from patches/server/0020-Fix-MC-2025.patch rename to patches/server/0019-Fix-MC-2025.patch index 494d64d..af9bc29 100644 --- a/patches/server/0020-Fix-MC-2025.patch +++ b/patches/server/0019-Fix-MC-2025.patch @@ -7,11 +7,11 @@ Original post on Mojira: https://bugs.mojang.com/browse/MC-2025 Fix taken from Reddit: https://redd.it/8pgd4q diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 24cc1369b6561b8fb99f26253f7ba05be0a5d49b..ae41e6c3f3934d06ee913006cc5341ef87bd1bd9 100644 +index 93cf451254e57a858c874c8c359db68f06fc8f9a..52bb14a442709caf3b2d82a4c5f60a09e705d91c 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -2484,6 +2484,17 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { - nbt.putBoolean("Purpur.FireImmune", immuneToFire); +@@ -2495,6 +2495,17 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S + nbttagcompound.putBoolean("Purpur.FireImmune", immuneToFire); } // Purpur end + @@ -22,13 +22,13 @@ index 24cc1369b6561b8fb99f26253f7ba05be0a5d49b..ae41e6c3f3934d06ee913006cc5341ef + for (double coord : new double[]{boundingBox.minX, boundingBox.minY, boundingBox.minZ, boundingBox.maxX, boundingBox.maxY, boundingBox.maxZ}) { + boundingBoxList.add(DoubleTag.valueOf(coord)); + } -+ nbt.put("DivineMC.BoundingBox", boundingBoxList); ++ nbttagcompound.put("DivineMC.BoundingBox", boundingBoxList); + // DivineMC end + - return nbt; + return nbttagcompound; } catch (Throwable throwable) { CrashReport crashreport = CrashReport.forThrowable(throwable, "Saving entity NBT"); -@@ -2561,6 +2572,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -2572,6 +2583,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S this.reapplyPosition(); } diff --git a/patches/server/0021-lithium-collections.gamerules.patch b/patches/server/0020-lithium-collections.gamerules.patch similarity index 88% rename from patches/server/0021-lithium-collections.gamerules.patch rename to patches/server/0020-lithium-collections.gamerules.patch index 65a691d..d96b93b 100644 --- a/patches/server/0021-lithium-collections.gamerules.patch +++ b/patches/server/0020-lithium-collections.gamerules.patch @@ -5,7 +5,7 @@ Subject: [PATCH] lithium: collections.gamerules diff --git a/src/main/java/net/minecraft/world/level/GameRules.java b/src/main/java/net/minecraft/world/level/GameRules.java -index 6639902efb85b4f49f26ba5f90556fb871ef8a0e..42dfcd2e9e794e6b48aec8c34618065d7a740c6c 100644 +index 4f2fa47d094348bb8f86a86e808019ddba56e187..10c023cf56a86f5cc7a545a9e6056237b92c6ab6 100644 --- a/src/main/java/net/minecraft/world/level/GameRules.java +++ b/src/main/java/net/minecraft/world/level/GameRules.java @@ -27,6 +27,7 @@ import net.minecraft.network.protocol.game.ClientboundGameEventPacket; @@ -16,7 +16,7 @@ index 6639902efb85b4f49f26ba5f90556fb871ef8a0e..42dfcd2e9e794e6b48aec8c34618065d public class GameRules { -@@ -137,7 +138,7 @@ public class GameRules { +@@ -141,7 +142,7 @@ public class GameRules { } private GameRules(Map, GameRules.Value> rules) { diff --git a/patches/server/0022-Optimize-Paper-Event-Manager.patch b/patches/server/0021-Optimize-Paper-Event-Manager.patch similarity index 100% rename from patches/server/0022-Optimize-Paper-Event-Manager.patch rename to patches/server/0021-Optimize-Paper-Event-Manager.patch diff --git a/patches/server/0023-Fix-MC-65198.patch b/patches/server/0022-Fix-MC-65198.patch similarity index 97% rename from patches/server/0023-Fix-MC-65198.patch rename to patches/server/0022-Fix-MC-65198.patch index d8f539d..42dd507 100644 --- a/patches/server/0023-Fix-MC-65198.patch +++ b/patches/server/0022-Fix-MC-65198.patch @@ -27,7 +27,7 @@ index a578882b64c581ef4f47fa483a9f2988cfa4c8cf..0660c07e1f360cb5e0a865a6b7574ea1 } diff --git a/src/main/java/net/minecraft/world/inventory/ResultSlot.java b/src/main/java/net/minecraft/world/inventory/ResultSlot.java -index 2554f7b1d687f83f42d69bf8ab54336ba793e301..10e609ca5c529ab604ef61cff5600d8a9303e3a2 100644 +index 8c97a7269040436cacc65fd182fa8e5f931b6c16..bf0335e1441d99844777eb8aa83db0d6d774aa9d 100644 --- a/src/main/java/net/minecraft/world/inventory/ResultSlot.java +++ b/src/main/java/net/minecraft/world/inventory/ResultSlot.java @@ -45,7 +45,7 @@ public class ResultSlot extends Slot { diff --git a/patches/server/0024-Make-entity-goals-public.patch b/patches/server/0023-Make-entity-goals-public.patch similarity index 91% rename from patches/server/0024-Make-entity-goals-public.patch rename to patches/server/0023-Make-entity-goals-public.patch index 555727c..75f9070 100644 --- a/patches/server/0024-Make-entity-goals-public.patch +++ b/patches/server/0023-Make-entity-goals-public.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Make entity goals public diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java -index 38a3dcec138d9233a46e5d523bcc6d64bc7fffd0..07afbbf93723fa1f7ea603517534cf630df9ea5c 100644 +index bdb78cc701543cfe91a6bafd1786fe2ea0bf1ddc..40c31cc3a83a8776d396d5d14fce8c795ab08bd3 100644 --- a/src/main/java/net/minecraft/world/entity/animal/Bee.java +++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java -@@ -767,7 +767,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal { +@@ -774,7 +774,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal { return pos.closerThan(this.blockPosition(), (double) distance); } @@ -17,7 +17,7 @@ index 38a3dcec138d9233a46e5d523bcc6d64bc7fffd0..07afbbf93723fa1f7ea603517534cf63 private static final int MIN_POLLINATION_TICKS = 400; private static final int MIN_FIND_FLOWER_RETRY_COOLDOWN = 20; -@@ -956,7 +956,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal { +@@ -963,7 +963,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal { } } @@ -26,7 +26,7 @@ index 38a3dcec138d9233a46e5d523bcc6d64bc7fffd0..07afbbf93723fa1f7ea603517534cf63 BeeLookControl(Mob entity) { super(entity); -@@ -992,7 +992,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal { +@@ -999,7 +999,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal { } } @@ -35,7 +35,7 @@ index 38a3dcec138d9233a46e5d523bcc6d64bc7fffd0..07afbbf93723fa1f7ea603517534cf63 BeeEnterHiveGoal() { super(); -@@ -1037,7 +1037,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal { +@@ -1044,7 +1044,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal { } } @@ -44,7 +44,7 @@ index 38a3dcec138d9233a46e5d523bcc6d64bc7fffd0..07afbbf93723fa1f7ea603517534cf63 BeeLocateHiveGoal() { super(); -@@ -1269,7 +1269,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal { +@@ -1276,7 +1276,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal { } } @@ -53,7 +53,7 @@ index 38a3dcec138d9233a46e5d523bcc6d64bc7fffd0..07afbbf93723fa1f7ea603517534cf63 static final int GROW_CHANCE = 30; -@@ -1333,7 +1333,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal { +@@ -1340,7 +1340,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal { } } @@ -62,7 +62,7 @@ index 38a3dcec138d9233a46e5d523bcc6d64bc7fffd0..07afbbf93723fa1f7ea603517534cf63 private static final int WANDER_THRESHOLD = 22; -@@ -1380,7 +1380,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal { +@@ -1387,7 +1387,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal { } } @@ -71,7 +71,7 @@ index 38a3dcec138d9233a46e5d523bcc6d64bc7fffd0..07afbbf93723fa1f7ea603517534cf63 BeeHurtByOtherGoal(Bee entitybee) { super(entitybee); -@@ -1400,7 +1400,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal { +@@ -1407,7 +1407,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal { } } @@ -80,7 +80,7 @@ index 38a3dcec138d9233a46e5d523bcc6d64bc7fffd0..07afbbf93723fa1f7ea603517534cf63 BeeBecomeAngryTargetGoal(Bee bee) { // Objects.requireNonNull(entitybee); // CraftBukkit - decompile error -@@ -1431,7 +1431,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal { +@@ -1438,7 +1438,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal { } } diff --git a/patches/server/0025-Fix-MC-7569.patch b/patches/server/0024-Fix-MC-7569.patch similarity index 100% rename from patches/server/0025-Fix-MC-7569.patch rename to patches/server/0024-Fix-MC-7569.patch diff --git a/patches/server/0026-Fix-MC-93018.patch b/patches/server/0025-Fix-MC-93018.patch similarity index 100% rename from patches/server/0026-Fix-MC-93018.patch rename to patches/server/0025-Fix-MC-93018.patch diff --git a/patches/server/0027-Do-not-process-chat-commands-before-player-has-joine.patch b/patches/server/0026-Do-not-process-chat-commands-before-player-has-joine.patch similarity index 70% rename from patches/server/0027-Do-not-process-chat-commands-before-player-has-joine.patch rename to patches/server/0026-Do-not-process-chat-commands-before-player-has-joine.patch index 2b93016..8b330a1 100644 --- a/patches/server/0027-Do-not-process-chat-commands-before-player-has-joine.patch +++ b/patches/server/0026-Do-not-process-chat-commands-before-player-has-joine.patch @@ -5,12 +5,12 @@ Subject: [PATCH] Do not process chat/commands before player has joined diff --git a/src/main/java/gq/bxteam/divinemc/configuration/DivineConfig.java b/src/main/java/gq/bxteam/divinemc/configuration/DivineConfig.java -index 426ae4086adc0180e3f3ba06cf6c005476ca891e..02dc7f154098313ff58a688ac5080457bc108164 100644 +index 9e802fbe8e5f1a3c24cb6bc9254c72a2a0c3fde1..199a49bed6e5d827f8d01212e37f2f1de589bb8c 100644 --- a/src/main/java/gq/bxteam/divinemc/configuration/DivineConfig.java +++ b/src/main/java/gq/bxteam/divinemc/configuration/DivineConfig.java -@@ -157,4 +157,9 @@ public class DivineConfig { - private static void allowAnyUsername() { - allowAnyUsername = getBoolean("settings.player.allow-any-username", allowAnyUsername); +@@ -152,4 +152,9 @@ public class DivineConfig { + } + return builder.build(); } + + public static boolean doNotProcessChatCommands = true; @@ -20,7 +20,7 @@ index 426ae4086adc0180e3f3ba06cf6c005476ca891e..02dc7f154098313ff58a688ac5080457 } \ No newline at end of file diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index a7e82f95db5c6c054175192f019072006a3ef31f..e3c1a28e80611aef4673fb7ef46892e6b09418c7 100644 +index 6c5f5c19048ec52c088044f2bc34f54b937b1912..416cdf3a28046064b0429c1a2f8418320fb4764a 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -6,6 +6,7 @@ import com.mojang.authlib.GameProfile; @@ -31,12 +31,12 @@ index a7e82f95db5c6c054175192f019072006a3ef31f..e3c1a28e80611aef4673fb7ef46892e6 import it.unimi.dsi.fastutil.ints.Int2ObjectMap.Entry; import it.unimi.dsi.fastutil.ints.Int2ObjectMaps; import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; -@@ -2316,6 +2317,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl - this.disconnect(Component.translatable("multiplayer.disconnect.out_of_order_chat"), org.bukkit.event.player.PlayerKickEvent.Cause.OUT_OF_ORDER_CHAT); // Paper - kick event causes - }); // Paper - push to main +@@ -2337,6 +2338,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl + if (this.player.isRemoved() || this.player.getChatVisibility() == ChatVisiblity.HIDDEN) { // CraftBukkit - dead men tell no tales + this.send(new ClientboundSystemChatPacket(Component.translatable("chat.disabled.options").withStyle(ChatFormatting.RED), false)); return Optional.empty(); + } else if (player.joining && DivineConfig.doNotProcessChatCommands) { // DivineMC - EMC - do not handle chat messages before they joined + return Optional.empty(); } else { - Optional optional = this.unpackAndApplyLastSeen(acknowledgment); - + this.player.resetLastActionTime(); + return optional; diff --git a/patches/server/0028-Fix-chat-signing.patch b/patches/server/0027-Fix-chat-signing.patch similarity index 83% rename from patches/server/0028-Fix-chat-signing.patch rename to patches/server/0027-Fix-chat-signing.patch index 8005e10..fbd40eb 100644 --- a/patches/server/0028-Fix-chat-signing.patch +++ b/patches/server/0027-Fix-chat-signing.patch @@ -5,12 +5,12 @@ Subject: [PATCH] Fix chat signing diff --git a/src/main/java/net/minecraft/network/chat/SignedMessageChain.java b/src/main/java/net/minecraft/network/chat/SignedMessageChain.java -index c0a80824a0307ea673805015119cc834b268f0dc..8ddb1e61237145084f52b74c4419b9cb6b7a8ffa 100644 +index 85a8a687b1568a56e3e646b37ef78b562c1b8a82..ec6f6db1b0a1f0a1ed1016d36238c77a382d5b3a 100644 --- a/src/main/java/net/minecraft/network/chat/SignedMessageChain.java +++ b/src/main/java/net/minecraft/network/chat/SignedMessageChain.java -@@ -38,15 +38,7 @@ public class SignedMessageChain { - throw new SignedMessageChain.DecodeException(Component.translatable("chat.disabled.expiredProfileKey"), false); +@@ -43,15 +43,7 @@ public class SignedMessageChain { } else { + this.lastTimeStamp = body.timeStamp(); PlayerChatMessage playerChatMessage = new PlayerChatMessage(signedMessageLink, signature, body, (Component)null, FilterMask.PASS_THROUGH); - if (!playerChatMessage.verify(signatureValidator)) { - throw new SignedMessageChain.DecodeException(Component.translatable("multiplayer.disconnect.unsigned_chat"), true, org.bukkit.event.player.PlayerKickEvent.Cause.UNSIGNED_CHAT); // Paper - kick event causes diff --git a/patches/server/0012-Allow-any-username.patch b/patches/unapplied/server/0012-Allow-any-username.patch similarity index 100% rename from patches/server/0012-Allow-any-username.patch rename to patches/unapplied/server/0012-Allow-any-username.patch