diff --git a/gradle.properties b/gradle.properties index dbe3f41..c346648 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ group = gq.bxteam.divinemc -version = 1.20.1-R0.1-SNAPSHOT -purpurRef = f6fd5f6ba6e672bfdbc79def7e8598d984ec8b3c +version = 1.20.2-R0.1-SNAPSHOT +purpurRef = 8a46226fdd14e0f8cf80b21274ef2b79e92158ca org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/server/0001-Divine-Branding.patch b/patches/server/0001-Divine-Branding.patch index 1a7f86c..b6a6ec7 100644 --- a/patches/server/0001-Divine-Branding.patch +++ b/patches/server/0001-Divine-Branding.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Divine Branding diff --git a/build.gradle.kts b/build.gradle.kts -index 92118ece03afbe49bbe4dbe8a54c6d434434bd0c..8b450ebbb67416bbb395ed25114e8121b028fd6a 100644 +index a20880e771091f6ab9cb7f8e03b7cf97fc8db9df..1b3f6832e2dfc7e83277b1936f87ee56c0a5ae81 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -14,7 +14,7 @@ val alsoShade: Configuration by configurations.creating @@ -17,25 +17,25 @@ index 92118ece03afbe49bbe4dbe8a54c6d434434bd0c..8b450ebbb67416bbb395ed25114e8121 implementation("io.papermc.paper:paper-mojangapi:${project.version}") { exclude("io.papermc.paper", "paper-api") } -@@ -95,7 +95,7 @@ tasks.jar { +@@ -80,7 +80,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-Purpur-$implementationVersion", // Purpur + "Implementation-Version" to "git-DivineMC-$implementationVersion", // 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 07665c89af795d76fab5fb70b4ecc7e8be68cab2..547a4eaf74494499e5cc8f44a2c0c5d5702c8579 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 a1a3b66e53e7be6b913302a5da15271f6fdc1639..380cc144d4889917298bdc2ebd691f6478a47470 100644 +index aea87307b318ed34e60835ba1d9420e9a0fd4d8e..90948176112da593f6896360a4a5d59b3ae9d16f 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -265,7 +265,7 @@ import javax.annotation.Nullable; // Paper +@@ -267,7 +267,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..627ceea9fa0fccd3e466eb34d59e760be30a69a8 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 // 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 b7666de..021cd7d 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 3adc2b50d08bb27fed95c948cff9905e069a033c..bd86f0468b825e568060894f1a4233d43bb56fc5 100644 +index 6e9061dd6d5fd35d74d02c25a5985ffc5bc8e5ac..d65329d5fee1e204635cd7bcfd1a93c498fd0543 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 3adc2b50d08bb27fed95c948cff9905e069a033c..bd86f0468b825e568060894f1a4233d4 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 713a091b8083e46b395311889c2a1482279c27ec..bddbc39bb6f82e90b25ef6b101ef7124db63660c 100644 +index 7b35238aadcd10a4a246712f252e6254b0070d57..1a0f3acc5ff66e867171b95c520d96efc8fa65aa 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,15 +360,15 @@ index 713a091b8083e46b395311889c2a1482279c27ec..bddbc39bb6f82e90b25ef6b101ef7124 import net.minecraft.CrashReport; import net.minecraft.CrashReportCategory; import net.minecraft.ReportedException; -@@ -177,6 +179,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -176,6 +178,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { + // Paper end - public final com.destroystokyo.paper.antixray.ChunkPacketBlockController chunkPacketBlockController; // Paper - Anti-Xray public final org.purpurmc.purpur.PurpurWorldConfig purpurConfig; // Purpur + public final gq.bxteam.divinemc.configuration.DivineWorldConfig divinemcConfig; // DivineMC public final co.aikar.timings.WorldTimingsHandler timings; // Paper public static BlockPos lastPhysicsProblem; // Spigot private org.spigotmc.TickLimiter entityLimiter; -@@ -332,6 +335,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -257,6 +260,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,7 +377,7 @@ index 713a091b8083e46b395311889c2a1482279c27ec..bddbc39bb6f82e90b25ef6b101ef7124 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 96bb9a7f80f2849ce04eeb043a9a294786772ebe..581ca3f5218e78e432605208751f6ddbfe2a53ca 100644 +index 90948176112da593f6896360a4a5d59b3ae9d16f..843ece478bfd198f955b7d877f8dc1d0d0a1ad32 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; @@ -388,7 +388,7 @@ index 96bb9a7f80f2849ce04eeb043a9a294786772ebe..581ca3f5218e78e432605208751f6ddb import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; import java.awt.image.BufferedImage; import java.io.ByteArrayOutputStream; -@@ -1052,6 +1053,7 @@ public final class CraftServer implements Server { +@@ -1054,6 +1055,7 @@ public final class CraftServer implements Server { org.spigotmc.SpigotConfig.init((File) 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 96bb9a7f80f2849ce04eeb043a9a294786772ebe..581ca3f5218e78e432605208751f6ddb 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)) -@@ -1068,6 +1070,7 @@ public final class CraftServer implements Server { +@@ -1070,6 +1072,7 @@ public final class CraftServer implements Server { } world.spigotConfig.init(); // Spigot world.purpurConfig.init(); // Purpur @@ -404,7 +404,7 @@ index 96bb9a7f80f2849ce04eeb043a9a294786772ebe..581ca3f5218e78e432605208751f6ddb } Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper -@@ -1084,6 +1087,7 @@ public final class CraftServer implements Server { +@@ -1086,6 +1089,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 96bb9a7f80f2849ce04eeb043a9a294786772ebe..581ca3f5218e78e432605208751f6ddb this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*"); this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions"); -@@ -2996,6 +3000,13 @@ public final class CraftServer implements Server { +@@ -2993,6 +2997,13 @@ public final class CraftServer implements Server { } // Purpur end @@ -427,11 +427,11 @@ index 96bb9a7f80f2849ce04eeb043a9a294786772ebe..581ca3f5218e78e432605208751f6ddb 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 4bc0a370c7aec06d30b4ebf7fa7d73263d0543bc..e133dfa306a824bdb41e523dd778fba318087ec7 100644 +index d0372aa58214019b0b24a84eb8afdec6aec975a6..e2d68be244d53352b06515a84e6740a0b339c424 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java -@@ -187,6 +187,14 @@ public class Main { - .describedAs("Yml file"); +@@ -181,6 +181,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 09e722b..9e5be47 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 a941b00f0e4b667925ca68cc706245b05478ad77..8f7666f3c33eaf2bee0d68cc4ef1cfab09dea08a 100644 +index c314febb75a85ef12051bde392c5b57e9c5d85ac..886a35937bfbb5b46d021fd42f89614f0df5d80f 100644 --- a/src/main/java/net/minecraft/world/entity/vehicle/Boat.java +++ b/src/main/java/net/minecraft/world/entity/vehicle/Boat.java -@@ -907,7 +907,7 @@ public class Boat extends Entity implements VariantHolder { +@@ -923,7 +923,7 @@ public class Boat extends Entity 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 c766ffd..af5e5f6 100644 --- a/patches/server/0004-Optimize-default-values-for-configs.patch +++ b/patches/server/0004-Optimize-default-values-for-configs.patch @@ -4,19 +4,6 @@ Date: Mon, 27 Mar 2023 13:16:41 +0300 Subject: [PATCH] Optimize default values for configs -diff --git a/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java -index 3e36958365bc136516bafbaad0c168f7956406f1..b3594f563489e210544cc573cbe1c13d1effe52b 100644 ---- a/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java -+++ b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java -@@ -211,7 +211,7 @@ public class PufferfishConfig { - public static int maxProjectileLoadsPerTick; - public static int maxProjectileLoadsPerProjectile; - private static void projectileLoading() { -- maxProjectileLoadsPerTick = getInt("projectile.max-loads-per-tick", 10, "Controls how many chunks are allowed", "to be sync loaded by projectiles in a tick."); -+ maxProjectileLoadsPerTick = getInt("projectile.max-loads-per-tick", 8, "Controls how many chunks are allowed", "to be sync loaded by projectiles in a tick."); // DivineMC - optimize default values for configs - maxProjectileLoadsPerProjectile = getInt("projectile.max-loads-per-projectile", 10, "Controls how many chunks a projectile", "can load in its lifetime before it gets", "automatically removed."); - - setComment("projectile", "Optimizes projectile settings"); diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java index 3bc7230ca62ebe3426da293e436a962bb0134f85..fd93efca790b75e8300202342c45b845d8e7eb7c 100644 --- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java @@ -49,7 +36,7 @@ index 3bc7230ca62ebe3426da293e436a962bb0134f85..fd93efca790b75e8300202342c45b845 public boolean strictAdvancementDimensionCheck = false; public IntOr.Default compressionLevel = IntOr.Default.USE_DEFAULT; diff --git a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java -index f45afb7e2607617d1239abeca13a9002dd9a3a18..2c544d5c37df05ff609eb07f709c67b751115ef0 100644 +index ec5e23136423e42e4f55e6ea646b8285c1ca14e2..c2d9e81e49c53ecaeb80830895b46154886becfc 100644 --- a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java +++ b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java @@ -119,9 +119,9 @@ public class WorldConfiguration extends ConfigurationPart { @@ -94,7 +81,7 @@ index f45afb7e2607617d1239abeca13a9002dd9a3a18..2c544d5c37df05ff609eb07f709c67b7 public PillagerPatrols pillagerPatrols; public class PillagerPatrols extends ConfigurationPart { -@@ -372,7 +372,7 @@ public class WorldConfiguration extends ConfigurationPart { +@@ -375,7 +375,7 @@ public class WorldConfiguration extends ConfigurationPart { public class Environment extends ConfigurationPart { public boolean disableThunder = false; public boolean disableIceAndSnow = false; @@ -103,7 +90,7 @@ index f45afb7e2607617d1239abeca13a9002dd9a3a18..2c544d5c37df05ff609eb07f709c67b7 public boolean disableExplosionKnockback = false; public boolean generateFlatBedrock = false; public FrostedIce frostedIce; -@@ -418,7 +418,7 @@ public class WorldConfiguration extends ConfigurationPart { +@@ -421,7 +421,7 @@ public class WorldConfiguration extends ConfigurationPart { public class Maps extends ConfigurationPart { public int itemFrameCursorLimit = 128; @@ -112,7 +99,7 @@ index f45afb7e2607617d1239abeca13a9002dd9a3a18..2c544d5c37df05ff609eb07f709c67b7 } public Fixes fixes; -@@ -444,7 +444,7 @@ public class WorldConfiguration extends ConfigurationPart { +@@ -447,7 +447,7 @@ public class WorldConfiguration extends ConfigurationPart { public class Hopper extends ConfigurationPart { public boolean cooldownWhenFull = true; public boolean disableMoveEvent = false; @@ -121,7 +108,7 @@ index f45afb7e2607617d1239abeca13a9002dd9a3a18..2c544d5c37df05ff609eb07f709c67b7 } public Collisions collisions; -@@ -452,9 +452,9 @@ public class WorldConfiguration extends ConfigurationPart { +@@ -455,9 +455,9 @@ public class WorldConfiguration extends ConfigurationPart { public class Collisions extends ConfigurationPart { public boolean onlyPlayersCollide = false; public boolean allowVehicleCollisions = true; @@ -133,7 +120,7 @@ index f45afb7e2607617d1239abeca13a9002dd9a3a18..2c544d5c37df05ff609eb07f709c67b7 public boolean allowPlayerCrammingDamage = false; } -@@ -462,18 +462,31 @@ public class WorldConfiguration extends ConfigurationPart { +@@ -465,18 +465,31 @@ public class WorldConfiguration extends ConfigurationPart { public class Chunks extends ConfigurationPart { public AutosavePeriod autoSaveInterval = AutosavePeriod.def(); @@ -175,7 +162,7 @@ index f45afb7e2607617d1239abeca13a9002dd9a3a18..2c544d5c37df05ff609eb07f709c67b7 }); public boolean flushRegionsOnSave = false; } -@@ -488,11 +501,22 @@ public class WorldConfiguration extends ConfigurationPart { +@@ -491,11 +504,22 @@ public class WorldConfiguration extends ConfigurationPart { public TickRates tickRates; public class TickRates extends ConfigurationPart { @@ -203,7 +190,7 @@ index f45afb7e2607617d1239abeca13a9002dd9a3a18..2c544d5c37df05ff609eb07f709c67b7 } @Setting(FeatureSeedsGeneration.FEATURE_SEEDS_KEY) -@@ -500,7 +524,7 @@ public class WorldConfiguration extends ConfigurationPart { +@@ -503,7 +527,7 @@ public class WorldConfiguration extends ConfigurationPart { public class FeatureSeeds extends ConfigurationPart.Post { @Setting(FeatureSeedsGeneration.GENERATE_KEY) @@ -212,7 +199,7 @@ index f45afb7e2607617d1239abeca13a9002dd9a3a18..2c544d5c37df05ff609eb07f709c67b7 @Setting(FeatureSeedsGeneration.FEATURES_KEY) public Reference2LongMap>> features = new Reference2LongOpenHashMap<>(); -@@ -514,9 +538,9 @@ public class WorldConfiguration extends ConfigurationPart { +@@ -517,9 +541,9 @@ public class WorldConfiguration extends ConfigurationPart { public class Misc extends ConfigurationPart { public int lightQueueSize = 20; diff --git a/patches/server/0005-Add-missing-purpur-config-options.patch b/patches/server/0005-Add-missing-purpur-config-options.patch index 25137ca..bac4df6 100644 --- a/patches/server/0005-Add-missing-purpur-config-options.patch +++ b/patches/server/0005-Add-missing-purpur-config-options.patch @@ -5,10 +5,10 @@ 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 7166f4a39fd615e10d7b1f53c57363832a41f365..6746b64010f3378092f5f454d382c1a4e0fca5ab 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 -@@ -153,6 +153,23 @@ public class Allay extends PathfinderMob implements InventoryCarrier, VibrationS +@@ -152,6 +152,23 @@ public class Allay extends PathfinderMob implements InventoryCarrier, VibrationS } // Purpur end @@ -33,10 +33,10 @@ index 7166f4a39fd615e10d7b1f53c57363832a41f365..6746b64010f3378092f5f454d382c1a4 protected Brain.Provider brainProvider() { return Brain.provider(Allay.MEMORY_TYPES, Allay.SENSOR_TYPES); diff --git a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java -index 9f19ebfa6392a080672c472e08f755379e9776b4..6276ca55dd52a3663f86e6e3708335c8ff1350be 100644 +index 1d84135c709a90843b1ee34fb47508e78a7ce95d..9b2522872d428d41dd61f934e3c70b6247e3f285 100644 --- a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java +++ b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java -@@ -95,6 +95,18 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Rider +@@ -97,6 +97,18 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl } // Purpur end @@ -56,10 +56,10 @@ index 9f19ebfa6392a080672c472e08f755379e9776b4..6276ca55dd52a3663f86e6e3708335c8 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 dc1e8bcd8049d79c0e383ccd6a5697f79a3a2ebd..b47467abf2de314b5228431d72351a1e924bae99 100644 +index 420ece09271aa745b1b7123d5a72bcc6861b4584..fb21978a8952a659db58969a68dd6a49f4b400bf 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 -@@ -140,6 +140,23 @@ public class Frog extends Animal implements VariantHolder { +@@ -142,6 +142,23 @@ public class Frog extends Animal implements VariantHolder { return this.level().purpurConfig.frogBreedingTicks; } @@ -84,7 +84,7 @@ index dc1e8bcd8049d79c0e383ccd6a5697f79a3a2ebd..b47467abf2de314b5228431d72351a1e 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 d34718fcde19c8bace0fe9d44f4f97b7a156dae4..18f36e37c7ea00e6c01dcc572cbcb60eb944c726 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 { @@ -112,10 +112,10 @@ index 6b012bea26e8ef0c04571f43da67f6e108188830..2aa089f51100e67120f688d09fd3510f protected PathNavigation createNavigation(Level world) { return new WaterBoundPathNavigation(this, world); diff --git a/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java b/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java -index 14df8a4e0c1a1dcfbbd2f4fdfd865bd77bb02325..2b565804c447a49e37544afb7ed297da927cdad6 100644 +index dcb10e2ea1e0c7d0479adae5bc2ff57ece172aad..b6754b9cdf3924aa5b89473282009e5341e51a1f 100644 --- a/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java +++ b/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java -@@ -117,6 +117,18 @@ public class Sniffer extends Animal { +@@ -118,6 +118,18 @@ public class Sniffer extends Animal { return this.level().purpurConfig.snifferBreedingTicks; } @@ -135,10 +135,10 @@ index 14df8a4e0c1a1dcfbbd2f4fdfd865bd77bb02325..2b565804c447a49e37544afb7ed297da @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 3fa46affc4d77d01909cfeaeaba6e06ba9fd5592..36b4f7a3cb2cab1206eb5c523ecf7f7cb608bd2f 100644 +index b7a2edd9fb90931bb89d4f3004f1bdc051aeb053..b41c17690e3b3da156464b6773a6f0116a8ccc43 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 -@@ -147,6 +147,23 @@ public class Warden extends Monster implements VibrationSystem { +@@ -148,6 +148,23 @@ public class Warden extends Monster implements VibrationSystem { } // Purpur end @@ -195,7 +195,7 @@ index e88c39d405fc7068db64ad34a03dec8d559e749e..35f0677a31be938a87314c534d63bc24 @Override diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -index 6e5ccafddd7af250d319431f5d4433b152d1efe4..073c22244b0c19a59287578d744e81dfb96ec30a 100644 +index d8d19567cf49b41d730a936d46c8e37e5aec2f07..64459e4adb50304070b6c9c100ef922779df356d 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -328,6 +328,7 @@ public class PurpurConfig { @@ -215,10 +215,10 @@ index 6e5ccafddd7af250d319431f5d4433b152d1efe4..073c22244b0c19a59287578d744e81df 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 078102e636803f38facc049952813ff2f8b63594..c2b87617f06b2414e0e2799b972dbe76ccf91c01 100644 +index d4d9f748d259df8b6f4566efa21c15c470de5ba2..1925a7da01dd5400cf980c763892098d77c44d18 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -@@ -1117,7 +1117,17 @@ public class PurpurWorldConfig { +@@ -1113,7 +1113,17 @@ public class PurpurWorldConfig { public boolean allayRidableInWater = true; public boolean allayControllable = true; public List allayRespectNBT = new ArrayList<>(); @@ -236,7 +236,7 @@ index 078102e636803f38facc049952813ff2f8b63594..c2b87617f06b2414e0e2799b972dbe76 allayRidable = getBoolean("mobs.allay.ridable", allayRidable); allayRidableInWater = getBoolean("mobs.allay.ridable-in-water", allayRidableInWater); allayControllable = getBoolean("mobs.allay.controllable", allayControllable); -@@ -1236,7 +1246,15 @@ public class PurpurWorldConfig { +@@ -1232,7 +1242,15 @@ public class PurpurWorldConfig { public double camelMovementSpeedMin = 0.09D; public double camelMovementSpeedMax = 0.09D; public int camelBreedingTicks = 6000; @@ -252,7 +252,7 @@ index 078102e636803f38facc049952813ff2f8b63594..c2b87617f06b2414e0e2799b972dbe76 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); -@@ -1664,7 +1682,17 @@ public class PurpurWorldConfig { +@@ -1660,7 +1678,17 @@ public class PurpurWorldConfig { public boolean frogControllable = true; public float frogRidableJumpHeight = 0.65F; public int frogBreedingTicks = 6000; @@ -270,7 +270,7 @@ index 078102e636803f38facc049952813ff2f8b63594..c2b87617f06b2414e0e2799b972dbe76 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 { +@@ -2613,7 +2641,15 @@ public class PurpurWorldConfig { public boolean snifferControllable = true; public double snifferMaxHealth = 14.0D; public int snifferBreedingTicks = 6000; @@ -286,7 +286,7 @@ index 078102e636803f38facc049952813ff2f8b63594..c2b87617f06b2414e0e2799b972dbe76 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 { +@@ -2712,7 +2748,17 @@ public class PurpurWorldConfig { public boolean tadpoleRidable = false; public boolean tadpoleRidableInWater = true; public boolean tadpoleControllable = true; @@ -304,7 +304,7 @@ index 078102e636803f38facc049952813ff2f8b63594..c2b87617f06b2414e0e2799b972dbe76 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 { +@@ -2922,7 +2968,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 7222ce7..9612669 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 cf0d8da4c4b5f4aa4e4ef15897ca252a2b52ec8d..95b6639d0075c2b86f83718b3093f972d2e89b83 100644 +index 84643f0dd71530a5f18557f299d7725a8f53666e..d9c33726e4ef6199ef5d060e660c2ec5f18b2dfa 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -2336,15 +2336,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -2285,15 +2285,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } } @@ -25,10 +25,10 @@ index cf0d8da4c4b5f4aa4e4ef15897ca252a2b52ec8d..95b6639d0075c2b86f83718b3093f972 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 ffca5970a6259b024c9aa935e22cf72ed8cd8e9f..7c31515d1c0f199e8139d4c20651685b77edfcef 100644 +index 17c09c532838aeeb014b6884b6907151f6c82d13..f95f930545dd798def251fb250cde58e1676fe9b 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -@@ -496,8 +496,13 @@ public final class CraftMagicNumbers implements UnsafeValues { +@@ -478,8 +478,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/0009-EMC-Allow-negative-Amplifier-values.patch b/patches/server/0009-EMC-Allow-negative-Amplifier-values.patch index 3c169c7..19290f2 100644 --- a/patches/server/0009-EMC-Allow-negative-Amplifier-values.patch +++ b/patches/server/0009-EMC-Allow-negative-Amplifier-values.patch @@ -5,10 +5,10 @@ Subject: [PATCH] EMC - Allow negative Amplifier values diff --git a/src/main/java/net/minecraft/world/effect/MobEffectInstance.java b/src/main/java/net/minecraft/world/effect/MobEffectInstance.java -index 745e792482f61c571e2efbd4200dd1bdaef6e474..b8451c4b4d4038ffb6eea65a33d645d85101562b 100644 +index 4f2fcbcf90d6f5ee89e35c993a65cae6c5b7ed91..aad5f1865236f85a505f7bbf27ce9bb9bb568eb5 100644 --- a/src/main/java/net/minecraft/world/effect/MobEffectInstance.java +++ b/src/main/java/net/minecraft/world/effect/MobEffectInstance.java -@@ -369,7 +369,7 @@ public class MobEffectInstance implements Comparable { +@@ -376,7 +376,7 @@ public class MobEffectInstance implements Comparable { optional = Optional.empty(); } diff --git a/patches/server/0010-Remove-Spigot-tick-limiter.patch b/patches/server/0010-Remove-Spigot-tick-limiter.patch index 67d3fa5..a1b7362 100644 --- a/patches/server/0010-Remove-Spigot-tick-limiter.patch +++ b/patches/server/0010-Remove-Spigot-tick-limiter.patch @@ -5,12 +5,13 @@ Subject: [PATCH] Remove Spigot tick limiter Original code by Titaniumtown, modified by NONPLAYT You can find the original code on https://gitlab.com/Titaniumtown/JettPack +TODO: Update when Anti-XRay will be added diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index bddbc39bb6f82e90b25ef6b101ef7124db63660c..41d1bc0d3cf8502d48f2f957248d382fe58dedf3 100644 +index 1a0f3acc5ff66e867171b95c520d96efc8fa65aa..b2bd02bff590940c0106dfba327cae58198e3e46 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 { +@@ -181,8 +181,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,15 +20,15 @@ index bddbc39bb6f82e90b25ef6b101ef7124db63660c..41d1bc0d3cf8502d48f2f957248d382f 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 -@@ -425,8 +423,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -343,8 +341,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable { // CraftBukkit end timings = new co.aikar.timings.WorldTimingsHandler(this); // Paper - code below can generate new world and access timings this.keepSpawnInMemory = this.paperConfig().spawn.keepSpawnLoaded; // Paper - this.entityLimiter = new org.spigotmc.TickLimiter(spigotConfig.entityMaxTickTime); - this.tileLimiter = new org.spigotmc.TickLimiter(spigotConfig.tileMaxTickTime); - this.chunkPacketBlockController = this.paperConfig().anticheat.antiXray.enabled ? new com.destroystokyo.paper.antixray.ChunkPacketBlockControllerAntiXray(this, executor) : com.destroystokyo.paper.antixray.ChunkPacketBlockController.NO_OPERATION_INSTANCE; // Paper - Anti-Xray - } - + // Paper start - optimise collisions + this.minSection = io.papermc.paper.util.WorldUtil.getMinSection(this); + this.maxSection = io.papermc.paper.util.WorldUtil.getMaxSection(this); diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java index 389bcb5e01d66f8e3915e09a49aace5176012191..d5271bc912632e694a10897717460893a1badf04 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java diff --git a/patches/server/0011-Boat-Settings.patch b/patches/server/0011-Boat-Settings.patch index 9a75442..bc0b280 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 8f7666f3c33eaf2bee0d68cc4ef1cfab09dea08a..f1a7dc3e00f90be923828a1d812ae3026a584439 100644 +index 886a35937bfbb5b46d021fd42f89614f0df5d80f..6a433c616b6d7603f7277719d12519005799126c 100644 --- a/src/main/java/net/minecraft/world/entity/vehicle/Boat.java +++ b/src/main/java/net/minecraft/world/entity/vehicle/Boat.java -@@ -357,7 +357,18 @@ public class Boat extends Entity implements VariantHolder { +@@ -401,7 +401,18 @@ public class Boat extends Entity implements VariantHolder { } if (!this.level().isClientSide && this.outOfControlTicks >= 60.0F) { @@ -45,7 +45,7 @@ index 8f7666f3c33eaf2bee0d68cc4ef1cfab09dea08a..f1a7dc3e00f90be923828a1d812ae302 } if (this.getHurtTime() > 0) { -@@ -898,7 +909,13 @@ public class Boat extends Entity implements VariantHolder { +@@ -914,7 +925,13 @@ public class Boat extends Entity implements VariantHolder { @Override public InteractionResult interact(Player player, InteractionHand hand) { @@ -60,7 +60,7 @@ index 8f7666f3c33eaf2bee0d68cc4ef1cfab09dea08a..f1a7dc3e00f90be923828a1d812ae302 } @Override -@@ -994,7 +1011,13 @@ public class Boat extends Entity implements VariantHolder { +@@ -1010,7 +1027,13 @@ public class Boat extends Entity implements VariantHolder { @Override protected boolean canAddPassenger(Entity passenger) { diff --git a/patches/server/0012-Fallback-to-Dimension-if-World-UUID-is-unknown.patch b/patches/server/0012-Fallback-to-Dimension-if-World-UUID-is-unknown.patch index 35c6e3a..2bd0f72 100644 --- a/patches/server/0012-Fallback-to-Dimension-if-World-UUID-is-unknown.patch +++ b/patches/server/0012-Fallback-to-Dimension-if-World-UUID-is-unknown.patch @@ -20,10 +20,10 @@ index 9e802fbe8e5f1a3c24cb6bc9254c72a2a0c3fde1..cdf83dc33915632e29291c59eb184199 } \ No newline at end of file diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 824f31b68b38f2f8642fb9d59a123cfdaffbb7b2..cff386bef828950dd4e509da80283a51a423dd97 100644 +index 9942ab57f883f79719dff20f666912face27d5c4..72a36cb6decaefe3195520445bbfbcb490c083b3 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java -@@ -102,6 +102,7 @@ import net.minecraft.world.scores.PlayerTeam; +@@ -103,6 +103,7 @@ import net.minecraft.world.scores.PlayerTeam; import net.minecraft.world.scores.Scoreboard; // Paper import net.minecraft.world.scores.Team; import org.slf4j.Logger; @@ -31,7 +31,7 @@ index 824f31b68b38f2f8642fb9d59a123cfdaffbb7b2..cff386bef828950dd4e509da80283a51 // CraftBukkit start import java.util.stream.Collectors; -@@ -220,7 +221,14 @@ public abstract class PlayerList { +@@ -212,7 +213,14 @@ public abstract class PlayerList { if (bWorld != null) { resourcekey = ((CraftWorld) bWorld).getHandle().dimension(); } else { diff --git a/patches/server/0013-Allow-any-username.patch b/patches/server/0013-Allow-any-username.patch index cd9764e..726f5eb 100644 --- a/patches/server/0013-Allow-any-username.patch +++ b/patches/server/0013-Allow-any-username.patch @@ -20,10 +20,10 @@ index cdf83dc33915632e29291c59eb1841991c03e8a0..512afaa97e89e3beb92cf2ebc46248ed } \ No newline at end of file diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java -index 01d5fa265fb2818465b5a71a2e2efeec751a7a05..85d0fbcc74500ccdd66e28c5ddcfc11a500dfab9 100644 +index f0bbc48e2df1da42e4bf9f7113451738b986fbbf..85542bba7b145070b69b736519aee7f94a03568a 100644 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java -@@ -14,6 +14,8 @@ import java.util.concurrent.atomic.AtomicInteger; +@@ -16,6 +16,8 @@ import java.util.concurrent.atomic.AtomicInteger; import javax.annotation.Nullable; import javax.crypto.Cipher; import javax.crypto.SecretKey; @@ -32,7 +32,7 @@ index 01d5fa265fb2818465b5a71a2e2efeec751a7a05..85d0fbcc74500ccdd66e28c5ddcfc11a import net.minecraft.DefaultUncaughtExceptionHandler; import net.minecraft.core.UUIDUtil; import net.minecraft.network.Connection; -@@ -240,7 +242,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener, +@@ -160,7 +162,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener, @Override public void handleHello(ServerboundHelloPacket packet) { Validate.validState(this.state == ServerLoginPacketListenerImpl.State.HELLO, "Unexpected hello packet", new Object[0]); diff --git a/patches/server/0014-Fix-MC-110386.patch b/patches/unapplied/server/0014-Fix-MC-110386.patch similarity index 100% rename from patches/server/0014-Fix-MC-110386.patch rename to patches/unapplied/server/0014-Fix-MC-110386.patch diff --git a/patches/server/0015-Despawn-shulker-bullets-on-owner-death.patch b/patches/unapplied/server/0015-Despawn-shulker-bullets-on-owner-death.patch similarity index 100% rename from patches/server/0015-Despawn-shulker-bullets-on-owner-death.patch rename to patches/unapplied/server/0015-Despawn-shulker-bullets-on-owner-death.patch diff --git a/patches/server/0016-Fix-MC-31819.patch b/patches/unapplied/server/0016-Fix-MC-31819.patch similarity index 100% rename from patches/server/0016-Fix-MC-31819.patch rename to patches/unapplied/server/0016-Fix-MC-31819.patch diff --git a/patches/server/0017-lithium-collections.goals.patch b/patches/unapplied/server/0017-lithium-collections.goals.patch similarity index 100% rename from patches/server/0017-lithium-collections.goals.patch rename to patches/unapplied/server/0017-lithium-collections.goals.patch diff --git a/patches/server/0018-Reduce-sensor-work.patch b/patches/unapplied/server/0018-Reduce-sensor-work.patch similarity index 100% rename from patches/server/0018-Reduce-sensor-work.patch rename to patches/unapplied/server/0018-Reduce-sensor-work.patch diff --git a/patches/server/0019-lithium-ai.raid.patch b/patches/unapplied/server/0019-lithium-ai.raid.patch similarity index 100% rename from patches/server/0019-lithium-ai.raid.patch rename to patches/unapplied/server/0019-lithium-ai.raid.patch diff --git a/patches/server/0020-Do-not-drop-items-from-Give-command.patch b/patches/unapplied/server/0020-Do-not-drop-items-from-Give-command.patch similarity index 100% rename from patches/server/0020-Do-not-drop-items-from-Give-command.patch rename to patches/unapplied/server/0020-Do-not-drop-items-from-Give-command.patch diff --git a/patches/server/0021-Fix-MC-2025.patch b/patches/unapplied/server/0021-Fix-MC-2025.patch similarity index 100% rename from patches/server/0021-Fix-MC-2025.patch rename to patches/unapplied/server/0021-Fix-MC-2025.patch diff --git a/patches/server/0022-Paper-PR-Optimize-Varints.patch b/patches/unapplied/server/0022-Paper-PR-Optimize-Varints.patch similarity index 100% rename from patches/server/0022-Paper-PR-Optimize-Varints.patch rename to patches/unapplied/server/0022-Paper-PR-Optimize-Varints.patch diff --git a/patches/server/0023-Bump-Dependencies.patch b/patches/unapplied/server/0023-Bump-Dependencies.patch similarity index 100% rename from patches/server/0023-Bump-Dependencies.patch rename to patches/unapplied/server/0023-Bump-Dependencies.patch diff --git a/patches/server/0024-lithium-collections.gamerules.patch b/patches/unapplied/server/0024-lithium-collections.gamerules.patch similarity index 100% rename from patches/server/0024-lithium-collections.gamerules.patch rename to patches/unapplied/server/0024-lithium-collections.gamerules.patch diff --git a/patches/server/0025-Optimize-Paper-Event-Manager.patch b/patches/unapplied/server/0025-Optimize-Paper-Event-Manager.patch similarity index 100% rename from patches/server/0025-Optimize-Paper-Event-Manager.patch rename to patches/unapplied/server/0025-Optimize-Paper-Event-Manager.patch diff --git a/patches/server/0026-Fix-MC-65198.patch b/patches/unapplied/server/0026-Fix-MC-65198.patch similarity index 100% rename from patches/server/0026-Fix-MC-65198.patch rename to patches/unapplied/server/0026-Fix-MC-65198.patch diff --git a/patches/server/0027-Make-entity-goals-public.patch b/patches/unapplied/server/0027-Make-entity-goals-public.patch similarity index 100% rename from patches/server/0027-Make-entity-goals-public.patch rename to patches/unapplied/server/0027-Make-entity-goals-public.patch diff --git a/patches/server/0028-Fix-MC-7569.patch b/patches/unapplied/server/0028-Fix-MC-7569.patch similarity index 100% rename from patches/server/0028-Fix-MC-7569.patch rename to patches/unapplied/server/0028-Fix-MC-7569.patch diff --git a/patches/server/0029-Fix-MC-93018.patch b/patches/unapplied/server/0029-Fix-MC-93018.patch similarity index 100% rename from patches/server/0029-Fix-MC-93018.patch rename to patches/unapplied/server/0029-Fix-MC-93018.patch diff --git a/patches/server/0030-Do-not-process-chat-commands-before-player-has-joine.patch b/patches/unapplied/server/0030-Do-not-process-chat-commands-before-player-has-joine.patch similarity index 100% rename from patches/server/0030-Do-not-process-chat-commands-before-player-has-joine.patch rename to patches/unapplied/server/0030-Do-not-process-chat-commands-before-player-has-joine.patch