diff --git a/patches/api/0001-Divine-Branding.patch b/patches/api/0001-Divine-Branding.patch index 9d3104b..9f909ca 100644 --- a/patches/api/0001-Divine-Branding.patch +++ b/patches/api/0001-Divine-Branding.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Divine Branding diff --git a/build.gradle.kts b/build.gradle.kts -index ea3ad97909de951efa0ad322df766689339b8af6..ae3e7dca42037cfe0f90981724a9ecb217e8e4b7 100644 +index b7d584c8b96eb7699e5df90ed04bf22ee256d571..8b1de4e68aa844856af757f6dd0e2c44b8b2db30 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -223,3 +223,12 @@ tasks.check { +@@ -231,3 +231,12 @@ tasks.check { dependsOn(scanJarForOldGeneratedCode) } // Paper end @@ -22,10 +22,10 @@ index ea3ad97909de951efa0ad322df766689339b8af6..ae3e7dca42037cfe0f90981724a9ecb2 +} +// DivineMC end diff --git a/src/main/java/io/papermc/paper/ServerBuildInfo.java b/src/main/java/io/papermc/paper/ServerBuildInfo.java -index 7107eabf02d9d9b69d97c978ba421ad52031ec3f..f6005cb48750fdcf903609f3fb693895df229bc2 100644 +index 8c2c5ea14a839c8767bbf120ae5512f65475cbb0..4d71d7fb74b424e267cf547a4f89d6229ff9e680 100644 --- a/src/main/java/io/papermc/paper/ServerBuildInfo.java +++ b/src/main/java/io/papermc/paper/ServerBuildInfo.java -@@ -25,6 +25,13 @@ public interface ServerBuildInfo { +@@ -32,6 +32,13 @@ public interface ServerBuildInfo { Key BRAND_PURPUR_ID = Key.key("purpurmc", "purpur"); // Purpur end diff --git a/patches/api/0004-Optimize-Paper-Event-Manager.patch b/patches/api/0004-Optimize-Paper-Event-Manager.patch index d8e8e66..18bf33f 100644 --- a/patches/api/0004-Optimize-Paper-Event-Manager.patch +++ b/patches/api/0004-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 7e4f7cb2afbc145e532285c793573ad107bc3033..86279f35af76fbffe233e6aba64e1b5dc2aa69c3 100644 +index 12449e18180d604e9cbbc744da74a8b222a18e1f..2ca1d23b2da34708edb2701afaf9db4df65c24b5 100644 --- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java +++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java -@@ -318,4 +318,11 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm +@@ -323,4 +323,11 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm } // Paper end diff --git a/patches/api/0005-Delete-Timings.patch b/patches/api/0005-Delete-Timings.patch index 2d72dda..087e243 100644 --- a/patches/api/0005-Delete-Timings.patch +++ b/patches/api/0005-Delete-Timings.patch @@ -2178,10 +2178,10 @@ index 7740ad53796d08584bb0110f99af5639993e4d71..f0da5a8ae7e989e120f9d5ef2a417a98 server.getPluginManager().callEvent(new com.destroystokyo.paper.event.server.ServerExceptionEvent(new com.destroystokyo.paper.exception.ServerCommandException(ex, target, sender, args))); // Paper //target.timings.stopTiming(); // Spigot // Paper diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java -index 003bece642b682985625db93cad93026352bfc66..a5dbfdf1a67cac61a3f5770db26b21307ea3594d 100644 +index e8ba4f1108f2548a487877027e37d81fc150e042..a19a9d25996860455a229c4cc2503eeb5ac7ef4b 100644 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java -@@ -720,12 +720,7 @@ public final class SimplePluginManager implements PluginManager { +@@ -724,12 +724,7 @@ public final class SimplePluginManager implements PluginManager { throw new IllegalPluginAccessException("Plugin attempted to register " + event + " while not enabled"); } @@ -2195,7 +2195,7 @@ index 003bece642b682985625db93cad93026352bfc66..a5dbfdf1a67cac61a3f5770db26b2130 } @NotNull -@@ -955,8 +950,7 @@ public final class SimplePluginManager implements PluginManager { +@@ -959,8 +954,7 @@ public final class SimplePluginManager implements PluginManager { @Override public boolean useTimings() { @@ -2205,7 +2205,7 @@ index 003bece642b682985625db93cad93026352bfc66..a5dbfdf1a67cac61a3f5770db26b2130 } /** -@@ -965,7 +959,7 @@ public final class SimplePluginManager implements PluginManager { +@@ -969,7 +963,7 @@ public final class SimplePluginManager implements PluginManager { * @param use True if per event timing code should be used */ public void useTimings(boolean use) { @@ -2215,7 +2215,7 @@ index 003bece642b682985625db93cad93026352bfc66..a5dbfdf1a67cac61a3f5770db26b2130 // Paper start diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java -index f1e58639213be0c43cd2ff090b625e7d0a67e8be..473bf7997f1793dea48aa9001ae6b553bc58f2b3 100644 +index 0c6ca7588fb3d6b6497ddf032fe75e5c6c9719e5..5a8548bcc8b969cf5251e91dbe523543b57d6a3a 100644 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java @@ -43,7 +43,6 @@ import org.bukkit.plugin.TimedRegisteredListener; diff --git a/patches/api/0006-DivineMC-API-Publish.patch b/patches/api/0006-DivineMC-API-Publish.patch index b1719b1..d15426d 100644 --- a/patches/api/0006-DivineMC-API-Publish.patch +++ b/patches/api/0006-DivineMC-API-Publish.patch @@ -5,10 +5,10 @@ Subject: [PATCH] DivineMC API Publish diff --git a/build.gradle.kts b/build.gradle.kts -index ae3e7dca42037cfe0f90981724a9ecb217e8e4b7..9b9eafd38572317816553646ea38d0057a8c22fa 100644 +index 8b1de4e68aa844856af757f6dd0e2c44b8b2db30..4f7615ee07531867bda77cb3e871fbe1d4aa78a1 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -232,3 +232,14 @@ tasks.withType { +@@ -240,3 +240,14 @@ tasks.withType { compilerArgs.add("-Xlint:-dep-ann") } // DivineMC end diff --git a/patches/api/0007-Bump-Dependencies.patch b/patches/api/0007-Bump-Dependencies.patch index 446c56f..0cfcc78 100644 --- a/patches/api/0007-Bump-Dependencies.patch +++ b/patches/api/0007-Bump-Dependencies.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Bump Dependencies diff --git a/build.gradle.kts b/build.gradle.kts -index 9b9eafd38572317816553646ea38d0057a8c22fa..b2e5080e20df5b394b337118bb952d74447b86f7 100644 +index 4f7615ee07531867bda77cb3e871fbe1d4aa78a1..5f7ec80627408cb93d88fee61a851aba000d66d4 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -12,8 +12,8 @@ java { @@ -48,7 +48,7 @@ index 9b9eafd38572317816553646ea38d0057a8c22fa..b2e5080e20df5b394b337118bb952d74 apiAndDocs(platform("net.kyori:adventure-bom:$adventureVersion")) apiAndDocs("net.kyori:adventure-api") apiAndDocs("net.kyori:adventure-text-minimessage") -@@ -57,24 +63,24 @@ dependencies { +@@ -58,24 +64,24 @@ dependencies { implementation("org.ow2.asm:asm-commons:9.7") // Paper end @@ -80,7 +80,7 @@ index 9b9eafd38572317816553646ea38d0057a8c22fa..b2e5080e20df5b394b337118bb952d74 testImplementation("org.ow2.asm:asm-tree:9.7") } -@@ -149,12 +155,12 @@ tasks.withType { +@@ -157,12 +163,12 @@ tasks.withType { options.use() options.isDocFilesSubDirs = true options.links( @@ -95,7 +95,7 @@ index 9b9eafd38572317816553646ea38d0057a8c22fa..b2e5080e20df5b394b337118bb952d74 "https://www.javadoc.io/doc/com.google.code.gson/gson/2.10.1", // Paper end // Paper start -@@ -166,9 +172,9 @@ tasks.withType { +@@ -174,9 +180,9 @@ tasks.withType { "https://jd.advntr.dev/text-serializer-plain/$adventureVersion/", "https://jd.advntr.dev/text-logger-slf4j/$adventureVersion/", "https://javadoc.io/doc/org.slf4j/slf4j-api/$slf4jVersion/", diff --git a/patches/server/0001-Divine-Branding.patch b/patches/server/0001-Divine-Branding.patch index 26508aa..75d452d 100644 --- a/patches/server/0001-Divine-Branding.patch +++ b/patches/server/0001-Divine-Branding.patch @@ -5,39 +5,39 @@ Subject: [PATCH] Divine Branding diff --git a/build.gradle.kts b/build.gradle.kts -index 409a46eb82262b00a626683072f2734255f2c2b8..1df6dc41069d05e7d6aea5a42bfcc61ea9e5ccbb 100644 +index 97a4a54dfa74df7aafd9df5a0f2fdac72471c2d5..2d98802c9f9bcc07458f6c44d4ba73d44fe943de 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -13,7 +13,7 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) { val alsoShade: Configuration by configurations.creating dependencies { -- implementation(project(":purpur-api")) // Purpur +- implementation(project(":purpur-api")) // Pufferfish // Paper // Purpur + implementation(project(":divinemc-api")) // DivineMC // Paper start implementation("org.jline:jline-terminal-jansi:3.21.0") implementation("net.minecrell:terminalconsoleappender:1.3.0") -@@ -88,14 +88,14 @@ tasks.jar { +@@ -103,14 +103,14 @@ tasks.jar { val gitBranch = git("rev-parse", "--abbrev-ref", "HEAD").getText().trim() // Paper attributes( "Main-Class" to "org.bukkit.craftbukkit.Main", -- "Implementation-Title" to "Purpur", // Purpur +- "Implementation-Title" to "Purpur", // Pufferfish // Purpur + "Implementation-Title" to "DivineMC", // DivineMC "Implementation-Version" to implementationVersion, "Implementation-Vendor" to date, // Paper -- "Specification-Title" to "Purpur", // Purpur +- "Specification-Title" to "Purpur", // Pufferfish // Purpur + "Specification-Title" to "DivineMC", // DivineMC "Specification-Version" to project.version, -- "Specification-Vendor" to "Purpur Team", // Purpur -- "Brand-Id" to "purpurmc:purpur", // Purpur -- "Brand-Name" to "Purpur", // Purpur +- "Specification-Vendor" to "Purpur Team", // Pufferfish // Purpur +- "Brand-Id" to "purpurmc:purpur", // Pufferfish // Purpur +- "Brand-Name" to "Purpur", // Pufferfish // Purpur + "Specification-Vendor" to "BX Team", // DivineMC + BX Team + "Brand-Id" to "divinemc:divinemc", // DivineMC + "Brand-Name" to "DivineMC", // DivineMC "Build-Number" to (build ?: ""), "Build-Time" to Instant.now().toString(), "Git-Branch" to gitBranch, // Paper -@@ -231,3 +231,12 @@ tasks.registerRunTask("runReobfPaperclip") { +@@ -246,3 +246,12 @@ tasks.registerRunTask("runReobfPaperclip") { classpath(rootProject.tasks.named("createReobfPaperclipJar").flatMap { it.outputZip }) mainClass.set(null as String?) } @@ -173,18 +173,18 @@ index 3cb56595822799926a8141e60a42f5d1edfc6de5..05478a1ea04ec0396bc8c97090edef4a .completer(new ConsoleCommandCompleter(this.server)) .option(LineReader.Option.COMPLETE_IN_WORD, true); diff --git a/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java b/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java -index a6e5950b5875cafd734300cdfbf58f5d3736f3c8..7256e02150a2ddc2afd821299d36b1c71b7930b6 100644 +index 3099c21ee589acf6edff5903a23673adf489024f..70c407cc8c6fb28ba6fcde1b8d5a66154ed71223 100644 --- a/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java +++ b/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java -@@ -32,6 +32,7 @@ public record ServerBuildInfoImpl( - +@@ -33,6 +33,7 @@ public record ServerBuildInfoImpl( private static final String BRAND_PAPER_NAME = "Paper"; + private static final String BRAND_PUFFERFISH_NAME = "Pufferfish"; // Purpur private static final String BRAND_PURPUR_NAME = "Purpur"; // Purpur + private static final String BRAND_DIVINEMC_NAME = "DivineMC"; // DivineMC private static final String BUILD_DEV = "DEV"; -@@ -43,9 +44,9 @@ public record ServerBuildInfoImpl( +@@ -44,9 +45,9 @@ public record ServerBuildInfoImpl( this( getManifestAttribute(manifest, ATTRIBUTE_BRAND_ID) .map(Key::key) diff --git a/patches/server/0002-Divine-Configuration.patch b/patches/server/0002-Divine-Configuration.patch index 31ae094..fd1e732 100644 --- a/patches/server/0002-Divine-Configuration.patch +++ b/patches/server/0002-Divine-Configuration.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Divine Configuration diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index 744cfc91fa8b78794f1edab1f81035b21bf0c83f..8eb5101eece8be63899366c0e54938a4feebd5b3 100644 +index 2762f54515b352271feb4b26f506b06cd0fb1909..35ee62f6298b4d3bc2e294c263e7ffc862a176fa 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java @@ -58,6 +58,7 @@ import net.minecraft.world.level.GameType; @@ -16,9 +16,9 @@ index 744cfc91fa8b78794f1edab1f81035b21bf0c83f..8eb5101eece8be63899366c0e54938a4 // CraftBukkit start import net.minecraft.server.WorldLoader; -@@ -250,6 +251,16 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface - // Purpur end - com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // Paper - load version history now +@@ -253,6 +254,16 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface + gg.pufferfish.pufferfish.PufferfishConfig.load(); // Pufferfish + gg.pufferfish.pufferfish.PufferfishCommand.init(); // Pufferfish + // DivineMC start + try { @@ -34,7 +34,7 @@ index 744cfc91fa8b78794f1edab1f81035b21bf0c83f..8eb5101eece8be63899366c0e54938a4 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 ed313b0424b2e1e1335ee3e3bd4d9cfd15f24b39..4d2e285657ad2c060c384e1e4027e00d9cf25346 100644 +index 26fbc981ec9acafc7ba1753759375c142261b6ab..fd18ffa8a9d2fb43656f518c879da58611b7045a 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -83,6 +83,7 @@ import net.minecraft.world.phys.AABB; @@ -113,11 +113,11 @@ index 4414d96702ac13b2759127fb4ce98c4e5439f471..1f3f999c3362c5b5130bf269d1219a7a 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 316c5e1460ccf3386c4c8623eabb7f087df8c4b9..5823144e8a987c401126a4a0750e91fa6e83ba1a 100644 +index e35a562eec4b65335723c50180fe1471f858ae60..58cecb0253d191410aefac5d3ec18410b8c6728f 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java -@@ -184,6 +184,14 @@ public class Main { - .describedAs("Yml file"); +@@ -190,6 +190,14 @@ public class Main { + .describedAs("Yml file"); // Purpur end + // DivineMC start diff --git a/patches/server/0003-Optimize-default-values-for-configs.patch b/patches/server/0003-Optimize-default-values-for-configs.patch index 0eccc8d..d8737bc 100644 --- a/patches/server/0003-Optimize-default-values-for-configs.patch +++ b/patches/server/0003-Optimize-default-values-for-configs.patch @@ -190,10 +190,10 @@ index 4bcf27f98765abf693e535cfc1756c27a10cb316..58dd2f3ffed21eb752e757b7b7d5114f public double maxLeashDistance = Leashable.LEASH_TOO_FAR_DIST; public boolean disableSprintInterruptionOnAttack = false; diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index 8eb5101eece8be63899366c0e54938a4feebd5b3..514520c33c6f0a239055a37ddc7cae563b56f748 100644 +index 35ee62f6298b4d3bc2e294c263e7ffc862a176fa..c3b39063f4cca69ecf71708e2ad5d92bbafa5ea8 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -@@ -343,7 +343,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface +@@ -346,7 +346,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface String proxyFlavor = (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.velocity.enabled) ? "Velocity" : "BungeeCord"; String proxyLink = (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.velocity.enabled) ? "https://docs.papermc.io/velocity/security" : "http://www.spigotmc.org/wiki/firewall-guide/"; // Paper end - Add Velocity IP Forwarding Support diff --git a/patches/server/0009-Fix-MC-172801.patch b/patches/server/0009-Fix-MC-172801.patch index 5432159..9d318d8 100644 --- a/patches/server/0009-Fix-MC-172801.patch +++ b/patches/server/0009-Fix-MC-172801.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Fix MC-172801 Original post on Mojira: https://bugs.mojang.com/browse/MC-172801 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 1b9d44b43665584a8343ffe3be3e9c36849d031d..88f4fb228edbbbb12c7d5b28c880ec531445ec5f 100644 +index 380d70851d764a636c2cf3c617f609073f3eeca6..5e1674319d02c2ff6d6552a10949276633c5fe3a 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -3179,7 +3179,13 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -3205,7 +3205,13 @@ public abstract class LivingEntity extends Entity implements Attackable { } protected float getFlyingSpeed() { diff --git a/patches/server/0010-Fix-MC-2025.patch b/patches/server/0010-Fix-MC-2025.patch index 51b17be..104d7b2 100644 --- a/patches/server/0010-Fix-MC-2025.patch +++ b/patches/server/0010-Fix-MC-2025.patch @@ -7,10 +7,10 @@ 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 a8124403002b88f1bdd3bf09d7858b3ea8e7106f..476bf0c7f1d2a398caf69152638dbe56a64a1d43 100644 +index e3e71558d9d99fa878511f051d1d8592f8684ac0..ec22afe908a303e3b0a27b387e59d11efe2eebf3 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -2585,6 +2585,17 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -2594,6 +2594,17 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess nbttagcompound.putBoolean("Purpur.FireImmune", immuneToFire); } // Purpur end @@ -28,7 +28,7 @@ index a8124403002b88f1bdd3bf09d7858b3ea8e7106f..476bf0c7f1d2a398caf69152638dbe56 return nbttagcompound; } catch (Throwable throwable) { CrashReport crashreport = CrashReport.forThrowable(throwable, "Saving entity NBT"); -@@ -2662,6 +2673,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -2671,6 +2682,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess this.reapplyPosition(); } diff --git a/patches/server/0015-vmp-skip-entity-move-if-movement-is-zero.patch b/patches/server/0015-vmp-skip-entity-move-if-movement-is-zero.patch index c1a7f28..0e540ad 100644 --- a/patches/server/0015-vmp-skip-entity-move-if-movement-is-zero.patch +++ b/patches/server/0015-vmp-skip-entity-move-if-movement-is-zero.patch @@ -7,7 +7,7 @@ Original code by RelativityMC, licensed under MIT You can find the original code on https://github.com/RelativityMC/VMP-fabric (Yarn mappings) diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index a857ce770ad3ee66b719d3a9d75d21a20ad1ac54..5a955b6c72f7b560bd4d8f5104a99815dffc270e 100644 +index ec22afe908a303e3b0a27b387e59d11efe2eebf3..e11a89cf6c056ec947f56a5e2c027052d7261d4b 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -323,6 +323,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess @@ -18,7 +18,7 @@ index a857ce770ad3ee66b719d3a9d75d21a20ad1ac54..5a955b6c72f7b560bd4d8f5104a99815 public boolean onGround; public boolean horizontalCollision; public boolean verticalCollision; -@@ -1136,6 +1137,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -1145,6 +1146,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess // Paper end - detailed watchdog information public void move(MoverType movementType, Vec3 movement) { @@ -31,7 +31,7 @@ index a857ce770ad3ee66b719d3a9d75d21a20ad1ac54..5a955b6c72f7b560bd4d8f5104a99815 final Vec3 originalMovement = movement; // Paper - Expose pre-collision velocity // Paper start - detailed watchdog information ca.spottedleaf.moonrise.common.util.TickThread.ensureTickThread("Cannot move an entity off-main"); -@@ -4206,6 +4213,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -4215,6 +4222,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess } public final void setBoundingBox(AABB boundingBox) { diff --git a/patches/server/0016-vmp-use-linked-map-for-entity-trackers-for-faster-it.patch b/patches/server/0016-vmp-use-linked-map-for-entity-trackers-for-faster-it.patch index 0f4f6dd..a36dc88 100644 --- a/patches/server/0016-vmp-use-linked-map-for-entity-trackers-for-faster-it.patch +++ b/patches/server/0016-vmp-use-linked-map-for-entity-trackers-for-faster-it.patch @@ -7,7 +7,7 @@ Original code by RelativityMC, licensed under MIT You can find the original code on https://github.com/RelativityMC/VMP-fabric (Yarn mappings) diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index 989ba0fa3b928866d5a7163d1663d30d276e1264..34aa16cdfb12f20dba4e8e43cf9c1a0fb4061361 100644 +index 66ee6ca56897c9646605f5907ce895e54bc30d96..37b50001ea83481610f789dd718eab8fb79ea250 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -12,6 +12,7 @@ import com.mojang.datafixers.DataFixer; @@ -18,7 +18,7 @@ index 989ba0fa3b928866d5a7163d1663d30d276e1264..34aa16cdfb12f20dba4e8e43cf9c1a0f import it.unimi.dsi.fastutil.longs.Long2ByteMap; import it.unimi.dsi.fastutil.longs.Long2ByteOpenHashMap; import it.unimi.dsi.fastutil.longs.Long2LongMap; -@@ -179,7 +180,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider +@@ -183,7 +184,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider this.toDrop = new LongOpenHashSet(); this.tickingGenerated = new AtomicInteger(); this.playerMap = new PlayerMap(); diff --git a/patches/server/0020-lithium-entity.fast_elytra_check-entity.fast_hand_sw.patch b/patches/server/0020-lithium-entity.fast_elytra_check-entity.fast_hand_sw.patch index 76de9e8..24863db 100644 --- a/patches/server/0020-lithium-entity.fast_elytra_check-entity.fast_hand_sw.patch +++ b/patches/server/0020-lithium-entity.fast_elytra_check-entity.fast_hand_sw.patch @@ -7,10 +7,10 @@ Original code by CaffeineMC, licensed under LGPL v3 You can find the original code on https://github.com/CaffeineMC/lithium-fabric (Yarn mappings) diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 88f4fb228edbbbb12c7d5b28c880ec531445ec5f..36058552d429a11946387f608db3dc757274a038 100644 +index 5e1674319d02c2ff6d6552a10949276633c5fe3a..5fa5e8d5d71adb5c364e1aede36855dbcfdaa367 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -2696,6 +2696,7 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -2722,6 +2722,7 @@ public abstract class LivingEntity extends Entity implements Attackable { } protected void updateSwingTime() { @@ -18,7 +18,7 @@ index 88f4fb228edbbbb12c7d5b28c880ec531445ec5f..36058552d429a11946387f608db3dc75 int i = this.getCurrentSwingDuration(); if (this.swinging) { -@@ -3696,6 +3697,7 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -3722,6 +3723,7 @@ public abstract class LivingEntity extends Entity implements Attackable { } private void updateFallFlying() { diff --git a/patches/server/0028-Delete-Timings.patch b/patches/server/0028-Delete-Timings.patch index 0b289ac..33655b0 100644 --- a/patches/server/0028-Delete-Timings.patch +++ b/patches/server/0028-Delete-Timings.patch @@ -190,10 +190,10 @@ index 6b3cde6d4d1e63bec01f502f2027ee9fddac08aa..00000000000000000000000000000000 -} diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java deleted file mode 100644 -index 7620c72a4c243cbeea245203ce03a97cbfa7d922..0000000000000000000000000000000000000000 +index b35a9f4c5f8960864c402ede8a51fb5ab9c4fcc0..0000000000000000000000000000000000000000 --- a/src/main/java/co/aikar/timings/TimingsExport.java +++ /dev/null -@@ -1,388 +0,0 @@ +@@ -1,389 +0,0 @@ -/* - * This file is licensed under the MIT License (MIT). - * @@ -436,7 +436,8 @@ index 7620c72a4c243cbeea245203ce03a97cbfa7d922..00000000000000000000000000000000 - parent.put("config", createObject( - pair("spigot", mapAsJSON(Bukkit.spigot().getSpigotConfig(), null)), - pair("bukkit", mapAsJSON(Bukkit.spigot().getBukkitConfig(), null)), -- pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null)) +- pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null)), // Pufferfish +- pair("pufferfish", mapAsJSON(gg.pufferfish.pufferfish.PufferfishConfig.getConfigCopy(), null)) // Pufferfish - )); - - new TimingsExport(listeners, parent, history).start(); @@ -826,7 +827,7 @@ index 01efbc507b3d58f13f78ee286f93df40cdc3f0cb..1f7f68aad97ee73763c042837f239bdc } catch (Exception exception) { if (exception instanceof ReportedException) { diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index c56ffd2307b9c92742f760a51e16e48f3205f793..072ef5e693ca26c702bd221755613d0754a811ee 100644 +index 6fb35c36d964c96a42911b8a9e11590aaa5cca59..78967841b5f9bc7d1a45684d5fd85d8f5542899b 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -3,7 +3,6 @@ package net.minecraft.server; @@ -846,7 +847,7 @@ index c56ffd2307b9c92742f760a51e16e48f3205f793..072ef5e693ca26c702bd221755613d07 public abstract class MinecraftServer extends ReentrantBlockableEventLoop implements ServerInfo, ChunkIOErrorReporter, CommandSource, AutoCloseable, ca.spottedleaf.moonrise.patches.chunk_system.server.ChunkSystemMinecraftServer { // Paper - rewrite chunk system private static MinecraftServer SERVER; // Paper -@@ -1042,7 +1039,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop implements FeatureElement, EntityTypeT +@@ -356,10 +356,6 @@ public class EntityType implements FeatureElement, EntityTypeT this(factory, spawnGroup, saveable, summonable, fireImmune, spawnableFarFromPlayer, canSpawnInside, dimensions, spawnBoxScale, maxTrackDistance, trackTickInterval, requiredFeatures, "custom"); } public EntityType(EntityType.EntityFactory factory, MobCategory spawnGroup, boolean saveable, boolean summonable, boolean fireImmune, boolean spawnableFarFromPlayer, ImmutableSet canSpawnInside, EntityDimensions dimensions, float spawnBoxScale, int maxTrackDistance, int trackTickInterval, FeatureFlagSet requiredFeatures, String id) { @@ -994,7 +995,7 @@ index b4f4addfd35a1961a237fc0ab83e6285a0faeaee..bdb70ffc77e763d449f4f550701900b0 // Paper end this.builtInRegistryHolder = BuiltInRegistries.ENTITY_TYPE.createIntrusiveHolder(this); this.factory = factory; -@@ -727,12 +723,6 @@ public class EntityType implements FeatureElement, EntityTypeT +@@ -729,12 +725,6 @@ public class EntityType implements FeatureElement, EntityTypeT return this.updateInterval; } @@ -1008,14 +1009,13 @@ index b4f4addfd35a1961a237fc0ab83e6285a0faeaee..bdb70ffc77e763d449f4f550701900b0 return this != EntityType.PLAYER && this != EntityType.LLAMA_SPIT && this != EntityType.WITHER && this != EntityType.BAT && this != EntityType.ITEM_FRAME && this != EntityType.GLOW_ITEM_FRAME && this != EntityType.LEASH_KNOT && this != EntityType.PAINTING && this != EntityType.END_CRYSTAL && this != EntityType.EVOKER_FANGS; } diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index a4dfab3ebef627ec1fff30ea0747ac558279cef9..4b5007e49fd5fd3b0f10681fed886d4ceafa0c96 100644 +index 5fa5e8d5d71adb5c364e1aede36855dbcfdaa367..74518b87c82aa4f2a5a7a668d8d4579459dcdeed 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -157,8 +157,6 @@ import org.bukkit.event.entity.EntityTeleportEvent; +@@ -157,7 +157,6 @@ import org.bukkit.event.entity.EntityTeleportEvent; import org.bukkit.event.player.PlayerItemConsumeEvent; // CraftBukkit end --import co.aikar.timings.MinecraftTimings; // Paper - public abstract class LivingEntity extends Entity implements Attackable { @@ -1061,7 +1061,7 @@ index 09a7b418ddf564c0be13297f7c216db2e7ae1578..1e26b1099139d76e49fce14ee72061e1 this.scanRate = senseInterval; this.timeToTick = (long)RANDOM.nextInt(senseInterval); diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index e54543bfb6cfee1b79c4ce7df9967a9146a7a0a2..5093e545e81a19c0554ce6ecf57a07afd291ab42 100644 +index b273790be3d478a2aa431ba26edf8ad47164d6d7..c22f667473032c2ec861759ea9ae2de30e7037be 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -176,7 +176,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl @@ -1109,7 +1109,7 @@ index 5c96e33326e395cb26c8cc51411fd34b20f3bbbc..7841feef56fc7179e5d6e6541baad5fb @Nullable private String descriptionId; diff --git a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java -index cd0e43f4c53a746dd6183a8406269f9b11ad3571..54657ac895fb2fa9c58910d5421f0082d140cfed 100644 +index a7b6c20afd9ec3fe61d2bdf42f96398c8d6751cc..73c9f91457683e8e6bd8293b4393ccbd984eddb7 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java @@ -33,14 +33,9 @@ import org.bukkit.craftbukkit.persistence.CraftPersistentDataTypeRegistry; @@ -1214,7 +1214,7 @@ index d3ec817e95628f1fc8be4a29c9a0f13c7d5fd552..e9798517b9211c50a20ea5c69603aab3 } } diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index 4f25368d55496667f1dc2cb2879b6d783464292b..153525f5c234d6bde9a783c24849cae66aa55798 100644 +index d6aae48a5920ccad0ee6c7ff2bacaa1ac7d8353b..0dd6d59739a2cd72e5720d289aad3ecb8a6e6b18 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -200,7 +200,7 @@ public final class CraftMagicNumbers implements UnsafeValues { @@ -1236,7 +1236,7 @@ index 4f25368d55496667f1dc2cb2879b6d783464292b..153525f5c234d6bde9a783c24849cae6 @Override diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java -index 1e8100be8d443d43e99e0c5f777e20872f6e1a7f..fd8e534a790b622d83aeac8e198d06a374a6a1c2 100644 +index ed1cdea66dd117ecafd14a52727f094430f39b60..ad6a9d49d16a24e177a20ffc5b2d716f3f4b15c3 100644 --- a/src/main/java/org/spigotmc/ActivationRange.java +++ b/src/main/java/org/spigotmc/ActivationRange.java @@ -34,7 +34,6 @@ import net.minecraft.world.entity.projectile.FireworkRocketEntity; diff --git a/patches/server/0037-Block-Log4Shell-exploit.patch b/patches/server/0037-Block-Log4Shell-exploit.patch index 84324ee..4955ac0 100644 --- a/patches/server/0037-Block-Log4Shell-exploit.patch +++ b/patches/server/0037-Block-Log4Shell-exploit.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Block Log4Shell exploit diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 3c038a992083f96b6406e786c5bb1177c1fe4c51..cbaa7df3a292134e9e19f565a4f1a8f025d829da 100644 +index d7356a57de9c706de78c146ba93310c4dd30f41e..e06f914dca5625efe232440097cd6b36c02ed986 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -2347,6 +2347,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl +@@ -2348,6 +2348,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl } private void tryHandleChat(String s, Runnable runnable, boolean sync) { // CraftBukkit @@ -16,7 +16,7 @@ index 3c038a992083f96b6406e786c5bb1177c1fe4c51..cbaa7df3a292134e9e19f565a4f1a8f0 if (ServerGamePacketListenerImpl.isChatMessageIllegal(s)) { this.disconnect((Component) Component.translatable("multiplayer.disconnect.illegal_characters"), org.bukkit.event.player.PlayerKickEvent.Cause.ILLEGAL_CHARACTERS); // Paper } else if (this.player.isRemoved() || this.player.getChatVisibility() == ChatVisiblity.HIDDEN) { // CraftBukkit - dead men tell no tales -@@ -2378,6 +2379,15 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl +@@ -2379,6 +2380,15 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl } } diff --git a/patches/server/0039-Suppress-errors-from-dirty-attributes.patch b/patches/server/0039-Suppress-errors-from-dirty-attributes.patch index f2c2014..fdfb401 100644 --- a/patches/server/0039-Suppress-errors-from-dirty-attributes.patch +++ b/patches/server/0039-Suppress-errors-from-dirty-attributes.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Suppress errors from dirty attributes diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java -index 3d4926e1d882bc41157f8402ae63cd96c4dc9c31..c03469cfa880344f6b06792cbc3a08341a9397e1 100644 +index dfd09004063a8d8d93357633c8d23b6acff67b73..4b554627c135b3a40efdc38b348d023a0cc3a754 100644 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java -@@ -415,7 +415,10 @@ public class ServerEntity { +@@ -417,7 +417,10 @@ public class ServerEntity { } if (this.entity instanceof LivingEntity) { @@ -20,7 +20,7 @@ index 3d4926e1d882bc41157f8402ae63cd96c4dc9c31..c03469cfa880344f6b06792cbc3a0834 if (!set.isEmpty()) { // CraftBukkit start - Send scaled max health -@@ -426,7 +429,7 @@ public class ServerEntity { +@@ -428,7 +431,7 @@ public class ServerEntity { this.broadcastAndSend(new ClientboundUpdateAttributesPacket(this.entity.getId(), set)); } diff --git a/patches/server/0046-Petal-Async-Pathfinding.patch b/patches/server/0046-Petal-Async-Pathfinding.patch index d53e48c..566cb07 100644 --- a/patches/server/0046-Petal-Async-Pathfinding.patch +++ b/patches/server/0046-Petal-Async-Pathfinding.patch @@ -583,10 +583,10 @@ index 5f228ea02b8912283dfb9a7bd18b33802b1d77ab..b9945658239589ad840a2712db6c0817 } } 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 84c6a786658b16fe0535b4d99135ba58cec8d3a9..01d64dad1769d5585e9c51d93cd8ec6a4cac457c 100644 +index 418e8b9227789cc100c5972901bbe8c939c652d3..cad95339c2c2e5a8139e57fb761cd47be6edd1a4 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 -@@ -485,6 +485,17 @@ public class Frog extends Animal implements VariantHolder> { +@@ -486,6 +486,17 @@ public class Frog extends Animal implements VariantHolder> { super(frog, world); } @@ -604,7 +604,7 @@ index 84c6a786658b16fe0535b4d99135ba58cec8d3a9..01d64dad1769d5585e9c51d93cd8ec6a @Override public boolean canCutCorner(PathType nodeType) { return nodeType != PathType.WATER_BORDER && super.canCutCorner(nodeType); -@@ -494,6 +505,11 @@ public class Frog extends Animal implements VariantHolder> { +@@ -495,6 +506,11 @@ public class Frog extends Animal implements VariantHolder> { protected PathFinder createPathFinder(int range) { this.nodeEvaluator = new Frog.FrogNodeEvaluator(true); this.nodeEvaluator.setCanPassDoors(true); @@ -661,10 +661,10 @@ index 70650cc6f76bed79a31a9e8c86205910994a920f..2340f207c0e741ace9b2f5e008e59d58 } 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 e2bb33de1bd9f281941063f06c3f1decbfcecd3b..221afdc05ded68fbd62a3d7865b144849d0cdc4b 100644 +index e7c82656e46201ae144629945dcd33f14774b9de..8fda8e6eef03d87298f2173271aa8894cb729a62 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 -@@ -632,6 +632,16 @@ public class Warden extends Monster implements VibrationSystem { +@@ -634,6 +634,16 @@ public class Warden extends Monster implements VibrationSystem { protected PathFinder createPathFinder(int range) { this.nodeEvaluator = new WalkNodeEvaluator(); this.nodeEvaluator.setCanPassDoors(true); @@ -859,7 +859,7 @@ index 6308822f819d7cb84c8070c8a7eec1a3f822114b..3db838279e4407c28671bb1563fc96f9 public SwimNodeEvaluator(boolean canJumpOutOfWater) { diff --git a/src/main/java/space/bxteam/divinemc/configuration/DivineConfig.java b/src/main/java/space/bxteam/divinemc/configuration/DivineConfig.java -index 54beb2e8be073617638e62f22ae37942b75283d7..641a957cfda8de6f4114350393f441f2f3b9c8dd 100644 +index 77e07052a923c46ba28d79d531b43dcccf4cd546..acff9dc2f10ecbd3c219e4eaa0c29a259f2192c7 100644 --- a/src/main/java/space/bxteam/divinemc/configuration/DivineConfig.java +++ b/src/main/java/space/bxteam/divinemc/configuration/DivineConfig.java @@ -166,4 +166,21 @@ public class DivineConfig { diff --git a/patches/server/0047-Petal-Reduce-work-done-by-game-event-system.patch b/patches/server/0047-Petal-Reduce-work-done-by-game-event-system.patch index 6d5ccec..0a48290 100644 --- a/patches/server/0047-Petal-Reduce-work-done-by-game-event-system.patch +++ b/patches/server/0047-Petal-Reduce-work-done-by-game-event-system.patch @@ -34,7 +34,7 @@ index a74732902c0494c67e6acf2fc04581ff9c46b832..42752cf9aa9668f4f813adc177b7ef97 LivingEntity entityliving1 = deadEntity.getLastHurtByMob(); diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java -index 4666b51278dbe65b8e4911bcf1dbb867110c146f..260091921b7df2773b86ccf46a2e32cb2ca5c85d 100644 +index a4578ae22409edb686d0bcbac8cbc1a2e1d7b988..ae8c5228d6d5d1718c597594fcbb1fadec3575dd 100644 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java @@ -82,7 +82,18 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p @@ -57,7 +57,7 @@ index 4666b51278dbe65b8e4911bcf1dbb867110c146f..260091921b7df2773b86ccf46a2e32cb private final LevelChunkTicks blockTicks; private final LevelChunkTicks fluidTicks; -@@ -94,7 +105,7 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p +@@ -106,7 +117,7 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p super(pos, upgradeData, world, net.minecraft.server.MinecraftServer.getServer().registryAccess().registryOrThrow(Registries.BIOME), inhabitedTime, sectionArrayInitializer, blendingData); // Paper - Anti-Xray - The world isn't ready yet, use server singleton for registry this.tickersInLevel = Maps.newHashMap(); this.level = (ServerLevel) world; // CraftBukkit - type @@ -66,7 +66,7 @@ index 4666b51278dbe65b8e4911bcf1dbb867110c146f..260091921b7df2773b86ccf46a2e32cb Heightmap.Types[] aheightmap_type = Heightmap.Types.values(); int j = aheightmap_type.length; -@@ -231,9 +242,23 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p +@@ -245,9 +256,23 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p Level world = this.level; if (world instanceof ServerLevel worldserver) { @@ -93,7 +93,7 @@ index 4666b51278dbe65b8e4911bcf1dbb867110c146f..260091921b7df2773b86ccf46a2e32cb } else { return super.getListenerRegistry(ySectionCoord); } -@@ -627,7 +652,7 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p +@@ -641,7 +666,7 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p } private void removeGameEventListenerRegistry(int ySectionCoord) { diff --git a/patches/server/0049-No-chat-sign.patch b/patches/server/0049-No-chat-sign.patch index 3dfdc98..51cfd1c 100644 --- a/patches/server/0049-No-chat-sign.patch +++ b/patches/server/0049-No-chat-sign.patch @@ -105,10 +105,10 @@ index 5705cb920084b775cce4b361683b32c6b6e003ed..9c031dd0fa279a23405e5b7d77e4c11e } } diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index cdb2860ebfc7341f7d08251f9931d20471655f09..9744abd3ef2e5fb25b92c6e3580fac243678bfc7 100644 +index cf3a4f60f8cbf40cc7448fd80979f55c0c7cc6ed..08879875184a0335243ad477f208033487a4abf5 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -@@ -711,7 +711,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface +@@ -715,7 +715,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface // Paper start - Add setting for proxy online mode status return dedicatedserverproperties.enforceSecureProfile && io.papermc.paper.configuration.GlobalConfiguration.get().proxies.isProxyOnlineMode() @@ -160,7 +160,7 @@ index f31d71b2afa12676e56dd0d5c67bfb7a79961f25..3af9bd57eea12a8dffab248631e290b3 // CraftBukkit start diff --git a/src/main/java/space/bxteam/divinemc/configuration/DivineConfig.java b/src/main/java/space/bxteam/divinemc/configuration/DivineConfig.java -index 75adcde96d7924fa1892462e66ffe16476735658..09b74a2f07deee7ba38f99a7573e63b53adab057 100644 +index ae15ef065617d3399ce6fa5924f120539625eb40..5d16e0269bbdeb5086dbce9f1d51a4dc45150909 100644 --- a/src/main/java/space/bxteam/divinemc/configuration/DivineConfig.java +++ b/src/main/java/space/bxteam/divinemc/configuration/DivineConfig.java @@ -185,4 +185,9 @@ public class DivineConfig { diff --git a/patches/server/0053-Fix-MC-119417.patch b/patches/server/0053-Fix-MC-119417.patch index 546453e..6a2afa6 100644 --- a/patches/server/0053-Fix-MC-119417.patch +++ b/patches/server/0053-Fix-MC-119417.patch @@ -7,10 +7,10 @@ Original bug on Mojira: https://bugs.mojang.com/browse/MC-119417 Took here: https://github.com/Winds-Studio/Leaf/blob/ver/1.21/patches/server/0082-Fix-MC-119417.patch diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 21dfca344a7b98dfd4e20bebde6c743e5cd8c932..bf2bfe391a32a26be3f2e23e96bded1650c0dd30 100644 +index ceb9c794345922772a69a867a96531167e881d24..478720321d634ed08c816074faa4f2fbee87dd1b 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -2253,6 +2253,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple +@@ -2252,6 +2252,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple this.connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.CHANGE_GAME_MODE, (float) gameMode.getId())); if (gameMode == GameType.SPECTATOR) { this.removeEntitiesOnShoulder(); diff --git a/patches/server/0055-Option-to-disable-moved-wrongly-threshold.patch b/patches/server/0055-Option-to-disable-moved-wrongly-threshold.patch index ade12fe..dcd5cd1 100644 --- a/patches/server/0055-Option-to-disable-moved-wrongly-threshold.patch +++ b/patches/server/0055-Option-to-disable-moved-wrongly-threshold.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Option to disable moved wrongly threshold diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index cbaa7df3a292134e9e19f565a4f1a8f025d829da..fbd6471eebabd601ad972ea2bc245c5b0397a2b2 100644 +index e06f914dca5625efe232440097cd6b36c02ed986..ef90caee6fb8d3d274fb51a4f080ee7b721f88d9 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -585,7 +585,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl @@ -26,7 +26,7 @@ index cbaa7df3a292134e9e19f565a4f1a8f025d829da..fbd6471eebabd601ad972ea2bc245c5b flag2 = true; ServerGamePacketListenerImpl.LOGGER.warn("{} (vehicle of {}) moved wrongly! {}", new Object[]{entity.getName().getString(), this.player.getName().getString(), Math.sqrt(d10)}); } -@@ -1432,7 +1432,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl +@@ -1433,7 +1433,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl io.papermc.paper.event.player.PlayerFailMoveEvent event = fireFailMove(io.papermc.paper.event.player.PlayerFailMoveEvent.FailReason.MOVED_TOO_QUICKLY, toX, toY, toZ, toYaw, toPitch, true); if (!event.isAllowed()) { @@ -35,7 +35,7 @@ index cbaa7df3a292134e9e19f565a4f1a8f025d829da..fbd6471eebabd601ad972ea2bc245c5b ServerGamePacketListenerImpl.LOGGER.warn("{} moved too quickly! {},{},{}", new Object[]{this.player.getName().getString(), d6, d7, d8}); this.teleport(this.player.getX(), this.player.getY(), this.player.getZ(), this.player.getYRot(), this.player.getXRot()); return; -@@ -1501,7 +1501,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl +@@ -1502,7 +1502,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl d10 = d6 * d6 + d7 * d7 + d8 * d8; boolean movedWrongly = false; // Paper - Add fail move event; rename diff --git a/patches/server/0056-Implement-Linear-region-format.patch b/patches/server/0056-Implement-Linear-region-format.patch index 156f080..ca535c5 100644 --- a/patches/server/0056-Implement-Linear-region-format.patch +++ b/patches/server/0056-Implement-Linear-region-format.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Implement Linear region format diff --git a/build.gradle.kts b/build.gradle.kts -index 1df6dc41069d05e7d6aea5a42bfcc61ea9e5ccbb..1ee39b06a054f891ece81b53095772c72dd24ed0 100644 +index 2d98802c9f9bcc07458f6c44d4ba73d44fe943de..6aeafa7540fafa7d4dc851181b73b1aff135491b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -30,6 +30,10 @@ dependencies { @@ -63,10 +63,10 @@ index 3218cbf84f54daf06e84442d5eb1a36d8da6b215..0db1f8f64a261780e6692755669fa573 synchronized (cache) { regionFile = ((ChunkSystemRegionFileStorage)(Object)cache).moonrise$getRegionFileIfLoaded(chunkX, chunkZ); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 072ef5e693ca26c702bd221755613d0754a811ee..26bbd73a0dc0abecdd961b0c19eb7a4433dc1d0e 100644 +index 78967841b5f9bc7d1a45684d5fd85d8f5542899b..d5232959ad9f7daed9fc46a305692029d35e8745 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -981,10 +981,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop { diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java -index 548549817ab5a835c1ea66676bc75fa53f7efd45..d73f2ab3ea1b65fe7f51d685085244a6e8ba9a1a 100644 +index ebe872c4643038f0c99b289d4d5afdbedd76c6ef..c83ed213739ba2cb4e2213b82880f6c310293e10 100644 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java -@@ -575,6 +575,7 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon +@@ -617,6 +617,7 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon } public ChunkGenerator getGenerator() { @@ -64,7 +64,7 @@ index 548549817ab5a835c1ea66676bc75fa53f7efd45..d73f2ab3ea1b65fe7f51d685085244a6 } diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 4f7975af6b8b7953732342c1883d7a03363cdcfd..158986bb767bed84b10dfe1ca30c21f95b28bb5b 100644 +index 657801f794bdf25c2401a1b81a5243063e2b7852..9252d438b22484f9097ffcdac9dbb87686e31054 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -557,6 +557,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf. @@ -451,7 +451,7 @@ index 45e262308aebafa377a2353661acdd122933b99e..dd78e5231e465957308a4e1b56b14e9e @Override diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index f3c4f33e68f6b41a53c751900acd1e530f9970f6..1114000bddc0e07939fb894a626068637ed63807 100644 +index 1b3e5a0d55f80e67f1923a44682d1caf8c0ebe44..2a8817fc6c0f73634d56835835245008e60557fa 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1396,7 +1396,11 @@ public final class CraftServer implements Server { @@ -468,7 +468,7 @@ index f3c4f33e68f6b41a53c751900acd1e530f9970f6..1114000bddc0e07939fb894a62606863 DedicatedServerProperties.WorldDimensionData properties = new DedicatedServerProperties.WorldDimensionData(GsonHelper.parse((creator.generatorSettings().isEmpty()) ? "{}" : creator.generatorSettings()), creator.type().name().toLowerCase(Locale.ROOT)); diff --git a/src/main/java/space/bxteam/divinemc/configuration/DivineConfig.java b/src/main/java/space/bxteam/divinemc/configuration/DivineConfig.java -index 0dd1fb7bfcf8e8b475987c5e46a1fbd3431a121c..2070e5e83c764b38351a2e28844b92dc4d37a308 100644 +index e8cbdcc5c41acfc18fa040997421fb712de801cb..2fae4c1d1093d0e7c2c52a04b600da971018ad30 100644 --- a/src/main/java/space/bxteam/divinemc/configuration/DivineConfig.java +++ b/src/main/java/space/bxteam/divinemc/configuration/DivineConfig.java @@ -156,10 +156,12 @@ public class DivineConfig { diff --git a/patches/server/0058-Fix-MC-167242.patch b/patches/server/0058-Fix-MC-167242.patch index 5c641fa..f9f543f 100644 --- a/patches/server/0058-Fix-MC-167242.patch +++ b/patches/server/0058-Fix-MC-167242.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Fix MC-167242 diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java -index 88972d9f07eb9088c139d9dbc974b2e61943f292..fc31f4e62f06e950b14a314838badcdf67836574 100644 +index d58f845dc814011b8126cc641476b6e4e25bc328..45f3b7fa89d8004608efa402e64619bf40464d2e 100644 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java -@@ -997,6 +997,11 @@ public class Villager extends AbstractVillager implements ReputationEventHandler +@@ -999,6 +999,11 @@ public class Villager extends AbstractVillager implements ReputationEventHandler world.addFreshEntityWithPassengers(entitywitch, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.LIGHTNING); // CraftBukkit end this.releaseAllPois();