diff --git a/patches/api/0003-Rebrand.patch b/patches/api/0001-Rebrand.patch similarity index 72% rename from patches/api/0003-Rebrand.patch rename to patches/api/0001-Rebrand.patch index 97f4d9656..9153a5d0c 100644 --- a/patches/api/0003-Rebrand.patch +++ b/patches/api/0001-Rebrand.patch @@ -5,12 +5,12 @@ Subject: [PATCH] Rebrand diff --git a/src/main/java/io/papermc/paper/ServerBuildInfo.java b/src/main/java/io/papermc/paper/ServerBuildInfo.java -index a7c0936a1ee80618f9a504087c88814f738f4693..7196594e07af19a14c320d77df893978525fe386 100644 +index 652ff54e7c50412503725d628bfe72ed03059790..fb1fe2651e53a9bf46b3632c638e13eea9dcda93 100644 --- a/src/main/java/io/papermc/paper/ServerBuildInfo.java +++ b/src/main/java/io/papermc/paper/ServerBuildInfo.java -@@ -26,6 +26,13 @@ public interface ServerBuildInfo { - Key BRAND_PUFFERFISH_ID = Key.key("pufferfish", "pufferfish"); - // Purpur end +@@ -19,6 +19,12 @@ public interface ServerBuildInfo { + */ + Key BRAND_PAPER_ID = Key.key("papermc", "paper"); + // Purpur start + /** @@ -18,7 +18,6 @@ index a7c0936a1ee80618f9a504087c88814f738f4693..7196594e07af19a14c320d77df893978 + */ + Key BRAND_PURPUR_ID = Key.key("purpurmc", "purpur"); + // Purpur end -+ /** * Gets the {@code ServerBuildInfo}. * diff --git a/patches/api/0004-Purpur-config-files.patch b/patches/api/0002-Purpur-config-files.patch similarity index 100% rename from patches/api/0004-Purpur-config-files.patch rename to patches/api/0002-Purpur-config-files.patch diff --git a/patches/api/0005-Build-System-Changes.patch b/patches/api/0003-Build-System-Changes.patch similarity index 85% rename from patches/api/0005-Build-System-Changes.patch rename to patches/api/0003-Build-System-Changes.patch index ae251c792..ab8b0faa3 100644 --- a/patches/api/0005-Build-System-Changes.patch +++ b/patches/api/0003-Build-System-Changes.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Build System Changes diff --git a/build.gradle.kts b/build.gradle.kts -index 5ceaca1bd75335f85b4876a394ea8c2643cda694..49546dfbb4dd006b5a2419908890ba4c2a0e207a 100644 +index 571534b42cd9c33d6a7bb6fe3bf3a28e33f8e5de..ff4b6b735bf0117845cdb316af115079937792ed 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -170,6 +170,8 @@ tasks.jar { +@@ -162,6 +162,8 @@ tasks.jar { } tasks.withType { diff --git a/patches/api/0006-Purpur-client-support.patch b/patches/api/0004-Purpur-client-support.patch similarity index 100% rename from patches/api/0006-Purpur-client-support.patch rename to patches/api/0004-Purpur-client-support.patch diff --git a/patches/api/0007-Default-permissions.patch b/patches/api/0005-Default-permissions.patch similarity index 100% rename from patches/api/0007-Default-permissions.patch rename to patches/api/0005-Default-permissions.patch diff --git a/patches/api/0008-Ridables.patch b/patches/api/0006-Ridables.patch similarity index 100% rename from patches/api/0008-Ridables.patch rename to patches/api/0006-Ridables.patch diff --git a/patches/api/0009-Allow-inventory-resizing.patch b/patches/api/0007-Allow-inventory-resizing.patch similarity index 100% rename from patches/api/0009-Allow-inventory-resizing.patch rename to patches/api/0007-Allow-inventory-resizing.patch diff --git a/patches/api/0010-Llama-API.patch b/patches/api/0008-Llama-API.patch similarity index 100% rename from patches/api/0010-Llama-API.patch rename to patches/api/0008-Llama-API.patch diff --git a/patches/api/0011-AFK-API.patch b/patches/api/0009-AFK-API.patch similarity index 100% rename from patches/api/0011-AFK-API.patch rename to patches/api/0009-AFK-API.patch diff --git a/patches/api/0012-Bring-back-server-name.patch b/patches/api/0010-Bring-back-server-name.patch similarity index 100% rename from patches/api/0012-Bring-back-server-name.patch rename to patches/api/0010-Bring-back-server-name.patch diff --git a/patches/api/0013-ExecuteCommandEvent.patch b/patches/api/0011-ExecuteCommandEvent.patch similarity index 100% rename from patches/api/0013-ExecuteCommandEvent.patch rename to patches/api/0011-ExecuteCommandEvent.patch diff --git a/patches/api/0014-Lagging-threshold.patch b/patches/api/0012-Lagging-threshold.patch similarity index 100% rename from patches/api/0014-Lagging-threshold.patch rename to patches/api/0012-Lagging-threshold.patch diff --git a/patches/api/0015-PlayerSetSpawnerTypeWithEggEvent.patch b/patches/api/0013-PlayerSetSpawnerTypeWithEggEvent.patch similarity index 100% rename from patches/api/0015-PlayerSetSpawnerTypeWithEggEvent.patch rename to patches/api/0013-PlayerSetSpawnerTypeWithEggEvent.patch diff --git a/patches/api/0016-Anvil-API.patch b/patches/api/0014-Anvil-API.patch similarity index 100% rename from patches/api/0016-Anvil-API.patch rename to patches/api/0014-Anvil-API.patch diff --git a/patches/api/0017-ItemStack-convenience-methods.patch b/patches/api/0015-ItemStack-convenience-methods.patch similarity index 100% rename from patches/api/0017-ItemStack-convenience-methods.patch rename to patches/api/0015-ItemStack-convenience-methods.patch diff --git a/patches/api/0018-ChatColor-conveniences.patch b/patches/api/0016-ChatColor-conveniences.patch similarity index 100% rename from patches/api/0018-ChatColor-conveniences.patch rename to patches/api/0016-ChatColor-conveniences.patch diff --git a/patches/api/0019-Item-entity-immunities.patch b/patches/api/0017-Item-entity-immunities.patch similarity index 100% rename from patches/api/0019-Item-entity-immunities.patch rename to patches/api/0017-Item-entity-immunities.patch diff --git a/patches/api/0020-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch b/patches/api/0018-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch similarity index 100% rename from patches/api/0020-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch rename to patches/api/0018-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch diff --git a/patches/api/0021-Rabid-Wolf-API.patch b/patches/api/0019-Rabid-Wolf-API.patch similarity index 100% rename from patches/api/0021-Rabid-Wolf-API.patch rename to patches/api/0019-Rabid-Wolf-API.patch diff --git a/patches/api/0022-PlayerBookTooLargeEvent.patch b/patches/api/0020-PlayerBookTooLargeEvent.patch similarity index 100% rename from patches/api/0022-PlayerBookTooLargeEvent.patch rename to patches/api/0020-PlayerBookTooLargeEvent.patch diff --git a/patches/api/0023-Full-netherite-armor-grants-fire-resistance.patch b/patches/api/0021-Full-netherite-armor-grants-fire-resistance.patch similarity index 100% rename from patches/api/0023-Full-netherite-armor-grants-fire-resistance.patch rename to patches/api/0021-Full-netherite-armor-grants-fire-resistance.patch diff --git a/patches/api/0024-Add-EntityTeleportHinderedEvent.patch b/patches/api/0022-Add-EntityTeleportHinderedEvent.patch similarity index 100% rename from patches/api/0024-Add-EntityTeleportHinderedEvent.patch rename to patches/api/0022-Add-EntityTeleportHinderedEvent.patch diff --git a/patches/api/0025-Add-enchantment-target-for-bows-and-crossbows.patch b/patches/api/0023-Add-enchantment-target-for-bows-and-crossbows.patch similarity index 100% rename from patches/api/0025-Add-enchantment-target-for-bows-and-crossbows.patch rename to patches/api/0023-Add-enchantment-target-for-bows-and-crossbows.patch diff --git a/patches/api/0026-API-for-any-mob-to-burn-daylight.patch b/patches/api/0024-API-for-any-mob-to-burn-daylight.patch similarity index 100% rename from patches/api/0026-API-for-any-mob-to-burn-daylight.patch rename to patches/api/0024-API-for-any-mob-to-burn-daylight.patch diff --git a/patches/api/0027-Add-back-player-spawned-endermite-API.patch b/patches/api/0025-Add-back-player-spawned-endermite-API.patch similarity index 100% rename from patches/api/0027-Add-back-player-spawned-endermite-API.patch rename to patches/api/0025-Add-back-player-spawned-endermite-API.patch diff --git a/patches/api/0028-Fix-default-permission-system.patch b/patches/api/0026-Fix-default-permission-system.patch similarity index 100% rename from patches/api/0028-Fix-default-permission-system.patch rename to patches/api/0026-Fix-default-permission-system.patch diff --git a/patches/api/0029-Summoner-API.patch b/patches/api/0027-Summoner-API.patch similarity index 100% rename from patches/api/0029-Summoner-API.patch rename to patches/api/0027-Summoner-API.patch diff --git a/patches/api/0030-Clean-up-version-command-output.patch b/patches/api/0028-Clean-up-version-command-output.patch similarity index 100% rename from patches/api/0030-Clean-up-version-command-output.patch rename to patches/api/0028-Clean-up-version-command-output.patch diff --git a/patches/api/0031-Extended-OfflinePlayer-API.patch b/patches/api/0029-Extended-OfflinePlayer-API.patch similarity index 100% rename from patches/api/0031-Extended-OfflinePlayer-API.patch rename to patches/api/0029-Extended-OfflinePlayer-API.patch diff --git a/patches/api/0032-Added-the-ability-to-add-combustible-items.patch b/patches/api/0030-Added-the-ability-to-add-combustible-items.patch similarity index 100% rename from patches/api/0032-Added-the-ability-to-add-combustible-items.patch rename to patches/api/0030-Added-the-ability-to-add-combustible-items.patch diff --git a/patches/api/0033-Grindstone-API.patch b/patches/api/0031-Grindstone-API.patch similarity index 100% rename from patches/api/0033-Grindstone-API.patch rename to patches/api/0031-Grindstone-API.patch diff --git a/patches/api/0034-Shears-can-have-looting-enchantment.patch b/patches/api/0032-Shears-can-have-looting-enchantment.patch similarity index 100% rename from patches/api/0034-Shears-can-have-looting-enchantment.patch rename to patches/api/0032-Shears-can-have-looting-enchantment.patch diff --git a/patches/api/0035-Lobotomize-stuck-villagers.patch b/patches/api/0033-Lobotomize-stuck-villagers.patch similarity index 100% rename from patches/api/0035-Lobotomize-stuck-villagers.patch rename to patches/api/0033-Lobotomize-stuck-villagers.patch diff --git a/patches/api/0036-Add-local-difficulty-api.patch b/patches/api/0034-Add-local-difficulty-api.patch similarity index 100% rename from patches/api/0036-Add-local-difficulty-api.patch rename to patches/api/0034-Add-local-difficulty-api.patch diff --git a/patches/api/0037-Remove-Timings.patch b/patches/api/0035-Remove-Timings.patch similarity index 100% rename from patches/api/0037-Remove-Timings.patch rename to patches/api/0035-Remove-Timings.patch diff --git a/patches/api/0038-Add-Bee-API.patch b/patches/api/0036-Add-Bee-API.patch similarity index 100% rename from patches/api/0038-Add-Bee-API.patch rename to patches/api/0036-Add-Bee-API.patch diff --git a/patches/api/0039-Debug-Marker-API.patch b/patches/api/0037-Debug-Marker-API.patch similarity index 100% rename from patches/api/0039-Debug-Marker-API.patch rename to patches/api/0037-Debug-Marker-API.patch diff --git a/patches/api/0040-Add-death-screen-API.patch b/patches/api/0038-Add-death-screen-API.patch similarity index 100% rename from patches/api/0040-Add-death-screen-API.patch rename to patches/api/0038-Add-death-screen-API.patch diff --git a/patches/api/0041-Language-API.patch b/patches/api/0039-Language-API.patch similarity index 100% rename from patches/api/0041-Language-API.patch rename to patches/api/0039-Language-API.patch diff --git a/patches/api/0042-Add-log-suppression-for-LibraryLoader.patch b/patches/api/0040-Add-log-suppression-for-LibraryLoader.patch similarity index 96% rename from patches/api/0042-Add-log-suppression-for-LibraryLoader.patch rename to patches/api/0040-Add-log-suppression-for-LibraryLoader.patch index 663369b2b..f2b073e13 100644 --- a/patches/api/0042-Add-log-suppression-for-LibraryLoader.patch +++ b/patches/api/0040-Add-log-suppression-for-LibraryLoader.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add log suppression for LibraryLoader diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java -index 45a9ca8969f635d20cc44c062fda85bbccd8f8ff..e2b631fc160f13ea6e27b69f835bbdf83d6d3dec 100644 +index b412aaf08901d169ac9fc89b36f9d6ccb95c53d3..43a0de7394eb786e9c87611003cc820424979205 100644 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java @@ -55,6 +55,7 @@ public final class JavaPluginLoader implements PluginLoader { diff --git a/patches/api/0043-Fire-Immunity-API.patch b/patches/api/0041-Fire-Immunity-API.patch similarity index 100% rename from patches/api/0043-Fire-Immunity-API.patch rename to patches/api/0041-Fire-Immunity-API.patch diff --git a/patches/api/0044-Added-goat-ram-event.patch b/patches/api/0042-Added-goat-ram-event.patch similarity index 100% rename from patches/api/0044-Added-goat-ram-event.patch rename to patches/api/0042-Added-goat-ram-event.patch diff --git a/patches/api/0045-Add-PreExplodeEvents.patch b/patches/api/0043-Add-PreExplodeEvents.patch similarity index 100% rename from patches/api/0045-Add-PreExplodeEvents.patch rename to patches/api/0043-Add-PreExplodeEvents.patch diff --git a/patches/api/0046-Stored-Bee-API.patch b/patches/api/0044-Stored-Bee-API.patch similarity index 100% rename from patches/api/0046-Stored-Bee-API.patch rename to patches/api/0044-Stored-Bee-API.patch diff --git a/patches/api/0047-Explorer-Map-API.patch b/patches/api/0045-Explorer-Map-API.patch similarity index 100% rename from patches/api/0047-Explorer-Map-API.patch rename to patches/api/0045-Explorer-Map-API.patch diff --git a/patches/api/0048-Stonecutter-damage.patch b/patches/api/0046-Stonecutter-damage.patch similarity index 100% rename from patches/api/0048-Stonecutter-damage.patch rename to patches/api/0046-Stonecutter-damage.patch diff --git a/patches/server/0003-Rebrand.patch b/patches/server/0001-Rebrand.patch similarity index 96% rename from patches/server/0003-Rebrand.patch rename to patches/server/0001-Rebrand.patch index 0937b7902..47f82e3e5 100644 --- a/patches/server/0003-Rebrand.patch +++ b/patches/server/0001-Rebrand.patch @@ -5,21 +5,21 @@ Subject: [PATCH] Rebrand diff --git a/build.gradle.kts b/build.gradle.kts -index 83e2c8784eaa77851e9efc6b889d673c1fd046d0..624588207afdc52adae14e5de3d18fe1c330d832 100644 +index 2da91ed6363c0851e4c459188f5e8ef5475e0c97..8e1d6848e5da82db4c38c27af6bef71c6d843036 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -25,7 +25,7 @@ abstract class MockitoAgentProvider : CommandLineArgumentProvider { // Paper end - configure mockito agent that is needed in newer java versions dependencies { -- implementation(project(":pufferfish-api")) // Pufferfish // Paper +- implementation(project(":paper-api")) + implementation(project(":purpur-api")) // Pufferfish // Paper // Purpur - Rebrand implementation("ca.spottedleaf:concurrentutil:0.0.2") // Paper - Add ConcurrentUtil dependency // Paper start implementation("org.jline:jline-terminal-ffm:3.27.1") // use ffm on java 22+ -@@ -68,6 +68,10 @@ dependencies { - } - // Pufferfish end +@@ -61,6 +61,10 @@ dependencies { + runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18") + runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.18") + implementation("org.mozilla:rhino-runtime:1.7.14") // Purpur - Rebrand + implementation("org.mozilla:rhino-engine:1.7.14") // Purpur - Rebrand @@ -28,27 +28,27 @@ index 83e2c8784eaa77851e9efc6b889d673c1fd046d0..624588207afdc52adae14e5de3d18fe1 testImplementation("io.github.classgraph:classgraph:4.8.47") // Paper - mob goal test testImplementation("org.junit.jupiter:junit-jupiter:5.10.2") testImplementation("org.junit.platform:junit-platform-suite-engine:1.10.0") -@@ -115,14 +119,14 @@ tasks.jar { +@@ -100,14 +104,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 "Pufferfish", // Pufferfish +- "Implementation-Title" to "Paper", + "Implementation-Title" to "Purpur", // Pufferfish // Purpur - Rebrand "Implementation-Version" to implementationVersion, "Implementation-Vendor" to date, // Paper -- "Specification-Title" to "Pufferfish", // Pufferfish +- "Specification-Title" to "Paper", + "Specification-Title" to "Purpur", // Pufferfish // Purpur - Rebrand "Specification-Version" to project.version, -- "Specification-Vendor" to "Pufferfish Studios LLC", // Pufferfish -- "Brand-Id" to "pufferfish:pufferfish", // Pufferfish -- "Brand-Name" to "Pufferfish", // Pufferfish +- "Specification-Vendor" to "Paper Team", +- "Brand-Id" to "papermc:paper", +- "Brand-Name" to "Paper", + "Specification-Vendor" to "Purpur Team", // Pufferfish // Purpur - Rebrand + "Brand-Id" to "purpurmc:purpur", // Pufferfish // Purpur - Rebrand + "Brand-Name" to "Purpur", // Pufferfish // Purpur - Rebrand "Build-Number" to (build ?: ""), "Build-Time" to Instant.now().toString(), "Git-Branch" to gitBranch, // Paper -@@ -188,7 +192,7 @@ fun TaskContainer.registerRunTask( +@@ -173,7 +177,7 @@ fun TaskContainer.registerRunTask( name: String, block: JavaExec.() -> Unit ): TaskProvider = register(name) { @@ -151,35 +151,35 @@ index 6ee39b534b8d992655bc0cef3c299d12cbae0034..bc7e4e5560708fea89c584b1d8b471f4 .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 19d602e4e6fa5abf59559eab4132677b09a967a1..0843e7c5c335a58d955a0841f2e02a9e4ac824d9 100644 +index 790bad0494454ca12ee152e3de6da3da634d9b20..b36e30fd4057a938e4d90cb42a2dca661f16478e 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( +@@ -31,6 +31,7 @@ public record ServerBuildInfoImpl( + private static final String ATTRIBUTE_GIT_COMMIT = "Git-Commit"; private static final String BRAND_PAPER_NAME = "Paper"; - private static final String BRAND_PUFFERFISH_NAME = "Pufferfish"; // Purpur - Fix pufferfish issues + private static final String BRAND_PURPUR_NAME = "Purpur"; // Purpur - Rebrand private static final String BUILD_DEV = "DEV"; -@@ -43,9 +44,9 @@ public record ServerBuildInfoImpl( +@@ -42,9 +43,9 @@ public record ServerBuildInfoImpl( this( getManifestAttribute(manifest, ATTRIBUTE_BRAND_ID) .map(Key::key) -- .orElse(BRAND_PUFFERFISH_ID), // Purpur - Fix pufferfish issues +- .orElse(BRAND_PAPER_ID), + .orElse(BRAND_PURPUR_ID), // Purpur - Fix pufferfish issues // Purpur - Rebrand getManifestAttribute(manifest, ATTRIBUTE_BRAND_NAME) -- .orElse(BRAND_PUFFERFISH_NAME), // Purpur - Fix pufferfish issues +- .orElse(BRAND_PAPER_NAME), + .orElse(BRAND_PURPUR_NAME), // Purpur - Fix pufferfish issues // Purpur - Rebrand SharedConstants.getCurrentVersion().getId(), SharedConstants.getCurrentVersion().getName(), getManifestAttribute(manifest, ATTRIBUTE_BUILD_NUMBER) -@@ -62,7 +63,7 @@ public record ServerBuildInfoImpl( +@@ -61,7 +62,7 @@ public record ServerBuildInfoImpl( @Override public boolean isBrandCompatible(final @NotNull Key brandId) { -- return brandId.equals(this.brandId) || brandId.equals(BRAND_PAPER_ID); // Purpur - Fix pufferfish issues -+ return brandId.equals(this.brandId) || brandId.equals(BRAND_PAPER_ID) || brandId.equals(BRAND_PUFFERFISH_ID); // Purpur - Fix pufferfish issues // Purpur - Rebrand +- return brandId.equals(this.brandId); ++ return brandId.equals(this.brandId) || brandId.equals(BRAND_PAPER_ID); // Purpur - Fix pufferfish issues // Purpur - Rebrand } @Override @@ -267,27 +267,27 @@ index 1354ccfbf525e5e64483ac5f443cc2325ba63850..2e7c3d4befeb6256ce81ecaa9ed4e8fb // (async tasks must live with race-conditions if they attempt to cancel between these few lines of code) } diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index 6ef651e6dc16bad45aeb76f8e17b97871c506a64..d60e190ce5bfb0f57d282b8471faf61de5977076 100644 +index 15892c7769caa15f3d52a1ee2147cf9615aa0e25..d60e190ce5bfb0f57d282b8471faf61de5977076 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -505,7 +505,7 @@ public final class CraftMagicNumbers implements UnsafeValues { // Paper start @Override public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() { -- return new gg.pufferfish.pufferfish.PufferfishVersionFetcher(); // Pufferfish +- return new com.destroystokyo.paper.PaperVersionFetcher(); + return new com.destroystokyo.paper.PaperVersionFetcher(); // Pufferfish // Purpur - Rebrand } @Override diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java -index 80553face9c70c2a3d897681e7761df85b22d464..99eb04643fce44c37fd96c99756837ccafe7b559 100644 +index 774556a62eb240da42e84db4502e2ed43495be17..99eb04643fce44c37fd96c99756837ccafe7b559 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/gg.pufferfish.pufferfish/pufferfish-api/pom.properties"); // Pufferfish +- InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/io.papermc.paper/paper-api/pom.properties"); + InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/org.purpurmc.purpur/purpur-api/pom.properties"); // Pufferfish // Purpur - Rebrand Properties properties = new Properties(); diff --git a/patches/server/0004-Purpur-config-files.patch b/patches/server/0002-Purpur-config-files.patch similarity index 95% rename from patches/server/0004-Purpur-config-files.patch rename to patches/server/0002-Purpur-config-files.patch index fc11ac23e..1a0d459ac 100644 --- a/patches/server/0004-Purpur-config-files.patch +++ b/patches/server/0002-Purpur-config-files.patch @@ -5,14 +5,14 @@ Subject: [PATCH] Purpur config files diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java -index 8433c3ac440faa969069d1929b8b77fcb1080be7..be1bb14dca9367b9685841985b6198376986c496 100644 +index 8f62879582195d8ae4f64bd23f752fa133b1c973..be1bb14dca9367b9685841985b6198376986c496 100644 --- a/src/main/java/com/destroystokyo/paper/Metrics.java +++ b/src/main/java/com/destroystokyo/paper/Metrics.java @@ -592,7 +592,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("Pufferfish", serverUUID, logFailedRequests, Bukkit.getLogger()); // Pufferfish +- Metrics metrics = new Metrics("Paper", serverUUID, logFailedRequests, Bukkit.getLogger()); + Metrics metrics = new Metrics("Purpur", serverUUID, logFailedRequests, Bukkit.getLogger()); // Pufferfish // Purpur - Purpur config files metrics.addCustomChart(new Metrics.SimplePie("minecraft_version", () -> { @@ -26,11 +26,11 @@ index 8433c3ac440faa969069d1929b8b77fcb1080be7..be1bb14dca9367b9685841985b619837 - final String implVersion = org.bukkit.craftbukkit.Main.class.getPackage().getImplementationVersion(); - if (implVersion != null) { - final String buildOrHash = implVersion.substring(implVersion.lastIndexOf('-') + 1); -- paperVersion = "git-Pufferfish-%s-%s".formatted(Bukkit.getServer().getMinecraftVersion(), buildOrHash); // Pufferfish +- paperVersion = "git-Paper-%s-%s".formatted(Bukkit.getServer().getMinecraftVersion(), buildOrHash); - } else { - paperVersion = "unknown"; - } -- metrics.addCustomChart(new Metrics.SimplePie("pufferfish_version", () -> paperVersion)); // Pufferfish +- metrics.addCustomChart(new Metrics.SimplePie("paper_version", () -> paperVersion)); + metrics.addCustomChart(new Metrics.SimplePie("online_mode", () -> Bukkit.getOnlineMode() ? "online" : (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.isProxyOnlineMode() ? "bungee" : "offline"))); // Purpur - Purpur config files + metrics.addCustomChart(new Metrics.SimplePie("purpur_version", () -> (org.bukkit.craftbukkit.Main.class.getPackage().getImplementationVersion() != null) ? org.bukkit.craftbukkit.Main.class.getPackage().getImplementationVersion() : "unknown")); // Purpur - Purpur config files @@ -72,7 +72,7 @@ index 13bd145b1e8006a53c22f5dc0c78f29b540c7663..7b2daf47e411362a462019a1612a99c9 boolean flag1 = this.source.acceptsSuccess() && !this.silent; boolean flag2 = broadcastToOps && this.source.shouldInformAdmins() && !this.silent; diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index 8ccf355a2541c8fb725c312c6955bb6cf624ff0f..135dd18f143e2cfe21ac35019aee61f6cdc80ef7 100644 +index 17a158ff6ce6520b69a5a0032ba4c05449dd0cf8..cf63c64b8c2ac148b83325209940713a91b91bad 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java @@ -235,6 +235,15 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface @@ -89,10 +89,10 @@ index 8ccf355a2541c8fb725c312c6955bb6cf624ff0f..135dd18f143e2cfe21ac35019aee61f6 + org.purpurmc.purpur.PurpurConfig.registerCommands(); + // Purpur end - Purpur config files com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // Paper - load version history now - gg.pufferfish.pufferfish.PufferfishConfig.pufferfishFile = (java.io.File) options.valueOf("pufferfish-settings"); // Purpur - Fix pufferfish issues - gg.pufferfish.pufferfish.PufferfishConfig.load(); // Pufferfish + + this.setPvpAllowed(dedicatedserverproperties.pvp); diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index 6470f145e2470574a40ddce6ca5bf924c1bb094c..62d4ccafc005ff00c17db9863db56b9ec77735c7 100644 +index 27f9d167b5ae9ce5117798ea44324107df59425f..f3c5e076558cd8d7b9d9b3212872f8675670b2dd 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -175,6 +175,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl @@ -159,13 +159,13 @@ index 97b5d6ba2b19a7c730730c74175a29157aed1840..cc2f23613644126c3f7506b26db8e6a8 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 d74f885fcdf686359f761aa7356fe03cf293ee59..31b08d0c879ca7af6e186bf93095cd01e2565fcf 100644 +index 1c2439ffc1e407ff69286817d22f127470ce07ba..d313f3a9b31d4ecc3b48f8fc2e44d3b445e8e2c5 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java -@@ -183,6 +183,13 @@ public class Main { - .defaultsTo(new File("pufferfish.yml")) - .describedAs("Yml file"); - // Purpur end - Fix pufferfish issues +@@ -176,6 +176,13 @@ public class Main { + .describedAs("Jar file"); + // Paper end + + // Purpur start - Purpur config files + acceptsAll(asList("purpur", "purpur-settings"), "File for purpur settings") + .withRequiredArg() diff --git a/patches/server/0005-Purpur-client-support.patch b/patches/server/0003-Purpur-client-support.patch similarity index 100% rename from patches/server/0005-Purpur-client-support.patch rename to patches/server/0003-Purpur-client-support.patch diff --git a/patches/server/0006-MC-Utils.patch b/patches/server/0004-MC-Utils.patch similarity index 100% rename from patches/server/0006-MC-Utils.patch rename to patches/server/0004-MC-Utils.patch diff --git a/patches/server/0007-Fix-decompile-errors.patch b/patches/server/0005-Fix-decompile-errors.patch similarity index 100% rename from patches/server/0007-Fix-decompile-errors.patch rename to patches/server/0005-Fix-decompile-errors.patch diff --git a/patches/server/0008-Component-related-conveniences.patch b/patches/server/0006-Component-related-conveniences.patch similarity index 100% rename from patches/server/0008-Component-related-conveniences.patch rename to patches/server/0006-Component-related-conveniences.patch diff --git a/patches/server/0009-Ridables.patch b/patches/server/0007-Ridables.patch similarity index 98% rename from patches/server/0009-Ridables.patch rename to patches/server/0007-Ridables.patch index 33181ae08..9ebf529d2 100644 --- a/patches/server/0009-Ridables.patch +++ b/patches/server/0007-Ridables.patch @@ -22,10 +22,10 @@ index faffd87c357511ef00646971a16acf1009362c59..6714b4a39180affd101f1cab0d587cf2 super(x, y, z); } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 312edb4c47a404c1d20e6bdf748a4ccb49a330f4..1e00cdcf16f1c7ca8dde8eaabea400819c2ebdb5 100644 +index ae4ebf509837e8d44255781c61d02873f8b74be8..ce4ce361061932162ace58070d44d1aa70189dbd 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1864,6 +1864,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop 0; // Paper - Add EntityMoveEvent net.minecraft.world.level.block.entity.HopperBlockEntity.skipHopperEvents = worldserver.paperConfig().hopper.disableMoveEvent || org.bukkit.event.inventory.InventoryMoveItemEvent.getHandlerList().getRegisteredListeners().length == 0; // Paper - Perf: Optimize Hoppers worldserver.updateLagCompensationTick(); // Paper - lag compensation @@ -34,7 +34,7 @@ index 312edb4c47a404c1d20e6bdf748a4ccb49a330f4..1e00cdcf16f1c7ca8dde8eaabea40081 gameprofilerfiller.push(() -> { String s = String.valueOf(worldserver); diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index fe295515b8043d988eb87c2caf516a4ae4169451..0a919b04cdc9599f0b8ddea3c8e0a77c261750aa 100644 +index 1f898500d0e9b18a880645ceb0a8ff0fe75f4e48..4b9434b2d03cd24f5dac7098d2f1318fd12baddb 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -232,6 +232,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe @@ -46,7 +46,7 @@ index fe295515b8043d988eb87c2caf516a4ae4169451..0a919b04cdc9599f0b8ddea3c8e0a77c public LevelChunk getChunkIfLoaded(int x, int z) { return this.chunkSource.getChunkAtIfLoadedImmediately(x, z); // Paper - Use getChunkIfLoadedImmediately diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index a8c89328222f84dd69ee5dc69b07ddd5705d3259..0c4ccba73aab8a000d9cf1342aca4509383ac96f 100644 +index 09a7809b89a4f302a1149850d4daeb471365d189..8207208d6fb3f982e9909add9e74a0dda69e8120 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1030,6 +1030,15 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple @@ -66,10 +66,10 @@ index a8c89328222f84dd69ee5dc69b07ddd5705d3259..0c4ccba73aab8a000d9cf1342aca4509 private void updatePlayerAttributes() { diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index dedd8b3644699c4bdb33c9a7046342b620889b87..7f03d81ac3a1cc87f73c5580caa6acbc7ebed8f5 100644 +index 84fa24880d02dc7ba1ec8bda3575be38447fd4b2..fbc59503316d566e88b037851afd74e5469c281b 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -2888,6 +2888,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl +@@ -2887,6 +2887,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl ServerGamePacketListenerImpl.this.cserver.getPluginManager().callEvent(event); @@ -79,7 +79,7 @@ index dedd8b3644699c4bdb33c9a7046342b620889b87..7f03d81ac3a1cc87f73c5580caa6acbc if ((entity instanceof Bucketable && entity instanceof LivingEntity && origItem != null && origItem.asItem() == Items.WATER_BUCKET) && (event.isCancelled() || ServerGamePacketListenerImpl.this.player.getInventory().getSelected() == null || ServerGamePacketListenerImpl.this.player.getInventory().getSelected().getItem() != origItem)) { entity.resendPossiblyDesyncedEntityData(ServerGamePacketListenerImpl.this.player); // Paper - The entire mob gets deleted, so resend it diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index c156b2197d02d4b2b96f3b918f1c5f817b4fc086..b8fc7775d2decc300b0bff3161a2b16e5834448e 100644 +index 7ac7d0729705cb02f22277be3c467aed4f69ec0e..5c14180d92e1baebe59b08311746418e7d9f6a24 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -340,7 +340,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess @@ -91,7 +91,7 @@ index c156b2197d02d4b2b96f3b918f1c5f817b4fc086..b8fc7775d2decc300b0bff3161a2b16e private float eyeHeight; public boolean isInPowderSnow; public boolean wasInPowderSnow; -@@ -3327,6 +3327,13 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -3324,6 +3324,13 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess this.passengers = ImmutableList.copyOf(list); } @@ -105,7 +105,7 @@ index c156b2197d02d4b2b96f3b918f1c5f817b4fc086..b8fc7775d2decc300b0bff3161a2b16e this.gameEvent(GameEvent.ENTITY_MOUNT, passenger); } } -@@ -3366,6 +3373,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -3363,6 +3370,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess return false; } // CraftBukkit end @@ -120,7 +120,7 @@ index c156b2197d02d4b2b96f3b918f1c5f817b4fc086..b8fc7775d2decc300b0bff3161a2b16e if (this.passengers.size() == 1 && this.passengers.get(0) == entity) { this.passengers = ImmutableList.of(); } else { -@@ -5358,4 +5373,44 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -5355,4 +5370,44 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess return ((net.minecraft.server.level.ServerLevel) this.level).isPositionEntityTicking(this.blockPosition()); } // Paper end - Expose entity id counter @@ -190,7 +190,7 @@ index 397765b1547ae47b64963b3807b206c50a6650e1..293ffe990de70f4f8872f063388a3a50 protected ParticleOptions getInkParticle() { return ParticleTypes.GLOW_SQUID_INK; diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index ee2c88638f058172ef730de9b112ce6506211d3b..6a22888927194f1f08377e0f9afe8d3dab8d0b1a 100644 +index 96b4fbe4a4655777ff10b32e3257e2fac2aba12a..715b76bd0ccc0c29583a55f82a8ecd889ab49b56 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -246,9 +246,9 @@ public abstract class LivingEntity extends Entity implements Attackable { @@ -223,7 +223,7 @@ index ee2c88638f058172ef730de9b112ce6506211d3b..6a22888927194f1f08377e0f9afe8d3d @Override protected void checkFallDamage(double heightDifference, boolean onGround, BlockState state, BlockPos landedPosition) { -@@ -3730,8 +3731,10 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -3703,8 +3704,10 @@ public abstract class LivingEntity extends Entity implements Attackable { this.pushEntities(); gameprofilerfiller.pop(); // Paper start - Add EntityMoveEvent @@ -236,7 +236,7 @@ index ee2c88638f058172ef730de9b112ce6506211d3b..6a22888927194f1f08377e0f9afe8d3d Location from = new Location(this.level().getWorld(), this.xo, this.yo, this.zo, this.yRotO, this.xRotO); Location to = new Location(this.level().getWorld(), this.getX(), this.getY(), this.getZ(), this.getYRot(), this.getXRot()); io.papermc.paper.event.entity.EntityMoveEvent event = new io.papermc.paper.event.entity.EntityMoveEvent(this.getBukkitLivingEntity(), from, to.clone()); -@@ -3741,6 +3744,21 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -3714,6 +3717,21 @@ public abstract class LivingEntity extends Entity implements Attackable { this.absMoveTo(event.getTo().getX(), event.getTo().getY(), event.getTo().getZ(), event.getTo().getYaw(), event.getTo().getPitch()); } } @@ -259,7 +259,7 @@ index ee2c88638f058172ef730de9b112ce6506211d3b..6a22888927194f1f08377e0f9afe8d3d // Paper end - Add EntityMoveEvent world = this.level(); diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java -index 8ebe26c46db485ee0bdf64a313681d465051f436..3217ab08325733eb095a26df58f97fd7d58b13a2 100644 +index 5a0b51342f4a646101f4588697bcae7d1ca8a010..261288f51ed47b0eac80cc965c76683f3e13687f 100644 --- a/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java @@ -159,8 +159,8 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab @@ -273,7 +273,7 @@ index 8ebe26c46db485ee0bdf64a313681d465051f436..3217ab08325733eb095a26df58f97fd7 this.jumpControl = new JumpControl(this); this.bodyRotationControl = this.createBodyControl(); this.navigation = this.createNavigation(world); -@@ -1502,7 +1502,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab +@@ -1496,7 +1496,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab protected void onOffspringSpawnedFromEgg(Player player, Mob child) {} protected InteractionResult mobInteract(Player player, InteractionHand hand) { @@ -282,7 +282,7 @@ index 8ebe26c46db485ee0bdf64a313681d465051f436..3217ab08325733eb095a26df58f97fd7 } public boolean isWithinRestriction() { -@@ -1822,4 +1822,58 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab +@@ -1816,4 +1816,58 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab public float[] getArmorDropChances() { return this.armorDropChances; } @@ -342,13 +342,13 @@ index 8ebe26c46db485ee0bdf64a313681d465051f436..3217ab08325733eb095a26df58f97fd7 + // Purpur end - Ridables } diff --git a/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java b/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java -index b4cfae23709b7c3aed28317846e37c9311c948c1..98fa43c8a34650795a0ae1ebc28ce17ec1ba5271 100644 +index fb967ac7b3e7828301f08a7fe9b039441cf7da30..d6c98612ca15e506657d85f6872c1278e0b73652 100644 --- a/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java +++ b/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java -@@ -24,15 +24,22 @@ public class AttributeMap { +@@ -23,14 +23,21 @@ public class AttributeMap { + private final Set attributesToSync = new ObjectOpenHashSet<>(); private final Set attributesToUpdate = new ObjectOpenHashSet<>(); private final AttributeSupplier supplier; - private final java.util.function.Function, AttributeInstance> createInstance; // Pufferfish + private final net.minecraft.world.entity.LivingEntity entity; // Purpur - Ridables public AttributeMap(AttributeSupplier defaultAttributes) { @@ -359,7 +359,6 @@ index b4cfae23709b7c3aed28317846e37c9311c948c1..98fa43c8a34650795a0ae1ebc28ce17e + this.entity = entity; + // Purpur end - Ridables this.supplier = defaultAttributes; - this.createInstance = attributex -> this.supplier.createInstance(this::onAttributeModified, attributex); // Pufferfish } private void onAttributeModified(AttributeInstance instance) { @@ -369,7 +368,7 @@ index b4cfae23709b7c3aed28317846e37c9311c948c1..98fa43c8a34650795a0ae1ebc28ce17e this.attributesToSync.add(instance); } } -@@ -46,7 +53,7 @@ public class AttributeMap { +@@ -44,7 +51,7 @@ public class AttributeMap { } public Collection getSyncableAttributes() { @@ -377,7 +376,7 @@ index b4cfae23709b7c3aed28317846e37c9311c948c1..98fa43c8a34650795a0ae1ebc28ce17e + return this.attributes.values().stream().filter(attribute -> attribute.getAttribute().value().isClientSyncable() && (entity == null || entity.shouldSendAttribute(attribute.getAttribute().value()))).collect(Collectors.toList()); // Purpur - Ridables } - + @Nullable diff --git a/src/main/java/net/minecraft/world/entity/ai/attributes/DefaultAttributes.java b/src/main/java/net/minecraft/world/entity/ai/attributes/DefaultAttributes.java index c76438d5ce2330eca16dc0b381f97e9506f84aef..8ccbf0386aa453e82fc0f82d2aefd1e08b6c3345 100644 --- a/src/main/java/net/minecraft/world/entity/ai/attributes/DefaultAttributes.java @@ -439,7 +438,7 @@ index fbfc2f2515ad709b2c1212aef9521e795547d66b..ebe941aeb959fc34372bfc59bc3a1342 this.lookAtCooldown--; this.getYRotD().ifPresent(yaw -> this.mob.yHeadRot = this.rotateTowards(this.mob.yHeadRot, yaw + 20.0F, this.yMaxRotSpeed)); diff --git a/src/main/java/net/minecraft/world/entity/ambient/Bat.java b/src/main/java/net/minecraft/world/entity/ambient/Bat.java -index 3de177a40649183b5b210e5f0c610a527287e9ec..3fe64a0164804dff2589035e3ec0adec7d0ba10f 100644 +index 60c2868f255d372226e0c1389caaa5477bbef41e..add1c146cd7428547d9ef8810841b4cf39a6a05e 100644 --- a/src/main/java/net/minecraft/world/entity/ambient/Bat.java +++ b/src/main/java/net/minecraft/world/entity/ambient/Bat.java @@ -47,12 +47,59 @@ public class Bat extends AmbientCreature { @@ -2000,7 +1999,7 @@ index c57fac6b5a17f39699298a58d9d25c12da929e64..5ac51a56c451a8fde4b98cec165143b2 this.targetSelector.addGoal(2, new OwnerHurtTargetGoal(this)); this.targetSelector.addGoal(3, (new HurtByTargetGoal(this, new Class[0])).setAlertOthers()); 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 f4788104b1bb73810fdf0dc7f5311d5b078a81d5..62a52e87448ef6d73a91a6ace2cc8525a0ba0e63 100644 +index b86f638390d386c838318a4d9b6571ac5514df8f..76779074ceea0d79b01c6744e6cc0a50b8cf111d 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 @@ -104,10 +104,23 @@ public class Allay extends PathfinderMob implements InventoryCarrier, VibrationS @@ -2057,12 +2056,11 @@ index f4788104b1bb73810fdf0dc7f5311d5b078a81d5..62a52e87448ef6d73a91a6ace2cc8525 @Override protected Brain.Provider brainProvider() { return Brain.provider(Allay.MEMORY_TYPES, Allay.SENSOR_TYPES); -@@ -229,7 +264,7 @@ public class Allay extends PathfinderMob implements InventoryCarrier, VibrationS +@@ -228,6 +263,7 @@ public class Allay extends PathfinderMob implements InventoryCarrier, VibrationS ProfilerFiller gameprofilerfiller = Profiler.get(); gameprofilerfiller.push("allayBrain"); -- if (this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish -+ if ((getRider() == null || !this.isControllable()) && this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish // Purpur - only use brain if no rider ++ //if ((getRider() == null || !this.isControllable()) && this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish // Purpur - only use brain if no rider this.getBrain().tick(world, this); gameprofilerfiller.pop(); gameprofilerfiller.push("allayActivityUpdate"); @@ -2095,7 +2093,7 @@ index c1ef714096159608752d744b98f615cd45fe459a..4c9771725f9567790841094dae72c2bb protected void defineSynchedData(SynchedEntityData.Builder builder) { super.defineSynchedData(builder); diff --git a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java -index cb47876a13cb1990bb0ab4cff1bbe57b3b2d0a5e..02db50fca37e8e820936ddf17c75a530b0930279 100644 +index 31b10cd404b672d7ce21c2107d8f83e32de26ef4..b414edf515890066bd970f65c073964839851840 100644 --- a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java +++ b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java @@ -100,6 +100,23 @@ public class Axolotl extends Animal implements VariantHolder, B @@ -2122,16 +2120,15 @@ index cb47876a13cb1990bb0ab4cff1bbe57b3b2d0a5e..02db50fca37e8e820936ddf17c75a530 @Override public float getWalkTargetValue(BlockPos pos, LevelReader world) { return 0.0F; -@@ -298,7 +315,7 @@ public class Axolotl extends Animal implements VariantHolder, B +@@ -297,6 +314,7 @@ public class Axolotl extends Animal implements VariantHolder, B ProfilerFiller gameprofilerfiller = Profiler.get(); gameprofilerfiller.push("axolotlBrain"); -- if (this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish -+ if ((getRider() == null || !this.isControllable()) && this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish // Purpur - only use brain if no rider ++ //if ((getRider() == null || !this.isControllable()) && this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish // Purpur - only use brain if no rider this.getBrain().tick(world, this); gameprofilerfiller.pop(); gameprofilerfiller.push("axolotlActivityUpdate"); -@@ -522,14 +539,22 @@ public class Axolotl extends Animal implements VariantHolder, B +@@ -520,14 +538,22 @@ public class Axolotl extends Animal implements VariantHolder, B private static class AxolotlMoveControl extends SmoothSwimmingMoveControl { private final Axolotl axolotl; @@ -2154,7 +2151,7 @@ index cb47876a13cb1990bb0ab4cff1bbe57b3b2d0a5e..02db50fca37e8e820936ddf17c75a530 if (!this.axolotl.isPlayingDead()) { super.tick(); } -@@ -544,9 +569,9 @@ public class Axolotl extends Animal implements VariantHolder, B +@@ -542,9 +568,9 @@ public class Axolotl extends Animal implements VariantHolder, B } @Override @@ -2185,7 +2182,7 @@ index f3c884ab9c09f04dd01cabf2ee9de3b5b620563d..f794ac7af227d413ed030457cbe4cd68 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 db91b8018591fe248efda417fcde7fd2071c4cb6..f4a133546dd54cd84a3c1dfefc0fad92ed92c040 100644 +index ca04e5d829331551a2c2f44e223ff05c6ce04e76..b42e1e1749c9f18b3bf842517522e90ba60330ff 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 @@ -106,6 +106,8 @@ public class Frog extends Animal implements VariantHolder> { @@ -2253,16 +2250,15 @@ index db91b8018591fe248efda417fcde7fd2071c4cb6..f4a133546dd54cd84a3c1dfefc0fad92 @Override protected Brain.Provider brainProvider() { -@@ -189,7 +239,7 @@ public class Frog extends Animal implements VariantHolder> { +@@ -188,6 +238,7 @@ public class Frog extends Animal implements VariantHolder> { protected void customServerAiStep(ServerLevel world) { ProfilerFiller profilerFiller = Profiler.get(); profilerFiller.push("frogBrain"); -- if (this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish -+ if ((getRider() == null || !this.isControllable()) && this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish // Purpur - only use brain if no rider ++ //if ((getRider() == null || !this.isControllable()) && this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish // Purpur - only use brain if no rider this.getBrain().tick(world, this); profilerFiller.pop(); profilerFiller.push("frogActivityUpdate"); -@@ -386,7 +436,7 @@ public class Frog extends Animal implements VariantHolder> { +@@ -384,7 +435,7 @@ public class Frog extends Animal implements VariantHolder> { return world.getBlockState(pos.below()).is(BlockTags.FROGS_SPAWNABLE_ON) && isBrightEnoughToSpawn(world, pos); } @@ -2272,7 +2268,7 @@ index db91b8018591fe248efda417fcde7fd2071c4cb6..f4a133546dd54cd84a3c1dfefc0fad92 super(entity); } 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 cf326ef35bac732e7addf75537963593d5b268ae..33429a9afeefce9238969b2894d0a9c033baca51 100644 +index 48ac8c3f6e00c3c2dc67b6c994be7c0ac6dfcf81..87a2825d4e198e152a601f20105596a793695885 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 @@ -51,13 +51,50 @@ public class Tadpole extends AbstractFish { @@ -2327,17 +2323,16 @@ index cf326ef35bac732e7addf75537963593d5b268ae..33429a9afeefce9238969b2894d0a9c0 @Override protected PathNavigation createNavigation(Level world) { return new WaterBoundPathNavigation(this, world); -@@ -89,7 +126,7 @@ public class Tadpole extends AbstractFish { +@@ -88,6 +125,7 @@ public class Tadpole extends AbstractFish { ProfilerFiller gameprofilerfiller = Profiler.get(); gameprofilerfiller.push("tadpoleBrain"); -- if (this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish -+ if ((getRider() == null || !this.isControllable()) && this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish // Purpur - only use brain if no rider ++ //if ((getRider() == null || !this.isControllable()) && this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish // Purpur - only use brain if no rider this.getBrain().tick(world, this); gameprofilerfiller.pop(); gameprofilerfiller.push("tadpoleActivityUpdate"); diff --git a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java -index fb92cd4b0c15b614c0c06d2867039aee1a6212a2..e8185de995af8749356f05b28f69d33db367e749 100644 +index 76aca47d8638d5c37c57d3a59fa7f8ceaa5a53b4..307d11e5ad6d0b47af36b1469a73ae1caa100232 100644 --- a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java +++ b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java @@ -93,6 +93,23 @@ public class Goat extends Animal { @@ -2364,12 +2359,11 @@ index fb92cd4b0c15b614c0c06d2867039aee1a6212a2..e8185de995af8749356f05b28f69d33d @Override protected Brain.Provider brainProvider() { return Brain.provider(Goat.MEMORY_TYPES, Goat.SENSOR_TYPES); -@@ -198,7 +215,7 @@ public class Goat extends Animal { +@@ -197,6 +214,7 @@ public class Goat extends Animal { ProfilerFiller gameprofilerfiller = Profiler.get(); gameprofilerfiller.push("goatBrain"); -- if (this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish -+ if ((getRider() == null || !this.isControllable()) && this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish // Purpur - only use brain if no rider ++ //if ((getRider() == null || !this.isControllable()) && this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish // Purpur - only use brain if no rider this.getBrain().tick(world, this); gameprofilerfiller.pop(); gameprofilerfiller.push("goatActivityUpdate"); @@ -2827,7 +2821,7 @@ index d5fc74dbc2c5f6b65fee46e7797b151144c8fd41..d51675bb8660eb9d5e4d1263c28ada32 this.dragonFight.updateDragon(this); } diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java -index 2ce65ef77e4b28e1fd5ac7bd6a304cc115b8aca2..e53163af7eaf716cc5ff21410375e0e53c81b958 100644 +index bd9e10f79eaf0d23908229b3ebc2227946a14843..236e8ea79119dcf21c066b7c250fe20e6752df9e 100644 --- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java +++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java @@ -86,16 +86,30 @@ public class WitherBoss extends Monster implements RangedAttackMob { @@ -2977,7 +2971,7 @@ index 2ce65ef77e4b28e1fd5ac7bd6a304cc115b8aca2..e53163af7eaf716cc5ff21410375e0e5 this.targetSelector.addGoal(1, new HurtByTargetGoal(this, new Class[0])); this.targetSelector.addGoal(2, new NearestAttackableTargetGoal<>(this, LivingEntity.class, 0, false, false, WitherBoss.LIVING_ENTITY_SELECTOR)); } -@@ -267,6 +382,15 @@ public class WitherBoss extends Monster implements RangedAttackMob { +@@ -260,6 +375,15 @@ public class WitherBoss extends Monster implements RangedAttackMob { @Override protected void customServerAiStep(ServerLevel world) { @@ -2993,7 +2987,7 @@ index 2ce65ef77e4b28e1fd5ac7bd6a304cc115b8aca2..e53163af7eaf716cc5ff21410375e0e5 int i; if (this.getInvulnerableTicks() > 0) { -@@ -585,11 +709,11 @@ public class WitherBoss extends Monster implements RangedAttackMob { +@@ -578,11 +702,11 @@ public class WitherBoss extends Monster implements RangedAttackMob { } public int getAlternativeTarget(int headIndex) { @@ -3364,7 +3358,7 @@ index 378694a38115c012978e1fea59d049d1ebd04110..bff963a1a0d89b57a686ed06aa630e78 return Guardian.createAttributes().add(Attributes.MOVEMENT_SPEED, 0.30000001192092896D).add(Attributes.ATTACK_DAMAGE, 8.0D).add(Attributes.MAX_HEALTH, 80.0D); } diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java -index 4e4dab5bc202f6f421dcff98f0e36e8e70378b49..0fbf9d6c1df24024572aae86e32c10a96d41e36e 100644 +index 2a394381a4ad46359359ba402b65c62b331480b4..f3013664d21f70c2650306f2406e93b21de8f9e0 100644 --- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java +++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java @@ -94,9 +94,27 @@ public class EnderMan extends Monster implements NeutralMob { @@ -3412,7 +3406,7 @@ index 4e4dab5bc202f6f421dcff98f0e36e8e70378b49..0fbf9d6c1df24024572aae86e32c10a9 float f = this.getLightLevelDependentMagicValue(); if (f > 0.5F && world.canSeeSky(this.blockPosition()) && this.random.nextFloat() * 30.0F < (f - 0.4F) * 2.0F && this.tryEscape(com.destroystokyo.paper.event.entity.EndermanEscapeEvent.Reason.RUNAWAY)) { // Paper - EndermanEscapeEvent -@@ -388,6 +407,7 @@ public class EnderMan extends Monster implements NeutralMob { +@@ -382,6 +401,7 @@ public class EnderMan extends Monster implements NeutralMob { public boolean hurtServer(ServerLevel world, DamageSource source, float amount) { if (this.isInvulnerableTo(world, source)) { return false; @@ -4819,7 +4813,7 @@ index 6a7e725edece3043c8523d387e2929d5ba8932cb..6716bfa903be5ab34b80c963cc9d6a8a } diff --git a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java -index 9c20651b74157582e60793ceba8adde2c354f2a8..a32d150ba04605b8b39c723df7fa29da3c602365 100644 +index 92270912ef26924f611a1df7cb3d5b485b0a262d..4ab971e86b48ce3010928fe9046e8f68224719ca 100644 --- a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java +++ b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java @@ -71,6 +71,23 @@ public class Hoglin extends Animal implements Enemy, HoglinBase { @@ -4846,17 +4840,16 @@ index 9c20651b74157582e60793ceba8adde2c354f2a8..a32d150ba04605b8b39c723df7fa29da @VisibleForTesting public void setTimeInOverworld(int timeInOverworld) { this.timeInOverworld = timeInOverworld; -@@ -144,7 +161,7 @@ public class Hoglin extends Animal implements Enemy, HoglinBase { +@@ -143,6 +160,7 @@ public class Hoglin extends Animal implements Enemy, HoglinBase { ProfilerFiller gameprofilerfiller = Profiler.get(); gameprofilerfiller.push("hoglinBrain"); -- if (this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish -+ if ((getRider() == null || !this.isControllable()) && this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish // Purpur - only use brain if no rider ++ //if ((getRider() == null || !this.isControllable()) && this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish // Purpur - only use brain if no rider this.getBrain().tick(world, this); gameprofilerfiller.pop(); HoglinAi.updateActivity(this); diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java -index 74ab50723056fef2a96dcc9e2de0e58526738011..40cf7f540146e38592a7a29f3f0c8b166497087f 100644 +index 2121d2a2e1aa1d0f0390cc515317096431f6dcb0..b19e3b442a650f773df462e32088648a2b7eafd4 100644 --- a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java +++ b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java @@ -99,6 +99,23 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento @@ -4883,12 +4876,11 @@ index 74ab50723056fef2a96dcc9e2de0e58526738011..40cf7f540146e38592a7a29f3f0c8b16 @Override public void addAdditionalSaveData(CompoundTag nbt) { super.addAdditionalSaveData(nbt); -@@ -313,7 +330,7 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento +@@ -312,6 +329,7 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento ProfilerFiller gameprofilerfiller = Profiler.get(); gameprofilerfiller.push("piglinBrain"); -- if (this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish -+ if ((getRider() == null || !this.isControllable()) && this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish // Purpur - only use brain if no rider ++ //if ((getRider() == null || !this.isControllable()) && this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish // Purpur - only use brain if no rider this.getBrain().tick(world, this); gameprofilerfiller.pop(); PiglinAi.updateActivity(this); @@ -4929,7 +4921,7 @@ index 24eaeb93284fe1a573026b85818a93a34fd9e1ec..3dc234f8cea8769f715a4913ae4ecf7d profilerFiller.pop(); PiglinBruteAi.updateActivity(this); 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 4331ada8bed7ade7b53fd8ba000c1c1b34fa4331..74011f1ab7e48490109ad93d658bba216eef9e80 100644 +index c47ed605f0822effd58df4f875297ed015e1e57e..19f7a6d55144adb5217fbea590d8f23d79ed05e0 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 @@ -127,8 +127,32 @@ public class Warden extends Monster implements VibrationSystem { @@ -4965,7 +4957,7 @@ index 4331ada8bed7ade7b53fd8ba000c1c1b34fa4331..74011f1ab7e48490109ad93d658bba21 @Override public Packet getAddEntityPacket(ServerEntity entityTrackerEntry) { return new ClientboundAddEntityPacket(this, entityTrackerEntry, this.hasPose(Pose.EMERGING) ? 1 : 0); -@@ -398,17 +422,14 @@ public class Warden extends Monster implements VibrationSystem { +@@ -396,17 +420,14 @@ public class Warden extends Monster implements VibrationSystem { @Contract("null->false") public boolean canTargetEntity(@Nullable Entity entity) { @@ -4987,10 +4979,10 @@ index 4331ada8bed7ade7b53fd8ba000c1c1b34fa4331..74011f1ab7e48490109ad93d658bba21 public static void applyDarknessAround(ServerLevel world, Vec3 pos, @Nullable Entity entity, int range) { 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 3fd86782134a674f58ef37288c8963a4a92f685c..1c3c0f8c376fb1b662dcca714b598ecadcfc5552 100644 +index 2d8ba55906c8da16fde850e3412f4a6bda3d56e7..066836e450ca8d104990c3c5fba5fe3dad2e136e 100644 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java -@@ -158,6 +158,28 @@ public class Villager extends AbstractVillager implements ReputationEventHandler +@@ -156,6 +156,28 @@ public class Villager extends AbstractVillager implements ReputationEventHandler this.setVillagerData(this.getVillagerData().setType(type).setProfession(VillagerProfession.NONE)); } @@ -5019,18 +5011,20 @@ index 3fd86782134a674f58ef37288c8963a4a92f685c..1c3c0f8c376fb1b662dcca714b598eca @Override public Brain getBrain() { return (Brain) super.getBrain(); // CraftBukkit - decompile error -@@ -259,8 +281,8 @@ public class Villager extends AbstractVillager implements ReputationEventHandler +@@ -255,7 +277,11 @@ public class Villager extends AbstractVillager implements ReputationEventHandler + ProfilerFiller gameprofilerfiller = Profiler.get(); gameprofilerfiller.push("villagerBrain"); - // Pufferfish start -- if (!inactive && this.behaviorTick++ % this.activatedPriority == 0) { -- this.getBrain().tick((ServerLevel) this.level(), this); // Paper -+ if (!inactive && (getRider() == null || !this.isControllable()) && this.behaviorTick++ % this.activatedPriority == 0) { +- if (!inactive) this.getBrain().tick(world, this); ++ // Pufferfish start ++ if (!inactive && (getRider() == null || !this.isControllable()) /*&& this.behaviorTick++ % this.activatedPriority == 0*/) { + this.getBrain().tick(world, this); // Paper // Purpur - Ridables - } - // Pufferfish end ++ } ++ // Pufferfish end gameprofilerfiller.pop(); -@@ -319,7 +341,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler + if (this.assignProfessionWhenSpawned) { + this.assignProfessionWhenSpawned = false; +@@ -312,7 +338,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler if (!itemstack.is(Items.VILLAGER_SPAWN_EGG) && this.isAlive() && !this.isTrading() && !this.isSleeping()) { if (this.isBaby()) { this.setUnhappy(); @@ -5039,7 +5033,7 @@ index 3fd86782134a674f58ef37288c8963a4a92f685c..1c3c0f8c376fb1b662dcca714b598eca } else { if (!this.level().isClientSide) { boolean flag = this.getOffers().isEmpty(); -@@ -333,9 +355,10 @@ public class Villager extends AbstractVillager implements ReputationEventHandler +@@ -326,9 +352,10 @@ public class Villager extends AbstractVillager implements ReputationEventHandler } if (flag) { diff --git a/patches/server/0010-Configurable-entity-base-attributes.patch b/patches/server/0008-Configurable-entity-base-attributes.patch similarity index 99% rename from patches/server/0010-Configurable-entity-base-attributes.patch rename to patches/server/0008-Configurable-entity-base-attributes.patch index 98af491aa..f3e6124c0 100644 --- a/patches/server/0010-Configurable-entity-base-attributes.patch +++ b/patches/server/0008-Configurable-entity-base-attributes.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configurable entity base attributes diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index b8fc7775d2decc300b0bff3161a2b16e5834448e..26e0a212e45c325fb0ef7d55c6e2f4dc3d768366 100644 +index 5c14180d92e1baebe59b08311746418e7d9f6a24..755861185bd8434027acca7f03ed0bfdf9fa2cde 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -177,7 +177,7 @@ import org.bukkit.plugin.PluginManager; @@ -35,7 +35,7 @@ index 293ffe990de70f4f8872f063388a3a50c60b68e6..66a5c485ed2d29d0079ae714c2dd7b01 protected ParticleOptions getInkParticle() { return ParticleTypes.GLOW_SQUID_INK; diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 6a22888927194f1f08377e0f9afe8d3dab8d0b1a..d37f3f671b56c26bfbd2cff62a35f107a50f3987 100644 +index 715b76bd0ccc0c29583a55f82a8ecd889ab49b56..6884475a5217acb8073dc38e5f7a7b341c8b1dd1 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -324,6 +324,7 @@ public abstract class LivingEntity extends Entity implements Attackable { @@ -56,7 +56,7 @@ index 6a22888927194f1f08377e0f9afe8d3dab8d0b1a..d37f3f671b56c26bfbd2cff62a35f107 return this.brain; } diff --git a/src/main/java/net/minecraft/world/entity/ambient/Bat.java b/src/main/java/net/minecraft/world/entity/ambient/Bat.java -index 3fe64a0164804dff2589035e3ec0adec7d0ba10f..f706ceb6de0415e87d2b6dcbca4e9a3d9332f3d4 100644 +index add1c146cd7428547d9ef8810841b4cf39a6a05e..5f11c687df87015261d1d39c957e241fbeb5476a 100644 --- a/src/main/java/net/minecraft/world/entity/ambient/Bat.java +++ b/src/main/java/net/minecraft/world/entity/ambient/Bat.java @@ -100,6 +100,20 @@ public class Bat extends AmbientCreature { @@ -503,7 +503,7 @@ index 5ac51a56c451a8fde4b98cec165143b2128fd9eb..d86bad821e781d698cc2bf0b3179eb4d protected void registerGoals() { this.goalSelector.addGoal(1, new FloatGoal(this)); 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 62a52e87448ef6d73a91a6ace2cc8525a0ba0e63..67ff60909dee395d42619c310bafc381b9bfce5d 100644 +index 76779074ceea0d79b01c6744e6cc0a50b8cf111d..10e293dd38ad2c140e1ae0fd558989aa9eeff8dc 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 @@ -156,6 +156,13 @@ public class Allay extends PathfinderMob implements InventoryCarrier, VibrationS @@ -539,7 +539,7 @@ index 4c9771725f9567790841094dae72c2bbf0d5ba62..1a6c88558a11066ec2a78d40e6a1b0f2 protected void defineSynchedData(SynchedEntityData.Builder builder) { super.defineSynchedData(builder); diff --git a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java -index 02db50fca37e8e820936ddf17c75a530b0930279..63a51c0be69298f23f2e0e995ec6ed0a3bac06a4 100644 +index b414edf515890066bd970f65c073964839851840..f95b9be60c3725fe279a07300f706abb25e152f1 100644 --- a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java +++ b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java @@ -117,6 +117,13 @@ public class Axolotl extends Animal implements VariantHolder, B @@ -875,7 +875,7 @@ index d51675bb8660eb9d5e4d1263c28ada321b40470c..1e1cd061203ab3ca2f1feb4a3f9fe281 } } diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java -index e53163af7eaf716cc5ff21410375e0e53c81b958..437160075ea83b2dbd0482e48aa45057d8599a0a 100644 +index 236e8ea79119dcf21c066b7c250fe20e6752df9e..57cf253fc69c087cfa0270225166f926ce6829f7 100644 --- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java +++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java @@ -113,7 +113,13 @@ public class WitherBoss extends Monster implements RangedAttackMob { @@ -893,7 +893,7 @@ index e53163af7eaf716cc5ff21410375e0e53c81b958..437160075ea83b2dbd0482e48aa45057 @Override protected PathNavigation createNavigation(Level world) { FlyingPathNavigation navigationflying = new FlyingPathNavigation(this, world); -@@ -432,7 +438,7 @@ public class WitherBoss extends Monster implements RangedAttackMob { +@@ -425,7 +431,7 @@ public class WitherBoss extends Monster implements RangedAttackMob { this.setInvulnerableTicks(i); if (this.tickCount % 10 == 0) { @@ -1016,7 +1016,7 @@ index bff963a1a0d89b57a686ed06aa630e789a602d82..011327ea9bf9ef3497f2183ef149f8ec return Guardian.createAttributes().add(Attributes.MOVEMENT_SPEED, 0.30000001192092896D).add(Attributes.ATTACK_DAMAGE, 8.0D).add(Attributes.MAX_HEALTH, 80.0D); } diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java -index 0fbf9d6c1df24024572aae86e32c10a96d41e36e..1823b0dd705ff2a4eb4b7dd22675819863e5bfa9 100644 +index f3013664d21f70c2650306f2406e93b21de8f9e0..9f7261bd22803f0b094e2bfd4a0eb66ad727211e 100644 --- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java +++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java @@ -111,6 +111,13 @@ public class EnderMan extends Monster implements NeutralMob { @@ -1639,7 +1639,7 @@ index 6716bfa903be5ab34b80c963cc9d6a8a26272621..1f37384368c26b4bdd69533887a8e9b8 protected BodyRotationControl createBodyControl() { return new Creaking.CreakingBodyRotationControl(this); diff --git a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java -index a32d150ba04605b8b39c723df7fa29da3c602365..718f671b2db46638fbbeb0624d375ad17b7e9c60 100644 +index 4ab971e86b48ce3010928fe9046e8f68224719ca..476dcc613f566d88273f195b847e6b4dec777e44 100644 --- a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java +++ b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java @@ -88,6 +88,13 @@ public class Hoglin extends Animal implements Enemy, HoglinBase { @@ -1657,7 +1657,7 @@ index a32d150ba04605b8b39c723df7fa29da3c602365..718f671b2db46638fbbeb0624d375ad1 public void setTimeInOverworld(int timeInOverworld) { this.timeInOverworld = timeInOverworld; diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java -index 40cf7f540146e38592a7a29f3f0c8b166497087f..ed9ca1a16a6c929bb8b7202df8ae614465384a5e 100644 +index b19e3b442a650f773df462e32088648a2b7eafd4..1a40babc8f6b3f56377cb2af45e9d17d0028a77b 100644 --- a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java +++ b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java @@ -116,6 +116,13 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento @@ -1693,10 +1693,10 @@ index 3dc234f8cea8769f715a4913ae4ecf7d47433577..a0fa32a1217bbdae2c91e5a51598d7bd return Monster.createMonsterAttributes() .add(Attributes.MAX_HEALTH, 50.0) 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 1c3c0f8c376fb1b662dcca714b598ecadcfc5552..845af8a8976bd81b3d7221b7b3284c31a6fda136 100644 +index 066836e450ca8d104990c3c5fba5fe3dad2e136e..39f2091391222bcd4ab0f2677f896c5ecdc6e86c 100644 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java -@@ -180,6 +180,13 @@ public class Villager extends AbstractVillager implements ReputationEventHandler +@@ -178,6 +178,13 @@ public class Villager extends AbstractVillager implements ReputationEventHandler } // Purpur end - Ridables diff --git a/patches/server/0011-Barrels-and-enderchests-6-rows.patch b/patches/server/0009-Barrels-and-enderchests-6-rows.patch similarity index 98% rename from patches/server/0011-Barrels-and-enderchests-6-rows.patch rename to patches/server/0009-Barrels-and-enderchests-6-rows.patch index 45c961821..49b38c91d 100644 --- a/patches/server/0011-Barrels-and-enderchests-6-rows.patch +++ b/patches/server/0009-Barrels-and-enderchests-6-rows.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Barrels and enderchests 6 rows diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index b973a07d199bc856643b23c090eb56bd1aeb0104..88678fb527f170c81d5e2d4a28f65e398dab8939 100644 +index 98e803eaf5ce4c773f35fd752c21c7176707427c..b9136fcec3f36549ddd572cbb8cd01ecae45590f 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -1116,6 +1116,27 @@ public abstract class PlayerList { @@ -37,7 +37,7 @@ index b973a07d199bc856643b23c090eb56bd1aeb0104..88678fb527f170c81d5e2d4a28f65e39 public boolean isWhiteListed(GameProfile profile) { diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index e4d8fadd6ef32823f8581dab68567c5da9270566..e5c11504f85abdf49cea4ebd2aaaccdaff35a75c 100644 +index 28a4cf814ec4b34dce883ba4f24ca55008c8f6c1..87c6378104ff47549c751e09afb6cfcd9b8dcf5d 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -200,6 +200,7 @@ public abstract class Player extends LivingEntity { @@ -253,7 +253,7 @@ index c6159c70f7a37b9bffe268b91905ce848d1d2927..d02adaaa6fbdc1c0eff44cb4a1f1642f for (int i = 0; i < this.getSize(); i++) { if (i >= items.length) { diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -index 09e7a11a241b6e306d5043fe66f14fd4f2aae963..a83117ed0a0c98d7ae18e925338b58930946c96a 100644 +index e8c9393760108f2549b52a61d973ea2b4a64a312..1321955eb23272d96e3028c1c46e75f6c1eaade0 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -180,4 +180,39 @@ public class PurpurConfig { diff --git a/patches/server/0012-Llama-API.patch b/patches/server/0010-Llama-API.patch similarity index 100% rename from patches/server/0012-Llama-API.patch rename to patches/server/0010-Llama-API.patch diff --git a/patches/server/0013-AFK-API.patch b/patches/server/0011-AFK-API.patch similarity index 98% rename from patches/server/0013-AFK-API.patch rename to patches/server/0011-AFK-API.patch index f6fbea6bb..9e886a4df 100644 --- a/patches/server/0013-AFK-API.patch +++ b/patches/server/0011-AFK-API.patch @@ -78,7 +78,7 @@ index 8207208d6fb3f982e9909add9e74a0dda69e8120..5e8a5e8e4120420a170c4733ae217e79 return this.stats; } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 7f03d81ac3a1cc87f73c5580caa6acbc7ebed8f5..bca70bc3eb38920bd0d6a781c1e49922bdb71cf7 100644 +index fbc59503316d566e88b037851afd74e5469c281b..830e0705f3a3d45fcf0eab6b8eea403c3023f3f9 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -344,6 +344,20 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl @@ -124,7 +124,7 @@ index 7f03d81ac3a1cc87f73c5580caa6acbc7ebed8f5..bca70bc3eb38920bd0d6a781c1e49922 Location oldTo = to.clone(); PlayerMoveEvent event = new PlayerMoveEvent(player, from, to); this.cserver.getPluginManager().callEvent(event); -@@ -1555,7 +1577,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl +@@ -1554,7 +1576,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl movedWrongly = true; if (event.getLogWarning()) // Paper end @@ -133,7 +133,7 @@ index 7f03d81ac3a1cc87f73c5580caa6acbc7ebed8f5..bca70bc3eb38920bd0d6a781c1e49922 } // Paper } -@@ -1623,6 +1645,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl +@@ -1622,6 +1644,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl this.lastYaw = to.getYaw(); this.lastPitch = to.getPitch(); @@ -317,10 +317,10 @@ index ee9bcb7d011f20575cbbbe2e0ded1e53087aba7a..9b1a4502aa6c26c7524ec17697250317 public boolean untamedTamablesAreRidable = true; public boolean useNightVisionWhenRiding = false; diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java -index bc525c7843b9cc0f7705c0dc6795c05f4e5b4bb1..a017374f2027946ef465cf41fd6ed6de7f00e19f 100644 +index 1d438ef44cbe4d1eedfba36d8fe5d2ad53464921..24d7eca3f0b06602a1026eda3432f0a4255d8b01 100644 --- a/src/main/java/org/spigotmc/ActivationRange.java +++ b/src/main/java/org/spigotmc/ActivationRange.java -@@ -203,6 +203,8 @@ public class ActivationRange +@@ -199,6 +199,8 @@ public class ActivationRange continue; } diff --git a/patches/server/0014-Bring-back-server-name.patch b/patches/server/0012-Bring-back-server-name.patch similarity index 95% rename from patches/server/0014-Bring-back-server-name.patch rename to patches/server/0012-Bring-back-server-name.patch index d944b4b2f..6ec709f89 100644 --- a/patches/server/0014-Bring-back-server-name.patch +++ b/patches/server/0012-Bring-back-server-name.patch @@ -17,7 +17,7 @@ index c3ec370b83b895be0f03662e3884fa4a2442a2a6..05e16103af3fd276f0196ddf1a2e5b72 public final boolean allowFlight = this.get("allow-flight", false); public final String motd = this.get("motd", "A Minecraft Server"); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 48a8bdd45c063797144e98e76f6007ae9025124e..96f0ff6877e2959fe1ab26728ee64b9c9b777d26 100644 +index cc2f23613644126c3f7506b26db8e6a865f78dde..3259d5796287f2e7886b5742b25d9f1f1bc22d6d 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -3285,4 +3285,11 @@ public final class CraftServer implements Server { diff --git a/patches/server/0015-Configurable-server-mod-name.patch b/patches/server/0013-Configurable-server-mod-name.patch similarity index 86% rename from patches/server/0015-Configurable-server-mod-name.patch rename to patches/server/0013-Configurable-server-mod-name.patch index a08c17673..4e51cbf80 100644 --- a/patches/server/0015-Configurable-server-mod-name.patch +++ b/patches/server/0013-Configurable-server-mod-name.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Configurable server mod name diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 48e40ef7fba63d9354152a02440656ceb3a9b7a6..5a85471d26130c893ad619dbfc9b61c0ee1b938b 100644 +index ce4ce361061932162ace58070d44d1aa70189dbd..d61f6cf5a5d3320516339a7078f2e9fb2ab59dfa 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -2020,7 +2020,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop implements FeatureElement, EntityTypeT +@@ -404,6 +404,16 @@ public class EntityType implements FeatureElement, EntityTypeT return EntityType.register(EntityType.vanillaEntityId(id), type); } @@ -25,7 +25,7 @@ index 8c1dad4b7f6461aca5ac37a25c880c550b0dcf5f..fa15b22e464f1dfe83f3d07ff7a28b67 public static ResourceLocation getKey(EntityType type) { return BuiltInRegistries.ENTITY_TYPE.getKey(type); } -@@ -615,6 +625,16 @@ public class EntityType implements FeatureElement, EntityTypeT +@@ -614,6 +624,16 @@ public class EntityType implements FeatureElement, EntityTypeT return this.category; } diff --git a/patches/server/0018-Anvil-API.patch b/patches/server/0016-Anvil-API.patch similarity index 100% rename from patches/server/0018-Anvil-API.patch rename to patches/server/0016-Anvil-API.patch diff --git a/patches/server/0019-Alternative-Keepalive-Handling.patch b/patches/server/0017-Alternative-Keepalive-Handling.patch similarity index 95% rename from patches/server/0019-Alternative-Keepalive-Handling.patch rename to patches/server/0017-Alternative-Keepalive-Handling.patch index fa77ffc8a..baa37cab7 100644 --- a/patches/server/0019-Alternative-Keepalive-Handling.patch +++ b/patches/server/0017-Alternative-Keepalive-Handling.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Alternative Keepalive Handling diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java -index b6dd6bde947ac7502f25d3160399596130e8064f..7d276c191b391bca24948ddb36b8b7d0f1f03b03 100644 +index 92749b57d3a2b2ffee79436319513248846296b6..df48c2754dc1ebd52addd8ae768cba5916ce3969 100644 --- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java @@ -80,6 +80,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack @@ -56,7 +56,7 @@ index b6dd6bde947ac7502f25d3160399596130e8064f..7d276c191b391bca24948ddb36b8b7d0 if (this.keepAlivePending && !this.processedDisconnect && elapsedTime >= KEEPALIVE_LIMIT) { // Paper - check keepalive limit, don't fire if already disconnected this.disconnect(ServerCommonPacketListenerImpl.TIMEOUT_DISCONNECTION_MESSAGE, PlayerKickEvent.Cause.TIMEOUT); // Paper - kick event cause diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -index a6c90de7726a264ca44c3e795e9b6a4e1c313bc3..3b4a8c9d5a60de94ad79a781414de8de44973e6f 100644 +index bfa985913f3f750a0727a567d3b5951b4d6ed4ca..2ca6cc6ba72339459d9591a89995521a3c81d111 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -201,6 +201,11 @@ public class PurpurConfig { diff --git a/patches/server/0020-Enchantment-convenience-methods.patch b/patches/server/0018-Enchantment-convenience-methods.patch similarity index 100% rename from patches/server/0020-Enchantment-convenience-methods.patch rename to patches/server/0018-Enchantment-convenience-methods.patch diff --git a/patches/server/0021-Silk-touch-spawners.patch b/patches/server/0019-Silk-touch-spawners.patch similarity index 100% rename from patches/server/0021-Silk-touch-spawners.patch rename to patches/server/0019-Silk-touch-spawners.patch diff --git a/patches/server/0022-Add-turtle-egg-block-options.patch b/patches/server/0020-Add-turtle-egg-block-options.patch similarity index 100% rename from patches/server/0022-Add-turtle-egg-block-options.patch rename to patches/server/0020-Add-turtle-egg-block-options.patch diff --git a/patches/server/0023-Logger-settings-suppressing-pointless-logs.patch b/patches/server/0021-Logger-settings-suppressing-pointless-logs.patch similarity index 98% rename from patches/server/0023-Logger-settings-suppressing-pointless-logs.patch rename to patches/server/0021-Logger-settings-suppressing-pointless-logs.patch index 6045c044d..a15b3bc8b 100644 --- a/patches/server/0023-Logger-settings-suppressing-pointless-logs.patch +++ b/patches/server/0021-Logger-settings-suppressing-pointless-logs.patch @@ -53,7 +53,7 @@ index 51ae8eddadc87b143b93521a3cef374f1e3a24dc..a7b45602d9d86aec235eef06d252fb62 if (MinecraftServer.getServer() != null && MinecraftServer.getServer().isDebugging()) { new Exception().printStackTrace(); diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -index 3b4a8c9d5a60de94ad79a781414de8de44973e6f..1103935e49081c560b024b87f872e9b8c788bad2 100644 +index 2ca6cc6ba72339459d9591a89995521a3c81d111..59b257051ed3040891f0a32b9c732f8bfabd6f7d 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -240,4 +240,15 @@ public class PurpurConfig { diff --git a/patches/server/0024-Disable-outdated-build-check.patch b/patches/server/0022-Disable-outdated-build-check.patch similarity index 89% rename from patches/server/0024-Disable-outdated-build-check.patch rename to patches/server/0022-Disable-outdated-build-check.patch index d4f561507..b986551de 100644 --- a/patches/server/0024-Disable-outdated-build-check.patch +++ b/patches/server/0022-Disable-outdated-build-check.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Disable outdated build check diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 31b08d0c879ca7af6e186bf93095cd01e2565fcf..10aa600fab7146b330d46b5fd2fe596da222a70a 100644 +index d313f3a9b31d4ecc3b48f8fc2e44d3b445e8e2c5..b8cacfbd6f8f3a37db21586f6febb55d42170e5b 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java -@@ -273,7 +273,7 @@ public class Main { +@@ -266,7 +266,7 @@ public class Main { System.setProperty(net.minecrell.terminalconsole.TerminalConsoleAppender.JLINE_OVERRIDE_PROPERTY, "false"); // Paper } diff --git a/patches/server/0025-Giants-AI-settings.patch b/patches/server/0023-Giants-AI-settings.patch similarity index 100% rename from patches/server/0025-Giants-AI-settings.patch rename to patches/server/0023-Giants-AI-settings.patch diff --git a/patches/server/0026-Zombie-horse-naturally-spawn.patch b/patches/server/0024-Zombie-horse-naturally-spawn.patch similarity index 95% rename from patches/server/0026-Zombie-horse-naturally-spawn.patch rename to patches/server/0024-Zombie-horse-naturally-spawn.patch index a4bd3c950..d09ab0b2b 100644 --- a/patches/server/0026-Zombie-horse-naturally-spawn.patch +++ b/patches/server/0024-Zombie-horse-naturally-spawn.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Zombie horse naturally spawn diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index d571b4a56807bcc4206d54573604c01290cd3dd7..9451c6fa2307bc12b47a106f2d82508548b109a8 100644 +index 4b9434b2d03cd24f5dac7098d2f1318fd12baddb..7ab130afddb0893016fb558ed624198316ca191d 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -954,10 +954,18 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe +@@ -940,10 +940,18 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe boolean flag1 = this.getGameRules().getBoolean(GameRules.RULE_DOMOBSPAWNING) && this.random.nextDouble() < (double) difficultydamagescaler.getEffectiveDifficulty() * this.paperConfig().entities.spawning.skeletonHorseThunderSpawnChance.or(0.01D) && !this.getBlockState(blockposition.below()).is(Blocks.LIGHTNING_ROD); // Paper - Configurable spawn chances for skeleton horses if (flag1) { diff --git a/patches/server/0027-Charged-creeper-naturally-spawn.patch b/patches/server/0025-Charged-creeper-naturally-spawn.patch similarity index 100% rename from patches/server/0027-Charged-creeper-naturally-spawn.patch rename to patches/server/0025-Charged-creeper-naturally-spawn.patch diff --git a/patches/server/0028-Rabbit-naturally-spawn-toast-and-killer.patch b/patches/server/0026-Rabbit-naturally-spawn-toast-and-killer.patch similarity index 100% rename from patches/server/0028-Rabbit-naturally-spawn-toast-and-killer.patch rename to patches/server/0026-Rabbit-naturally-spawn-toast-and-killer.patch diff --git a/patches/server/0029-Fix-outdated-server-showing-in-ping-before-server-fu.patch b/patches/server/0027-Fix-outdated-server-showing-in-ping-before-server-fu.patch similarity index 100% rename from patches/server/0029-Fix-outdated-server-showing-in-ping-before-server-fu.patch rename to patches/server/0027-Fix-outdated-server-showing-in-ping-before-server-fu.patch diff --git a/patches/server/0030-Tulips-change-fox-type.patch b/patches/server/0028-Tulips-change-fox-type.patch similarity index 100% rename from patches/server/0030-Tulips-change-fox-type.patch rename to patches/server/0028-Tulips-change-fox-type.patch diff --git a/patches/server/0031-Breedable-Polar-Bears.patch b/patches/server/0029-Breedable-Polar-Bears.patch similarity index 100% rename from patches/server/0031-Breedable-Polar-Bears.patch rename to patches/server/0029-Breedable-Polar-Bears.patch diff --git a/patches/server/0032-Chickens-can-retaliate.patch b/patches/server/0030-Chickens-can-retaliate.patch similarity index 100% rename from patches/server/0032-Chickens-can-retaliate.patch rename to patches/server/0030-Chickens-can-retaliate.patch diff --git a/patches/server/0033-Add-option-to-set-armorstand-step-height.patch b/patches/server/0031-Add-option-to-set-armorstand-step-height.patch similarity index 94% rename from patches/server/0033-Add-option-to-set-armorstand-step-height.patch rename to patches/server/0031-Add-option-to-set-armorstand-step-height.patch index 1638f62cb..70ee54153 100644 --- a/patches/server/0033-Add-option-to-set-armorstand-step-height.patch +++ b/patches/server/0031-Add-option-to-set-armorstand-step-height.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add option to set armorstand step height diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index fddc4a5e5c4f9f3552b3254fec8254774b20f9f1..2e57077a184809e70481c9bba1891e01a9e203f7 100644 +index 755861185bd8434027acca7f03ed0bfdf9fa2cde..fe5e8009d16fe9292312e37538b02b92b9fea9ed 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -300,6 +300,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess @@ -16,7 +16,7 @@ index fddc4a5e5c4f9f3552b3254fec8254774b20f9f1..2e57077a184809e70481c9bba1891e01 public boolean noPhysics; private boolean wasOnFire; public final RandomSource random; -@@ -5172,7 +5173,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -5169,7 +5170,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess } public float maxUpStep() { diff --git a/patches/server/0034-Cat-spawning-options.patch b/patches/server/0032-Cat-spawning-options.patch similarity index 100% rename from patches/server/0034-Cat-spawning-options.patch rename to patches/server/0032-Cat-spawning-options.patch diff --git a/patches/server/0035-Cows-eat-mushrooms.patch b/patches/server/0033-Cows-eat-mushrooms.patch similarity index 100% rename from patches/server/0035-Cows-eat-mushrooms.patch rename to patches/server/0033-Cows-eat-mushrooms.patch diff --git a/patches/server/0036-Fix-cow-rotation-when-shearing-mooshroom.patch b/patches/server/0034-Fix-cow-rotation-when-shearing-mooshroom.patch similarity index 100% rename from patches/server/0036-Fix-cow-rotation-when-shearing-mooshroom.patch rename to patches/server/0034-Fix-cow-rotation-when-shearing-mooshroom.patch diff --git a/patches/server/0037-Pigs-give-saddle-back.patch b/patches/server/0035-Pigs-give-saddle-back.patch similarity index 100% rename from patches/server/0037-Pigs-give-saddle-back.patch rename to patches/server/0035-Pigs-give-saddle-back.patch diff --git a/patches/server/0038-Snowman-drop-and-put-back-pumpkin.patch b/patches/server/0036-Snowman-drop-and-put-back-pumpkin.patch similarity index 100% rename from patches/server/0038-Snowman-drop-and-put-back-pumpkin.patch rename to patches/server/0036-Snowman-drop-and-put-back-pumpkin.patch diff --git a/patches/server/0039-Ender-dragon-always-drop-full-exp.patch b/patches/server/0037-Ender-dragon-always-drop-full-exp.patch similarity index 100% rename from patches/server/0039-Ender-dragon-always-drop-full-exp.patch rename to patches/server/0037-Ender-dragon-always-drop-full-exp.patch diff --git a/patches/server/0040-Allow-soil-to-moisten-from-water-directly-under-it.patch b/patches/server/0038-Allow-soil-to-moisten-from-water-directly-under-it.patch similarity index 100% rename from patches/server/0040-Allow-soil-to-moisten-from-water-directly-under-it.patch rename to patches/server/0038-Allow-soil-to-moisten-from-water-directly-under-it.patch diff --git a/patches/server/0041-Minecart-settings-and-WASD-controls.patch b/patches/server/0039-Minecart-settings-and-WASD-controls.patch similarity index 99% rename from patches/server/0041-Minecart-settings-and-WASD-controls.patch rename to patches/server/0039-Minecart-settings-and-WASD-controls.patch index 0938b3bf8..d7fc7a048 100644 --- a/patches/server/0041-Minecart-settings-and-WASD-controls.patch +++ b/patches/server/0039-Minecart-settings-and-WASD-controls.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Minecart settings and WASD controls diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 0f979af9131678991860765163fcc4b0453ef52a..664b43e4442d3c07995840d756ced8c3c96d3f7d 100644 +index 5e8a5e8e4120420a170c4733ae217e7948cef46c..3ea226168519e07b10d015f4c9b2b369569daf11 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1439,6 +1439,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple diff --git a/patches/server/0042-Disable-loot-drops-on-death-by-cramming.patch b/patches/server/0040-Disable-loot-drops-on-death-by-cramming.patch similarity index 91% rename from patches/server/0042-Disable-loot-drops-on-death-by-cramming.patch rename to patches/server/0040-Disable-loot-drops-on-death-by-cramming.patch index 83f2cf2bf..e0861d9ea 100644 --- a/patches/server/0042-Disable-loot-drops-on-death-by-cramming.patch +++ b/patches/server/0040-Disable-loot-drops-on-death-by-cramming.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Disable loot drops on death by cramming diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index a16c7069a2ac349a6de366229b77da9a7cec71c0..9c31efc4d8c16c8f3c3e384ad247db28e82628d2 100644 +index 6884475a5217acb8073dc38e5f7a7b341c8b1dd1..34f2c17831c6edd16b6dc32f3d344b3c209244fc 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -1938,6 +1938,7 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -1925,6 +1925,7 @@ public abstract class LivingEntity extends Entity implements Attackable { this.dropEquipment(world); // CraftBukkit - from below if (this.shouldDropLoot() && world.getGameRules().getBoolean(GameRules.RULE_DOMOBLOOT)) { @@ -16,7 +16,7 @@ index a16c7069a2ac349a6de366229b77da9a7cec71c0..9c31efc4d8c16c8f3c3e384ad247db28 this.dropFromLootTable(world, damageSource, flag); // Paper start final boolean prev = this.clearEquipmentSlots; -@@ -1946,6 +1947,7 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -1933,6 +1934,7 @@ public abstract class LivingEntity extends Entity implements Attackable { // Paper end this.dropCustomDeathLoot(world, damageSource, flag); this.clearEquipmentSlots = prev; // Paper diff --git a/patches/server/0043-Option-to-toggle-milk-curing-bad-omen.patch b/patches/server/0041-Option-to-toggle-milk-curing-bad-omen.patch similarity index 100% rename from patches/server/0043-Option-to-toggle-milk-curing-bad-omen.patch rename to patches/server/0041-Option-to-toggle-milk-curing-bad-omen.patch diff --git a/patches/server/0044-Skip-events-if-there-s-no-listeners.patch b/patches/server/0042-Skip-events-if-there-s-no-listeners.patch similarity index 93% rename from patches/server/0044-Skip-events-if-there-s-no-listeners.patch rename to patches/server/0042-Skip-events-if-there-s-no-listeners.patch index 46a4769b0..230c1bd2c 100644 --- a/patches/server/0044-Skip-events-if-there-s-no-listeners.patch +++ b/patches/server/0042-Skip-events-if-there-s-no-listeners.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Skip events if there's no listeners diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java -index 64bf4444ffba25cb40743a32267aa790ad1738f9..1210305bcfc8a1158dbdc3c21647502a01b138a3 100644 +index 517cb238ec280aadd1fc54bcb675ed386e798eaf..832930024b0d642496efe17f7e2f8e02413275f0 100644 --- a/src/main/java/net/minecraft/commands/Commands.java +++ b/src/main/java/net/minecraft/commands/Commands.java @@ -515,6 +515,7 @@ public class Commands { diff --git a/patches/server/0045-Add-permission-for-F3-N-debug.patch b/patches/server/0043-Add-permission-for-F3-N-debug.patch similarity index 89% rename from patches/server/0045-Add-permission-for-F3-N-debug.patch rename to patches/server/0043-Add-permission-for-F3-N-debug.patch index af892d946..07272b51e 100644 --- a/patches/server/0045-Add-permission-for-F3-N-debug.patch +++ b/patches/server/0043-Add-permission-for-F3-N-debug.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add permission for F3+N debug diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 88678fb527f170c81d5e2d4a28f65e398dab8939..98992aae7c7724a25fc6f6aaee27b07dccbe2292 100644 +index b9136fcec3f36549ddd572cbb8cd01ecae45590f..8596e1c016c51a840b8c0c6a8d5c8e0893c4f1c7 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -1108,6 +1108,7 @@ public abstract class PlayerList { diff --git a/patches/server/0046-Configurable-TPS-Catchup.patch b/patches/server/0044-Configurable-TPS-Catchup.patch similarity index 66% rename from patches/server/0046-Configurable-TPS-Catchup.patch rename to patches/server/0044-Configurable-TPS-Catchup.patch index 6ff271df2..89e37d025 100644 --- a/patches/server/0046-Configurable-TPS-Catchup.patch +++ b/patches/server/0044-Configurable-TPS-Catchup.patch @@ -5,18 +5,22 @@ Subject: [PATCH] Configurable TPS Catchup diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 00808ffd5b9afd16fb0c7353ef834d0479598ac8..07752c1348ef11f91bd0ba57d2ec97b10b446b5a 100644 +index 18dc66b78f91c0b9efdf9008c0a38c52fdfc93ad..22cbe00a19a2ac0ad25b1107b1290b793903e3aa 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1346,7 +1346,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop pages, int slotId) { @@ -45,7 +45,7 @@ index ea579334ea9f0c1675186af3192f3f7a1c23e859..ff96fcf7d039c4bae4d77c9c546486c2 itemstack.set(DataComponents.WRITABLE_BOOK_CONTENT, new WritableBookContent(list1)); this.player.getInventory().setItem(slotId, CraftEventFactory.handleEditBookEvent(this.player, slotId, handItem, itemstack)); // CraftBukkit // Paper - Don't ignore result (see other callsite for handleEditBookEvent) -@@ -1328,6 +1337,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl +@@ -1327,6 +1336,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl } private void signBook(FilteredText title, List pages, int slotId) { @@ -57,7 +57,7 @@ index ea579334ea9f0c1675186af3192f3f7a1c23e859..ff96fcf7d039c4bae4d77c9c546486c2 ItemStack itemstack = this.player.getInventory().getItem(slotId); if (itemstack.has(DataComponents.WRITABLE_BOOK_CONTENT)) { -@@ -1335,10 +1349,10 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl +@@ -1334,10 +1348,10 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl itemstack1.remove(DataComponents.WRITABLE_BOOK_CONTENT); List> list1 = (List>) (List) pages.stream().map((filteredtext1) -> { // CraftBukkit - decompile error @@ -70,7 +70,7 @@ index ea579334ea9f0c1675186af3192f3f7a1c23e859..ff96fcf7d039c4bae4d77c9c546486c2 CraftEventFactory.handleEditBookEvent(this.player, slotId, itemstack, itemstack1); // CraftBukkit this.player.getInventory().setItem(slotId, itemstack); // CraftBukkit - event factory updates the hand book } -@@ -1348,6 +1362,16 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl +@@ -1347,6 +1361,16 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl return this.player.isTextFilteringEnabled() ? Filterable.passThrough(message.filteredOrEmpty()) : Filterable.from(message); } diff --git a/patches/server/0072-Entity-lifespan.patch b/patches/server/0070-Entity-lifespan.patch similarity index 89% rename from patches/server/0072-Entity-lifespan.patch rename to patches/server/0070-Entity-lifespan.patch index 6cd35f666..41314b868 100644 --- a/patches/server/0072-Entity-lifespan.patch +++ b/patches/server/0070-Entity-lifespan.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Entity lifespan diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index ff96fcf7d039c4bae4d77c9c546486c2312f6ecc..92afa94ce5ae84ddbe0564c57300771126c4fde9 100644 +index 0654c2753a44b4cda55fd92513fabc45ff4ab6c9..6b460227a12ba275c02243a1fbafb87e3845cb14 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -2923,6 +2923,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl +@@ -2922,6 +2922,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl AABB axisalignedbb = entity.getBoundingBox(); if (this.player.canInteractWithEntity(axisalignedbb, io.papermc.paper.configuration.GlobalConfiguration.get().misc.clientInteractionLeniencyDistance.or(3.0D))) { // Paper - configurable lenience value for interact range @@ -17,7 +17,7 @@ index ff96fcf7d039c4bae4d77c9c546486c2312f6ecc..92afa94ce5ae84ddbe0564c573007711 private void performInteraction(InteractionHand enumhand, ServerGamePacketListenerImpl.EntityInteraction playerconnection_a, PlayerInteractEntityEvent event) { // CraftBukkit ItemStack itemstack = ServerGamePacketListenerImpl.this.player.getItemInHand(enumhand); diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java -index b57c362e67d9724fc387d3aa5b8547aef648fe91..0c55e69bbdc673a87b5ac5ee740817aca2434bb6 100644 +index 261288f51ed47b0eac80cc965c76683f3e13687f..1f253d5ace885423aa25ebdd986e1909a15ba018 100644 --- a/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java @@ -144,6 +144,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab @@ -28,7 +28,7 @@ index b57c362e67d9724fc387d3aa5b8547aef648fe91..0c55e69bbdc673a87b5ac5ee740817ac public boolean aware = true; // CraftBukkit protected Mob(EntityType type, Level world) { -@@ -332,6 +333,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab +@@ -330,6 +331,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab entityliving = null; } } @@ -36,7 +36,7 @@ index b57c362e67d9724fc387d3aa5b8547aef648fe91..0c55e69bbdc673a87b5ac5ee740817ac this.target = entityliving; return true; // CraftBukkit end -@@ -376,8 +378,28 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab +@@ -374,8 +376,28 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab } gameprofilerfiller.pop(); @@ -65,7 +65,7 @@ index b57c362e67d9724fc387d3aa5b8547aef648fe91..0c55e69bbdc673a87b5ac5ee740817ac @Override protected void playHurtSound(DamageSource damageSource) { this.resetAmbientSoundTime(); -@@ -546,6 +568,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab +@@ -544,6 +566,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab } nbt.putBoolean("Bukkit.Aware", this.aware); // CraftBukkit @@ -73,7 +73,7 @@ index b57c362e67d9724fc387d3aa5b8547aef648fe91..0c55e69bbdc673a87b5ac5ee740817ac } @Override -@@ -636,6 +659,11 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab +@@ -634,6 +657,11 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab this.aware = nbt.getBoolean("Bukkit.Aware"); } // CraftBukkit end @@ -85,7 +85,7 @@ index b57c362e67d9724fc387d3aa5b8547aef648fe91..0c55e69bbdc673a87b5ac5ee740817ac } @Override -@@ -1744,6 +1772,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab +@@ -1738,6 +1766,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab this.playAttackSound(); } diff --git a/patches/server/0073-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch b/patches/server/0071-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch similarity index 95% rename from patches/server/0073-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch rename to patches/server/0071-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch index 788c8b120..3bb64b515 100644 --- a/patches/server/0073-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch +++ b/patches/server/0071-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add option to teleport to spawn if outside world border diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index d8a5d37e3b796392d6b0548371d4f0801d4d9bec..6f769f90038042ac11cdd59f36d7f3fd85cfd490 100644 +index 3ea226168519e07b10d015f4c9b2b369569daf11..5d4b0f8b621f62604f098da7bf0822d25b469547 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -3390,4 +3390,26 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple @@ -36,7 +36,7 @@ index d8a5d37e3b796392d6b0548371d4f0801d4d9bec..6f769f90038042ac11cdd59f36d7f3fd + // Purpur end } diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 28c8ff8ffe5f4dd7a4f3f6f2397dd33b29309c9f..bf38f466033928611d58ffd410191cf69814c171 100644 +index d711bef21fba8e32ae99a0a52992e609e4841734..c073786171306ba023f31d2f9ede037707253fa2 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -477,6 +477,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0074-Squid-EAR-immunity.patch b/patches/server/0072-Squid-EAR-immunity.patch similarity index 93% rename from patches/server/0074-Squid-EAR-immunity.patch rename to patches/server/0072-Squid-EAR-immunity.patch index 21dbb94d6..0c7beebbe 100644 --- a/patches/server/0074-Squid-EAR-immunity.patch +++ b/patches/server/0072-Squid-EAR-immunity.patch @@ -25,10 +25,10 @@ index b5d714f137257810ced4b4457bd5bb01123d3452..0d4eaa2933d2b6501eeb64a0d95b2d4d public boolean spiderRidable = false; diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java -index a017374f2027946ef465cf41fd6ed6de7f00e19f..9b1a16747aa23b18e4cff986efaac6ce64b6ddb9 100644 +index 24d7eca3f0b06602a1026eda3432f0a4255d8b01..9d8d0a99f0b2a8e3452c4c86e6c53c66d58c5b3d 100644 --- a/src/main/java/org/spigotmc/ActivationRange.java +++ b/src/main/java/org/spigotmc/ActivationRange.java -@@ -401,6 +401,7 @@ public class ActivationRange +@@ -378,6 +378,7 @@ public class ActivationRange */ public static boolean checkIfActive(Entity entity) { diff --git a/patches/server/0075-Phantoms-burn-in-light.patch b/patches/server/0073-Phantoms-burn-in-light.patch similarity index 100% rename from patches/server/0075-Phantoms-burn-in-light.patch rename to patches/server/0073-Phantoms-burn-in-light.patch diff --git a/patches/server/0076-Configurable-villager-breeding.patch b/patches/server/0074-Configurable-villager-breeding.patch similarity index 93% rename from patches/server/0076-Configurable-villager-breeding.patch rename to patches/server/0074-Configurable-villager-breeding.patch index 4b296ba04..17ee6caf7 100644 --- a/patches/server/0076-Configurable-villager-breeding.patch +++ b/patches/server/0074-Configurable-villager-breeding.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Configurable villager breeding 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 8020c505c70938d4da4748484def33581bde564d..681009327894c04224b9438ae8784b7a283e11a3 100644 +index f89c82db6333dc64ac57e225f5522943eb959f46..ca1996ab3b998607c193ba427163a6a144990c97 100644 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java -@@ -771,7 +771,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler +@@ -768,7 +768,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler @Override public boolean canBreed() { diff --git a/patches/server/0077-Redstone-deactivates-spawners.patch b/patches/server/0075-Redstone-deactivates-spawners.patch similarity index 100% rename from patches/server/0077-Redstone-deactivates-spawners.patch rename to patches/server/0075-Redstone-deactivates-spawners.patch diff --git a/patches/server/0078-Totems-work-in-inventory.patch b/patches/server/0076-Totems-work-in-inventory.patch similarity index 94% rename from patches/server/0078-Totems-work-in-inventory.patch rename to patches/server/0076-Totems-work-in-inventory.patch index 59ccfd423..dfd9bdefb 100644 --- a/patches/server/0078-Totems-work-in-inventory.patch +++ b/patches/server/0076-Totems-work-in-inventory.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Totems work in inventory diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index bf38f466033928611d58ffd410191cf69814c171..1add518a30e1f44849aea6c805cf3cef849f1992 100644 +index c073786171306ba023f31d2f9ede037707253fa2..dfbb47c200dab7d99cde867c12420c67964867c2 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -1731,6 +1731,18 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -1718,6 +1718,18 @@ public abstract class LivingEntity extends Entity implements Attackable { } } diff --git a/patches/server/0079-Add-vindicator-johnny-spawn-chance.patch b/patches/server/0077-Add-vindicator-johnny-spawn-chance.patch similarity index 100% rename from patches/server/0079-Add-vindicator-johnny-spawn-chance.patch rename to patches/server/0077-Add-vindicator-johnny-spawn-chance.patch diff --git a/patches/server/0080-Dispensers-place-anvils-option.patch b/patches/server/0078-Dispensers-place-anvils-option.patch similarity index 100% rename from patches/server/0080-Dispensers-place-anvils-option.patch rename to patches/server/0078-Dispensers-place-anvils-option.patch diff --git a/patches/server/0081-Allow-anvil-colors.patch b/patches/server/0079-Allow-anvil-colors.patch similarity index 100% rename from patches/server/0081-Allow-anvil-colors.patch rename to patches/server/0079-Allow-anvil-colors.patch diff --git a/patches/server/0082-Add-option-to-disable-dolphin-treasure-searching.patch b/patches/server/0080-Add-option-to-disable-dolphin-treasure-searching.patch similarity index 100% rename from patches/server/0082-Add-option-to-disable-dolphin-treasure-searching.patch rename to patches/server/0080-Add-option-to-disable-dolphin-treasure-searching.patch diff --git a/patches/server/0083-Short-enderman-height.patch b/patches/server/0081-Short-enderman-height.patch similarity index 90% rename from patches/server/0083-Short-enderman-height.patch rename to patches/server/0081-Short-enderman-height.patch index 6cebe529c..27430dfb2 100644 --- a/patches/server/0083-Short-enderman-height.patch +++ b/patches/server/0081-Short-enderman-height.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Short enderman height diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java -index fa15b22e464f1dfe83f3d07ff7a28b6740df79b4..bf82c21b144c88f95991dbd7cb575839d8bd8e57 100644 +index 426d47c14d137906ed70fc3082e3d77e7f48c8d7..20a7fe2995db717f394fc3041435a95dbfee2ff7 100644 --- a/src/main/java/net/minecraft/world/entity/EntityType.java +++ b/src/main/java/net/minecraft/world/entity/EntityType.java -@@ -389,7 +389,8 @@ public class EntityType implements FeatureElement, EntityTypeT +@@ -388,7 +388,8 @@ public class EntityType implements FeatureElement, EntityTypeT @Nullable private Component description; private final Optional> lootTable; @@ -19,10 +19,10 @@ index fa15b22e464f1dfe83f3d07ff7a28b6740df79b4..bf82c21b144c88f95991dbd7cb575839 private final FeatureFlagSet requiredFeatures; diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java -index c350bdd31b2b8397aadf0642ee34adcb05db42d6..eeb008347f8e58d91030ac8920bfa641210835be 100644 +index 13eaf1e8b12c3b4cba6b202f2d31e99a8a9bae92..d2959976cf206f6c92ae90f103035e4760b9d955 100644 --- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java +++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java -@@ -415,6 +415,7 @@ public class EnderMan extends Monster implements NeutralMob { +@@ -409,6 +409,7 @@ public class EnderMan extends Monster implements NeutralMob { if (this.isInvulnerableTo(world, source)) { return false; } else if (getRider() != null && this.isControllable()) { return super.hurtServer(world, source, amount); // Purpur - no teleporting on damage diff --git a/patches/server/0084-Stop-squids-floating-on-top-of-water.patch b/patches/server/0082-Stop-squids-floating-on-top-of-water.patch similarity index 96% rename from patches/server/0084-Stop-squids-floating-on-top-of-water.patch rename to patches/server/0082-Stop-squids-floating-on-top-of-water.patch index e5e40e5d0..096a49e27 100644 --- a/patches/server/0084-Stop-squids-floating-on-top-of-water.patch +++ b/patches/server/0082-Stop-squids-floating-on-top-of-water.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Stop squids floating on top of water diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index b739929ad53940a218a777056f05df4c8b8d0974..2248a9c519367b7770cccb648ea908dc6d35cfb7 100644 +index eea1053e0ec1446e117d3ac4732deaba191db8f2..2cf83678a2a37ff9082eae1a8b6cbf5be60a065f 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -4778,6 +4778,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -4775,6 +4775,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess return Mth.lerp(delta, this.yRotO, this.yRot); } diff --git a/patches/server/0085-Crying-obsidian-valid-for-portal-frames.patch b/patches/server/0083-Crying-obsidian-valid-for-portal-frames.patch similarity index 96% rename from patches/server/0085-Crying-obsidian-valid-for-portal-frames.patch rename to patches/server/0083-Crying-obsidian-valid-for-portal-frames.patch index 10c156423..3b44dd6ad 100644 --- a/patches/server/0085-Crying-obsidian-valid-for-portal-frames.patch +++ b/patches/server/0083-Crying-obsidian-valid-for-portal-frames.patch @@ -18,7 +18,7 @@ index 90056822cd17f3d33d14b3f94b34750ee522a0a9..acdff7b4a00d563739fd301c3633a266 private static final float SAFE_TRAVEL_MAX_ENTITY_XY = 4.0F; private static final double SAFE_TRAVEL_MAX_VERTICAL_DELTA = 1.0D; diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -index 0cafa4bbc530a80277cbf323f8d62dee9b08a426..80335c5915da347cc779dfd2c44d87e8329ad336 100644 +index 6ba2e3ed28b7605329446b84dc305e71505e30ec..c61105bfb22531b728cb4f4af24c68625db5a99f 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -215,6 +215,7 @@ public class PurpurConfig { diff --git a/patches/server/0086-Entities-can-use-portals.patch b/patches/server/0084-Entities-can-use-portals.patch similarity index 92% rename from patches/server/0086-Entities-can-use-portals.patch rename to patches/server/0084-Entities-can-use-portals.patch index c0a5a1304..31378a71e 100644 --- a/patches/server/0086-Entities-can-use-portals.patch +++ b/patches/server/0084-Entities-can-use-portals.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Entities can use portals diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index e954682b8b38355f73ea2aba1a4677c23d47ed3e..692b4afe8616dac52f687baee86cbbd2af6763ec 100644 +index 2cf83678a2a37ff9082eae1a8b6cbf5be60a065f..c0e8739f0dd9290550872839eddca4b0090b603b 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -3471,7 +3471,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -3468,7 +3468,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess public void setAsInsidePortal(Portal portal, BlockPos pos) { if (this.isOnPortalCooldown()) { this.setPortalCooldown(); @@ -17,7 +17,7 @@ index e954682b8b38355f73ea2aba1a4677c23d47ed3e..692b4afe8616dac52f687baee86cbbd2 if (this.portalProcess != null && this.portalProcess.isSamePortal(portal)) { if (!this.portalProcess.isInsidePortalThisTick()) { this.portalProcess.updateEntryPosition(pos.immutable()); -@@ -4194,7 +4194,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -4191,7 +4191,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess // CraftBukkit end public boolean canUsePortal(boolean allowVehicles) { diff --git a/patches/server/0087-Customizable-wither-health-and-healing.patch b/patches/server/0085-Customizable-wither-health-and-healing.patch similarity index 94% rename from patches/server/0087-Customizable-wither-health-and-healing.patch rename to patches/server/0085-Customizable-wither-health-and-healing.patch index 670d5fd4f..a6988337b 100644 --- a/patches/server/0087-Customizable-wither-health-and-healing.patch +++ b/patches/server/0085-Customizable-wither-health-and-healing.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Customizable wither health and healing Adds the ability to customize the health of the wither, as well as the amount that it heals, and how often. diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java -index 1eecabe1cb09ed81172b9ac573b236718e80e08e..093dd2a5ac09767df7406e00d25985d0507957ef 100644 +index 57cf253fc69c087cfa0270225166f926ce6829f7..098ef0d6879e88009193c6dcedf1aa285980cbc6 100644 --- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java +++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java -@@ -525,8 +525,10 @@ public class WitherBoss extends Monster implements RangedAttackMob { +@@ -518,8 +518,10 @@ public class WitherBoss extends Monster implements RangedAttackMob { } } diff --git a/patches/server/0088-Allow-toggling-special-MobSpawners-per-world.patch b/patches/server/0086-Allow-toggling-special-MobSpawners-per-world.patch similarity index 98% rename from patches/server/0088-Allow-toggling-special-MobSpawners-per-world.patch rename to patches/server/0086-Allow-toggling-special-MobSpawners-per-world.patch index 59783f017..3c1a883fe 100644 --- a/patches/server/0088-Allow-toggling-special-MobSpawners-per-world.patch +++ b/patches/server/0086-Allow-toggling-special-MobSpawners-per-world.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Allow toggling special MobSpawners per world In vanilla, these are all hardcoded on for world type 0 (overworld) and hardcoded off for every other world type. Default config behaviour matches this. diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 9451c6fa2307bc12b47a106f2d82508548b109a8..d7edb681c0299f9103e7bc9fa082617f61929c19 100644 +index 7ab130afddb0893016fb558ed624198316ca191d..3442ace00904b73f4384760d42c9385697132bc9 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -606,7 +606,24 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe diff --git a/patches/server/0089-Raid-cooldown-setting.patch b/patches/server/0087-Raid-cooldown-setting.patch similarity index 100% rename from patches/server/0089-Raid-cooldown-setting.patch rename to patches/server/0087-Raid-cooldown-setting.patch diff --git a/patches/server/0090-Add-option-to-disable-zombie-aggressiveness-towards-.patch b/patches/server/0088-Add-option-to-disable-zombie-aggressiveness-towards-.patch similarity index 100% rename from patches/server/0090-Add-option-to-disable-zombie-aggressiveness-towards-.patch rename to patches/server/0088-Add-option-to-disable-zombie-aggressiveness-towards-.patch diff --git a/patches/server/0091-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch b/patches/server/0089-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch similarity index 100% rename from patches/server/0091-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch rename to patches/server/0089-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch diff --git a/patches/server/0092-Flying-squids-Oh-my.patch b/patches/server/0090-Flying-squids-Oh-my.patch similarity index 100% rename from patches/server/0092-Flying-squids-Oh-my.patch rename to patches/server/0090-Flying-squids-Oh-my.patch diff --git a/patches/server/0093-Infinity-bow-settings.patch b/patches/server/0091-Infinity-bow-settings.patch similarity index 100% rename from patches/server/0093-Infinity-bow-settings.patch rename to patches/server/0091-Infinity-bow-settings.patch diff --git a/patches/server/0094-Configurable-daylight-cycle.patch b/patches/server/0092-Configurable-daylight-cycle.patch similarity index 92% rename from patches/server/0094-Configurable-daylight-cycle.patch rename to patches/server/0092-Configurable-daylight-cycle.patch index d2afd03b9..4a3c55c7a 100644 --- a/patches/server/0094-Configurable-daylight-cycle.patch +++ b/patches/server/0092-Configurable-daylight-cycle.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Configurable daylight cycle diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 9ffaf5ab0286fa388bb028c4a14ae8341650b120..16ab1d7735789d69f265092151db696d8f23f071 100644 +index 75ef1a4f80449e87affbd9ba62f5f9447ef9db87..d55390d725f8798becb0b7b04485c99611e0e527 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1859,7 +1859,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop, B @@ -366,7 +366,7 @@ index ab0b90c300d0610e423abe7ac9e5b93305a21c5a..d0023e3734bb3c625fa53077f47039dc 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 f4a133546dd54cd84a3c1dfefc0fad92ed92c040..d09aa48e20c9a6e0d465b93e3759556638041394 100644 +index b42e1e1749c9f18b3bf842517522e90ba60330ff..e862803b38aceec149da8deddb9c88c46e916ad6 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 @@ -165,6 +165,12 @@ public class Frog extends Animal implements VariantHolder> { @@ -383,7 +383,7 @@ index f4a133546dd54cd84a3c1dfefc0fad92ed92c040..d09aa48e20c9a6e0d465b93e37595566 protected Brain.Provider brainProvider() { return Brain.provider(MEMORY_TYPES, SENSOR_TYPES); diff --git a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java -index e8185de995af8749356f05b28f69d33db367e749..78b3e463518df396f03c5e00fdef75ee86b101cd 100644 +index 307d11e5ad6d0b47af36b1469a73ae1caa100232..c9d7be823a040e7de407537d247062821dca643a 100644 --- a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java +++ b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java @@ -110,6 +110,12 @@ public class Goat extends Animal { @@ -553,7 +553,7 @@ index c66126f3a43e6e011e5f9a977ad481c96529d1d5..b2f9e7dec710f9a135074d6b5eb438e1 BlockPos.MutableBlockPos blockposition_mutableblockposition = pos.mutable(); diff --git a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java -index 718f671b2db46638fbbeb0624d375ad17b7e9c60..a58fc9a974b04085816d1940c195a1f0fdc9ddb5 100644 +index 476dcc613f566d88273f195b847e6b4dec777e44..d7bef344f1d18aa6037b3805da07353c54c82142 100644 --- a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java +++ b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java @@ -100,6 +100,12 @@ public class Hoglin extends Animal implements Enemy, HoglinBase { diff --git a/patches/server/0100-Apply-display-names-from-item-forms-of-entities-to-e.patch b/patches/server/0098-Apply-display-names-from-item-forms-of-entities-to-e.patch similarity index 99% rename from patches/server/0100-Apply-display-names-from-item-forms-of-entities-to-e.patch rename to patches/server/0098-Apply-display-names-from-item-forms-of-entities-to-e.patch index 1cbf33a20..c26f25016 100644 --- a/patches/server/0100-Apply-display-names-from-item-forms-of-entities-to-e.patch +++ b/patches/server/0098-Apply-display-names-from-item-forms-of-entities-to-e.patch @@ -18,7 +18,7 @@ index edb0cd90e28016c44b0aaf5c9ed5d7bdbced5295..12ff824ffa81ea45f76337ec2b6d80b0 this.drops.add(new DefaultDrop(itemstack, stack -> Block.popResource(this.level(), this.blockPosition(), stack))); // CraftBukkit - add to drops // Paper - Restore vanilla drops behavior return this.brokenByAnything(world, damageSource); // Paper diff --git a/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java b/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java -index bbdaaa1cc0b4aed28bc39385508d221055b99d4d..bd5e034ce58ebe53d2121209d76ae60134ce72fe 100644 +index 7d83ad8a61f6aafbc063506c1858554f9b700b70..fd1bd4fb88d1bd4a0734db463dc1be640c736d34 100644 --- a/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java +++ b/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java @@ -240,7 +240,13 @@ public class ItemFrame extends HangingEntity { diff --git a/patches/server/0101-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch b/patches/server/0099-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch similarity index 100% rename from patches/server/0101-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch rename to patches/server/0099-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch diff --git a/patches/server/0102-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch b/patches/server/0100-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch similarity index 93% rename from patches/server/0102-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch rename to patches/server/0100-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch index b55530316..8d4f84ebd 100644 --- a/patches/server/0102-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch +++ b/patches/server/0100-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch @@ -8,10 +8,10 @@ This should help to reduce the amount of dirt, gravel, grass, and etc. that Endermen like to randomly place all over the world. diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java -index eeb008347f8e58d91030ac8920bfa641210835be..123b8430215840386c85a1c4d819122d7678cdcf 100644 +index d2959976cf206f6c92ae90f103035e4760b9d955..c816521a5f73ccd04216ac0225945c6ef585869d 100644 --- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java +++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java -@@ -474,7 +474,7 @@ public class EnderMan extends Monster implements NeutralMob { +@@ -468,7 +468,7 @@ public class EnderMan extends Monster implements NeutralMob { @Override public boolean requiresCustomPersistence() { diff --git a/patches/server/0103-Add-configurable-snowball-damage.patch b/patches/server/0101-Add-configurable-snowball-damage.patch similarity index 100% rename from patches/server/0103-Add-configurable-snowball-damage.patch rename to patches/server/0101-Add-configurable-snowball-damage.patch diff --git a/patches/server/0104-Changeable-Mob-Left-Handed-Chance.patch b/patches/server/0102-Changeable-Mob-Left-Handed-Chance.patch similarity index 91% rename from patches/server/0104-Changeable-Mob-Left-Handed-Chance.patch rename to patches/server/0102-Changeable-Mob-Left-Handed-Chance.patch index f806c37a9..5ab06e4fe 100644 --- a/patches/server/0104-Changeable-Mob-Left-Handed-Chance.patch +++ b/patches/server/0102-Changeable-Mob-Left-Handed-Chance.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Changeable Mob Left Handed Chance diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java -index 0c55e69bbdc673a87b5ac5ee740817aca2434bb6..81fb0826a1e4ec3ab36447ec0a4dcbf1196cb441 100644 +index 1f253d5ace885423aa25ebdd986e1909a15ba018..06fbac8a968971d9ec3305e98b136d88be19a9f7 100644 --- a/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java -@@ -1428,7 +1428,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab +@@ -1422,7 +1422,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab attributemodifiable.addPermanentModifier(new AttributeModifier(Mob.RANDOM_SPAWN_BONUS_ID, randomsource.triangle(0.0D, 0.11485000000000001D), AttributeModifier.Operation.ADD_MULTIPLIED_BASE)); } diff --git a/patches/server/0105-Add-boat-fall-damage-config.patch b/patches/server/0103-Add-boat-fall-damage-config.patch similarity index 97% rename from patches/server/0105-Add-boat-fall-damage-config.patch rename to patches/server/0103-Add-boat-fall-damage-config.patch index 0e8791dd7..d6e967c48 100644 --- a/patches/server/0105-Add-boat-fall-damage-config.patch +++ b/patches/server/0103-Add-boat-fall-damage-config.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add boat fall damage config diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 0719be3a59219cf381a716da32331c4cd3f3f3a2..93ccb6f984ae6194eeecefb4d1511dbb7e7fc7ae 100644 +index 5d4b0f8b621f62604f098da7bf0822d25b469547..51e58f447cc07224b2d9bbeff3719a719931a40c 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1439,7 +1439,16 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple diff --git a/patches/server/0106-Snow-Golem-rate-of-fire-config.patch b/patches/server/0104-Snow-Golem-rate-of-fire-config.patch similarity index 100% rename from patches/server/0106-Snow-Golem-rate-of-fire-config.patch rename to patches/server/0104-Snow-Golem-rate-of-fire-config.patch diff --git a/patches/server/0107-EMC-Configurable-disable-give-dropping.patch b/patches/server/0105-EMC-Configurable-disable-give-dropping.patch similarity index 95% rename from patches/server/0107-EMC-Configurable-disable-give-dropping.patch rename to patches/server/0105-EMC-Configurable-disable-give-dropping.patch index 05a4e95f9..dab7d4201 100644 --- a/patches/server/0107-EMC-Configurable-disable-give-dropping.patch +++ b/patches/server/0105-EMC-Configurable-disable-give-dropping.patch @@ -20,7 +20,7 @@ index 0d9de4c61c7b26a6ff37c12fde629161fd0c3d5a..2f7897744f4aea718170698881773e90 entityitem = entityplayer.drop(itemstack, false, false, false); // CraftBukkit - SPIGOT-2942: Add boolean to call event if (entityitem != null) { diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -index 80335c5915da347cc779dfd2c44d87e8329ad336..b1be848bbc617968fbf1d1babbbf1a6e2bee6ec4 100644 +index c61105bfb22531b728cb4f4af24c68625db5a99f..5feee7c130e71731051e610aeb0e8c3341bddb2e 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -212,6 +212,11 @@ public class PurpurConfig { diff --git a/patches/server/0108-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch b/patches/server/0106-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch similarity index 98% rename from patches/server/0108-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch rename to patches/server/0106-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch index 660fbeebd..9424f27ce 100644 --- a/patches/server/0108-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch +++ b/patches/server/0106-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch @@ -136,10 +136,10 @@ index a0e0692d17760f440fe81d52887284c787e562db..ab9bebc07b5228dbc0d3ba4b0f7d1bbe brain.setMemory(MemoryModuleType.SECONDARY_JOB_SITE, list); } else { 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 681009327894c04224b9438ae8784b7a283e11a3..afa7b2c100ba1682b1621667901f9ec04f9a72b6 100644 +index ca1996ab3b998607c193ba427163a6a144990c97..66a8beddde806e04ca4d0e943734d6116b107bcc 100644 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java -@@ -229,7 +229,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler +@@ -227,7 +227,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler brain.addActivity(Activity.PLAY, VillagerGoalPackages.getPlayPackage(0.5F)); } else { brain.setSchedule(Schedule.VILLAGER_DEFAULT); @@ -148,7 +148,7 @@ index 681009327894c04224b9438ae8784b7a283e11a3..afa7b2c100ba1682b1621667901f9ec0 } brain.addActivity(Activity.CORE, VillagerGoalPackages.getCorePackage(villagerprofession, 0.5F)); -@@ -950,6 +950,11 @@ public class Villager extends AbstractVillager implements ReputationEventHandler +@@ -947,6 +947,11 @@ public class Villager extends AbstractVillager implements ReputationEventHandler public boolean hasFarmSeeds() { return this.getInventory().hasAnyMatching((itemstack) -> { diff --git a/patches/server/0109-Toggle-for-Zombified-Piglin-death-always-counting-as.patch b/patches/server/0107-Toggle-for-Zombified-Piglin-death-always-counting-as.patch similarity index 100% rename from patches/server/0109-Toggle-for-Zombified-Piglin-death-always-counting-as.patch rename to patches/server/0107-Toggle-for-Zombified-Piglin-death-always-counting-as.patch diff --git a/patches/server/0110-Configurable-chance-for-wolves-to-spawn-rabid.patch b/patches/server/0108-Configurable-chance-for-wolves-to-spawn-rabid.patch similarity index 100% rename from patches/server/0110-Configurable-chance-for-wolves-to-spawn-rabid.patch rename to patches/server/0108-Configurable-chance-for-wolves-to-spawn-rabid.patch diff --git a/patches/server/0111-Configurable-default-collar-color.patch b/patches/server/0109-Configurable-default-collar-color.patch similarity index 100% rename from patches/server/0111-Configurable-default-collar-color.patch rename to patches/server/0109-Configurable-default-collar-color.patch diff --git a/patches/server/0112-Phantom-flames-on-swoop.patch b/patches/server/0110-Phantom-flames-on-swoop.patch similarity index 100% rename from patches/server/0112-Phantom-flames-on-swoop.patch rename to patches/server/0110-Phantom-flames-on-swoop.patch diff --git a/patches/server/0113-Option-for-chests-to-open-even-with-a-solid-block-on.patch b/patches/server/0111-Option-for-chests-to-open-even-with-a-solid-block-on.patch similarity index 100% rename from patches/server/0113-Option-for-chests-to-open-even-with-a-solid-block-on.patch rename to patches/server/0111-Option-for-chests-to-open-even-with-a-solid-block-on.patch diff --git a/patches/server/0114-Implement-TPSBar.patch b/patches/server/0112-Implement-TPSBar.patch similarity index 97% rename from patches/server/0114-Implement-TPSBar.patch rename to patches/server/0112-Implement-TPSBar.patch index ea93d7622..543a5d6fd 100644 --- a/patches/server/0114-Implement-TPSBar.patch +++ b/patches/server/0112-Implement-TPSBar.patch @@ -17,10 +17,10 @@ index 719fbce359f8c2c52ee4e9da3dfe9566f58c0346..f01fff591efc92267d96084660f9e968 if (environment.includeIntegrated) { diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 0b89eeab47d143b260aa5f8bb10197a95f4045e2..95350ac6f92c52918f4b760bb4f63f1720151db1 100644 +index d55390d725f8798becb0b7b04485c99611e0e527..7ce4148a1fcd221bf22f4ad02a2fc32e007fa1da 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1159,6 +1159,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop byteAllowed) { diff --git a/patches/server/0117-Full-netherite-armor-grants-fire-resistance.patch b/patches/server/0115-Full-netherite-armor-grants-fire-resistance.patch similarity index 97% rename from patches/server/0117-Full-netherite-armor-grants-fire-resistance.patch rename to patches/server/0115-Full-netherite-armor-grants-fire-resistance.patch index f37c3c4f7..e692d0071 100644 --- a/patches/server/0117-Full-netherite-armor-grants-fire-resistance.patch +++ b/patches/server/0115-Full-netherite-armor-grants-fire-resistance.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Full netherite armor grants fire resistance diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index bf6c8abe3c0ba4144c37f2ee53bfb96563340e87..3dbb473655c4f115e28ce31fa647cd0cb7fbe3c6 100644 +index fee0ffaaf94c484c9272d3b5743b90bb70e0d08d..fc0e571b62a9bd40df2d3d066cf374e12004a6d8 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -356,6 +356,17 @@ public abstract class Player extends LivingEntity { diff --git a/patches/server/0118-Add-mobGriefing-bypass-to-everything-affected.patch b/patches/server/0116-Add-mobGriefing-bypass-to-everything-affected.patch similarity index 98% rename from patches/server/0118-Add-mobGriefing-bypass-to-everything-affected.patch rename to patches/server/0116-Add-mobGriefing-bypass-to-everything-affected.patch index 6c847ea53..1c0a2a101 100644 --- a/patches/server/0118-Add-mobGriefing-bypass-to-everything-affected.patch +++ b/patches/server/0116-Add-mobGriefing-bypass-to-everything-affected.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add mobGriefing bypass to everything affected diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 25f2209471cb956bf2c3d3995a8867f6698e40fb..cf06584ae058277d40c85eebbc831094a575d1d5 100644 +index dfbb47c200dab7d99cde867c12420c67964867c2..c513e6de7d89992720fc4139969377c261571b72 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -1914,7 +1914,7 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -1901,7 +1901,7 @@ public abstract class LivingEntity extends Entity implements Attackable { boolean flag = false; if (this.dead && adversary instanceof WitherBoss) { // Paper @@ -18,10 +18,10 @@ index 25f2209471cb956bf2c3d3995a8867f6698e40fb..cf06584ae058277d40c85eebbc831094 BlockState iblockdata = Blocks.WITHER_ROSE.defaultBlockState(); diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java -index 79ae615b1579b753300917ccf1babf5c51217867..f6b2d533062d48a619e8d2ed3f24ae7fcaf97b96 100644 +index 06fbac8a968971d9ec3305e98b136d88be19a9f7..6836f0ddab9d05d146fc03c234b1b58829ec96c0 100644 --- a/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java -@@ -716,7 +716,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab +@@ -714,7 +714,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab Level world = this.level(); if (world instanceof ServerLevel worldserver) { @@ -144,10 +144,10 @@ index 14feab288349f0fcd80b89466926b37d1087bf53..b7ba6c303826e35ee1261cb46f1e778a // flag1 = worldserver.removeBlock(blockposition, false) || flag1; flag1 = true; diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java -index 0886d6b471f30105f59192ddd20c0a27e46e5f50..034369e6bfb61398013f883e763cc108ffe4a2b8 100644 +index 098ef0d6879e88009193c6dcedf1aa285980cbc6..297a67e8a8c1e314ad7f8d32d5bcacc3746b0b6c 100644 --- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java +++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java -@@ -498,7 +498,7 @@ public class WitherBoss extends Monster implements RangedAttackMob { +@@ -491,7 +491,7 @@ public class WitherBoss extends Monster implements RangedAttackMob { if (this.destroyBlocksTick > 0) { --this.destroyBlocksTick; @@ -157,10 +157,10 @@ index 0886d6b471f30105f59192ddd20c0a27e46e5f50..034369e6bfb61398013f883e763cc108 j = Mth.floor(this.getBbWidth() / 2.0F + 1.0F); diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java -index 123b8430215840386c85a1c4d819122d7678cdcf..0091a74236d7299d34dd4c7a5f0e5b4ec3ae2145 100644 +index c816521a5f73ccd04216ac0225945c6ef585869d..61a113074a6839d6dcb59019eefe9f532fb9cb2b 100644 --- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java +++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java -@@ -522,7 +522,15 @@ public class EnderMan extends Monster implements NeutralMob { +@@ -516,7 +516,15 @@ public class EnderMan extends Monster implements NeutralMob { @Override public boolean canUse() { if (!enderman.level().purpurConfig.endermanAllowGriefing) return false; // Purpur - Add enderman and creeper griefing controls @@ -177,7 +177,7 @@ index 123b8430215840386c85a1c4d819122d7678cdcf..0091a74236d7299d34dd4c7a5f0e5b4e } @Override -@@ -568,7 +576,15 @@ public class EnderMan extends Monster implements NeutralMob { +@@ -562,7 +570,15 @@ public class EnderMan extends Monster implements NeutralMob { @Override public boolean canUse() { if (!enderman.level().purpurConfig.endermanAllowGriefing) return false; // Purpur - Add enderman and creeper griefing controls @@ -249,10 +249,10 @@ index 191724aa48081017adf3db0b6ff99a77dd4ce68d..3159c61e1f34e95749661a711e4d97f7 BlockPos blockposition = BlockPos.containing(this.mob.getX(), this.mob.getY() + 0.5D, this.mob.getZ()).relative(this.selectedDirection); BlockState iblockdata = this.mob.level().getBlockState(blockposition); diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java -index ed9ca1a16a6c929bb8b7202df8ae614465384a5e..770b2043d8e4811f81bc86a3718d4125733a463b 100644 +index 1a40babc8f6b3f56377cb2af45e9d17d0028a77b..e1ae622ec56f1e011f8007c5b5b8a7032cd28102 100644 --- a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java +++ b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java -@@ -439,7 +439,7 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento +@@ -438,7 +438,7 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento @Override public boolean wantsToPickUp(ServerLevel world, ItemStack stack) { @@ -291,10 +291,10 @@ index 2f00676f62478897ae4931ea06e047567c407535..59c71183e2c4edae72623f6aa662b807 // CraftBukkit start - fire ExplosionPrimeEvent ExplosionPrimeEvent event = new ExplosionPrimeEvent((org.bukkit.entity.Explosive) this.getBukkitEntity()); diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java -index 80ff364514d071d1862c4b3aa5d01b9c39062946..51160e98090c031f2d6394c824a5b1d6c0fbb7f6 100644 +index 9a7b56b653848974e1194eb4f6d40cb99a96ff57..3a39eb8572cea2596edd26bef4a484c8cd78904d 100644 --- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java +++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java -@@ -498,7 +498,7 @@ public abstract class Projectile extends Entity implements TraceableEntity { +@@ -468,7 +468,7 @@ public abstract class Projectile extends Entity implements TraceableEntity { public boolean mayInteract(ServerLevel world, BlockPos pos) { Entity entity = this.getOwner(); diff --git a/patches/server/0119-Config-to-allow-Note-Block-sounds-when-blocked.patch b/patches/server/0117-Config-to-allow-Note-Block-sounds-when-blocked.patch similarity index 100% rename from patches/server/0119-Config-to-allow-Note-Block-sounds-when-blocked.patch rename to patches/server/0117-Config-to-allow-Note-Block-sounds-when-blocked.patch diff --git a/patches/server/0120-Add-EntityTeleportHinderedEvent.patch b/patches/server/0118-Add-EntityTeleportHinderedEvent.patch similarity index 98% rename from patches/server/0120-Add-EntityTeleportHinderedEvent.patch rename to patches/server/0118-Add-EntityTeleportHinderedEvent.patch index 34b12006a..3fe19cf38 100644 --- a/patches/server/0120-Add-EntityTeleportHinderedEvent.patch +++ b/patches/server/0118-Add-EntityTeleportHinderedEvent.patch @@ -71,7 +71,7 @@ index 3e9642e5236d9a1cc8e8f3b375d76810f4bc7c6c..5169cba4c43d80ce3597c57bf7d40bd0 EntityPortalEnterEvent event = new EntityPortalEnterEvent(entity.getBukkitEntity(), new org.bukkit.Location(world.getWorld(), pos.getX(), pos.getY(), pos.getZ()), org.bukkit.PortalType.NETHER); // Paper - add portal type world.getCraftServer().getPluginManager().callEvent(event); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 12c65755f85acce10c2d5359539d64498138127b..c0b6efefc4d4f31602f39afa76f837300c22f804 100644 +index c105d0cce462df46e106eb502355225b83be32b7..51772356a3c64da7b29fa204ffec03a70cd4406a 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -246,6 +246,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { @@ -83,7 +83,7 @@ index 12c65755f85acce10c2d5359539d64498138127b..c0b6efefc4d4f31602f39afa76f83730 } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 5ac1f31892849fe507a59480e3383530d1c89db8..57515361aab6dbf0ec7d4029b34a48b36c4f498b 100644 +index 16671636da1b6da62a0bdf0daab745fcd89143b7..ea8b1f01b2dd626c422649488c1e605a8054dbf2 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1449,6 +1449,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0121-Farmland-trampling-changes.patch b/patches/server/0119-Farmland-trampling-changes.patch similarity index 97% rename from patches/server/0121-Farmland-trampling-changes.patch rename to patches/server/0119-Farmland-trampling-changes.patch index 086d795e7..1369ff158 100644 --- a/patches/server/0121-Farmland-trampling-changes.patch +++ b/patches/server/0119-Farmland-trampling-changes.patch @@ -12,7 +12,7 @@ necessary to trample in the first place. Feather Falling 1 requires you to fall over 3+ blocks to trample. FF 2 requires 4+, etc. diff --git a/src/main/java/net/minecraft/world/level/block/FarmBlock.java b/src/main/java/net/minecraft/world/level/block/FarmBlock.java -index 0c990005661762245426e90c464bd84ae81eb3ca..af135f8b70b0e2af470afce9053976c3a1e03477 100644 +index 032b8252c3ff2fc111442610998e36a5c145ae13..fc5a755c558714442c1e12e88ee05764d6c1d9f4 100644 --- a/src/main/java/net/minecraft/world/level/block/FarmBlock.java +++ b/src/main/java/net/minecraft/world/level/block/FarmBlock.java @@ -127,12 +127,20 @@ public class FarmBlock extends Block { diff --git a/patches/server/0122-Movement-options-for-armor-stands.patch b/patches/server/0120-Movement-options-for-armor-stands.patch similarity index 96% rename from patches/server/0122-Movement-options-for-armor-stands.patch rename to patches/server/0120-Movement-options-for-armor-stands.patch index c4aa86ba8..bd2b53b73 100644 --- a/patches/server/0122-Movement-options-for-armor-stands.patch +++ b/patches/server/0120-Movement-options-for-armor-stands.patch @@ -17,10 +17,10 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index c7eed040e9cce78bc2dbb5258acadc73db38b7dc..9075321407518a2fe1fab469362a37b5a4dc3388 100644 +index c0e8739f0dd9290550872839eddca4b0090b603b..cfe26c762b2affa5050c175f6ab0306af6cfbe71 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -2040,7 +2040,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -2037,7 +2037,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess return this.isInWater() || flag; } diff --git a/patches/server/0123-Fix-stuck-in-portals.patch b/patches/server/0121-Fix-stuck-in-portals.patch similarity index 93% rename from patches/server/0123-Fix-stuck-in-portals.patch rename to patches/server/0121-Fix-stuck-in-portals.patch index 1760ac679..1954d35e5 100644 --- a/patches/server/0123-Fix-stuck-in-portals.patch +++ b/patches/server/0121-Fix-stuck-in-portals.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix stuck in portals diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 01eff7ae375b9289360336ce728155b32b8cf347..ca88e602674e85b63b9622c0f94b588448480c12 100644 +index 303c9b2c6f1a62e40c5657248b727c14bb9c613a..92c0a7609e45a8cdb809ad7579f1713fc15675cf 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1678,6 +1678,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple @@ -17,10 +17,10 @@ index 01eff7ae375b9289360336ce728155b32b8cf347..ca88e602674e85b63b9622c0f94b5884 this.connection.internalTeleport(PositionMoveRotation.of(teleportTarget), teleportTarget.relatives()); // CraftBukkit - use internal teleport without event this.connection.resetPosition(); diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 7d7b1e21ad22831630cb825abcb75b1d69da5e14..114e3ce75fefef8bab339c09128601325d9084f9 100644 +index cfe26c762b2affa5050c175f6ab0306af6cfbe71..f15a8c14417b83b237dc7b9a11490116314cd4c6 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -3468,14 +3468,17 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -3465,14 +3465,17 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess return Vec3.directionFromRotation(this.getRotationVector()); } diff --git a/patches/server/0124-Toggle-for-water-sensitive-mob-damage.patch b/patches/server/0122-Toggle-for-water-sensitive-mob-damage.patch similarity index 99% rename from patches/server/0124-Toggle-for-water-sensitive-mob-damage.patch rename to patches/server/0122-Toggle-for-water-sensitive-mob-damage.patch index fe80ab133..dd635a015 100644 --- a/patches/server/0124-Toggle-for-water-sensitive-mob-damage.patch +++ b/patches/server/0122-Toggle-for-water-sensitive-mob-damage.patch @@ -22,7 +22,7 @@ index d556642fd07492aa52bfc0a2432ab3d16fe4f866..781f0adde9194162af57523aad4b73a3 public boolean canFly() { return this.level().purpurConfig.glowSquidsCanFly; diff --git a/src/main/java/net/minecraft/world/entity/ambient/Bat.java b/src/main/java/net/minecraft/world/entity/ambient/Bat.java -index f706ceb6de0415e87d2b6dcbca4e9a3d9332f3d4..2a8aa8d3887c700f465d296c35892b2c405d5f51 100644 +index 5f11c687df87015261d1d39c957e241fbeb5476a..79175bd42f37f10fae812e101dd5b09b209ebe30 100644 --- a/src/main/java/net/minecraft/world/entity/ambient/Bat.java +++ b/src/main/java/net/minecraft/world/entity/ambient/Bat.java @@ -114,6 +114,12 @@ public class Bat extends AmbientCreature { @@ -434,7 +434,7 @@ index f1d2e40f55a91810693a5604f3060e284f615fa0..95b24da0de519363d67e0bcb4fcdeaa2 public void tame(Player player) { setCollarColor(level().purpurConfig.wolfDefaultCollarColor); diff --git a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java -index 41b0a0b2d430a4a8eba461caf3ad8ae418210ae0..7177459f086de5f8e4ff1151e416e1193881756c 100644 +index 9bffdbfcd49cf84865926a0e341784c1d4a1c98c..aff5b95fcccdba79ddc58e5e56d268aa49879b36 100644 --- a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java +++ b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java @@ -130,6 +130,12 @@ public class Axolotl extends Animal implements VariantHolder, B @@ -451,7 +451,7 @@ index 41b0a0b2d430a4a8eba461caf3ad8ae418210ae0..7177459f086de5f8e4ff1151e416e119 public float getWalkTargetValue(BlockPos pos, LevelReader world) { return 0.0F; diff --git a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java -index 78b3e463518df396f03c5e00fdef75ee86b101cd..904c64cbe2c9ae6c52784ffba449884304466f5a 100644 +index c9d7be823a040e7de407537d247062821dca643a..4a8ac3d75a3c75eea8e361d7eb729f27ea807347 100644 --- a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java +++ b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java @@ -116,6 +116,12 @@ public class Goat extends Animal { @@ -604,7 +604,7 @@ index b7ba6c303826e35ee1261cb46f1e778af29a59e5..587b477305addbd1e5c71f34dc9df07b return Mob.createMobAttributes().add(Attributes.MAX_HEALTH, 200.0D); } diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java -index 034369e6bfb61398013f883e763cc108ffe4a2b8..2b0dea5e04b9fdcc15842c5a54e30d1fcd035ae1 100644 +index 297a67e8a8c1e314ad7f8d32d5bcacc3746b0b6c..cb3277d101b48db434a7e3155bf54559d6c13ba2 100644 --- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java +++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java @@ -120,6 +120,12 @@ public class WitherBoss extends Monster implements RangedAttackMob { @@ -711,7 +711,7 @@ index 011327ea9bf9ef3497f2183ef149f8ec9bb29fab..d69716edb777155d0b52db25af64107e return Guardian.createAttributes().add(Attributes.MOVEMENT_SPEED, 0.30000001192092896D).add(Attributes.ATTACK_DAMAGE, 8.0D).add(Attributes.MAX_HEALTH, 80.0D); } diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java -index 0091a74236d7299d34dd4c7a5f0e5b4ec3ae2145..e68b783b2af0fa34a083065e4d2d2ff21c4d6863 100644 +index 61a113074a6839d6dcb59019eefe9f532fb9cb2b..a92c30b5d3079ce58e00b9824ec3a60e6b41f104 100644 --- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java +++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java @@ -91,7 +91,7 @@ public class EnderMan extends Monster implements NeutralMob { @@ -1181,7 +1181,7 @@ index c4bf422557fe6abbe882f575f19a9334c7a94fe5..3070f4484276f8ea6b95134abda6409e public void setPersistentAngerTarget(@Nullable UUID angryAt) { this.persistentAngerTarget = angryAt; diff --git a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java -index a58fc9a974b04085816d1940c195a1f0fdc9ddb5..6d890e09a49d2ff02efcab5abdf803df87c01362 100644 +index d7bef344f1d18aa6037b3805da07353c54c82142..534626336e45da2c67cb023f4e5feea59daa8b5d 100644 --- a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java +++ b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java @@ -106,6 +106,12 @@ public class Hoglin extends Animal implements Enemy, HoglinBase { @@ -1198,7 +1198,7 @@ index a58fc9a974b04085816d1940c195a1f0fdc9ddb5..6d890e09a49d2ff02efcab5abdf803df public boolean canBeLeashed() { return true; diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java -index 770b2043d8e4811f81bc86a3718d4125733a463b..72ff00f2a97dc05d02f3be920c98999028fbcb75 100644 +index e1ae622ec56f1e011f8007c5b5b8a7032cd28102..f0b0642571a242f9c22febbafba587f1ca6caaaa 100644 --- a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java +++ b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java @@ -123,6 +123,12 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento @@ -1232,10 +1232,10 @@ index a0fa32a1217bbdae2c91e5a51598d7bd555ca1eb..0e77e9e4a4fd14b5cecc377a03f0d6b2 return Monster.createMonsterAttributes() .add(Attributes.MAX_HEALTH, 50.0) 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 afa7b2c100ba1682b1621667901f9ec04f9a72b6..7f48e7fd14fe9b6c8d3ca5069663d67c250c7364 100644 +index 66a8beddde806e04ca4d0e943734d6116b107bcc..e33a29c486d50c5f22888bcb1979830143c8b06d 100644 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java -@@ -195,6 +195,12 @@ public class Villager extends AbstractVillager implements ReputationEventHandler +@@ -193,6 +193,12 @@ public class Villager extends AbstractVillager implements ReputationEventHandler return level().purpurConfig.villagerCanBeLeashed; } // Purpur end - Allow leashing villagers diff --git a/patches/server/0125-Config-to-always-tame-in-Creative.patch b/patches/server/0123-Config-to-always-tame-in-Creative.patch similarity index 100% rename from patches/server/0125-Config-to-always-tame-in-Creative.patch rename to patches/server/0123-Config-to-always-tame-in-Creative.patch diff --git a/patches/server/0126-End-crystal-explosion-options.patch b/patches/server/0124-End-crystal-explosion-options.patch similarity index 98% rename from patches/server/0126-End-crystal-explosion-options.patch rename to patches/server/0124-End-crystal-explosion-options.patch index aa05b2906..9f5119ea7 100644 --- a/patches/server/0126-End-crystal-explosion-options.patch +++ b/patches/server/0124-End-crystal-explosion-options.patch @@ -5,7 +5,7 @@ Subject: [PATCH] End crystal explosion options diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java -index 4c9709e680b585316978b6a410600a8a3b4b6e3e..305c3350116f656c3d0e6134e4d8023eac50f3ad 100644 +index 931cb90a8b32eb47d5985807d74d8ef7f1d01baf..218263958a90dfd95e4ecb7218c9eeefb069e50d 100644 --- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java +++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java @@ -49,6 +49,22 @@ public class EndCrystal extends Entity { diff --git a/patches/server/0127-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch b/patches/server/0125-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch similarity index 96% rename from patches/server/0127-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch rename to patches/server/0125-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch index 9fd587da5..72c65c631 100644 --- a/patches/server/0127-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch +++ b/patches/server/0125-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch @@ -17,10 +17,10 @@ index 587b477305addbd1e5c71f34dc9df07be7f60384..d3721fcd9a537ad1e3c5712cd78bd436 } diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java -index 2b0dea5e04b9fdcc15842c5a54e30d1fcd035ae1..7f37cb7ec2e31ab66b08f2605c83a7cb696c0d63 100644 +index cb3277d101b48db434a7e3155bf54559d6c13ba2..7bdc2b79fbf58f248caf63008ce898b9a43bfcd3 100644 --- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java +++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java -@@ -736,6 +736,7 @@ public class WitherBoss extends Monster implements RangedAttackMob { +@@ -729,6 +729,7 @@ public class WitherBoss extends Monster implements RangedAttackMob { @Override protected boolean canRide(Entity entity) { diff --git a/patches/server/0128-Dont-run-with-scissors.patch b/patches/server/0126-Dont-run-with-scissors.patch similarity index 98% rename from patches/server/0128-Dont-run-with-scissors.patch rename to patches/server/0126-Dont-run-with-scissors.patch index 2cf6e2fad..5e51127ca 100644 --- a/patches/server/0128-Dont-run-with-scissors.patch +++ b/patches/server/0126-Dont-run-with-scissors.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Dont run with scissors! inspired by https://modrinth.com/mod/dont-run-with-scissors diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 472e63b385319411e670e29fa4b4e3dfb497a317..b865bf1f8b41cf4f30b3529dd1ced54e784eefdd 100644 +index 2e714a4faf07e7ca18fa073ff6660c5d4f377507..ea6713bd5a2807cf00d664296c13e076b2fca3a0 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -1721,6 +1721,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl +@@ -1720,6 +1720,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl this.player.tryResetCurrentImpulseContext(); } @@ -23,7 +23,7 @@ index 472e63b385319411e670e29fa4b4e3dfb497a317..b865bf1f8b41cf4f30b3529dd1ced54e this.player.checkMovementStatistics(this.player.getX() - d3, this.player.getY() - d4, this.player.getZ() - d5); this.lastGoodX = this.player.getX(); this.lastGoodY = this.player.getY(); -@@ -1760,6 +1767,17 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl +@@ -1759,6 +1766,17 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl } } diff --git a/patches/server/0129-One-Punch-Man.patch b/patches/server/0127-One-Punch-Man.patch similarity index 95% rename from patches/server/0129-One-Punch-Man.patch rename to patches/server/0127-One-Punch-Man.patch index 9a8d1a6b2..fe9865fe3 100644 --- a/patches/server/0129-One-Punch-Man.patch +++ b/patches/server/0127-One-Punch-Man.patch @@ -6,10 +6,10 @@ Subject: [PATCH] One Punch Man! inspired by https://modrinth.com/mod/creative-one-punch diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index fe183dcfb32e915af4c58f8b40c35e349e39d189..062f05f855ef50872d9b3074bf1951eabd97e0c6 100644 +index c513e6de7d89992720fc4139969377c261571b72..7b60c84df74cb542e2da3c8d81383cc4afc47a55 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -1468,6 +1468,24 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -1455,6 +1455,24 @@ public abstract class LivingEntity extends Entity implements Attackable { this.stopSleeping(); } diff --git a/patches/server/0130-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch b/patches/server/0128-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch similarity index 100% rename from patches/server/0130-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch rename to patches/server/0128-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch diff --git a/patches/server/0131-Config-to-ignore-nearby-mobs-when-sleeping.patch b/patches/server/0129-Config-to-ignore-nearby-mobs-when-sleeping.patch similarity index 96% rename from patches/server/0131-Config-to-ignore-nearby-mobs-when-sleeping.patch rename to patches/server/0129-Config-to-ignore-nearby-mobs-when-sleeping.patch index b5655b0aa..f873300ca 100644 --- a/patches/server/0131-Config-to-ignore-nearby-mobs-when-sleeping.patch +++ b/patches/server/0129-Config-to-ignore-nearby-mobs-when-sleeping.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Config to ignore nearby mobs when sleeping diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 2bc946e62099ab3020d38a304a6b686ccf7a39af..79f4ea221b791e605a7865de111c64a86ddd11ef 100644 +index 92c0a7609e45a8cdb809ad7579f1713fc15675cf..6467e72fa43469ae065462e1a0720130dee336b3 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1789,7 +1789,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple diff --git a/patches/server/0132-Add-back-player-spawned-endermite-API.patch b/patches/server/0130-Add-back-player-spawned-endermite-API.patch similarity index 100% rename from patches/server/0132-Add-back-player-spawned-endermite-API.patch rename to patches/server/0130-Add-back-player-spawned-endermite-API.patch diff --git a/patches/server/0133-Config-Enderman-aggressiveness-towards-Endermites.patch b/patches/server/0131-Config-Enderman-aggressiveness-towards-Endermites.patch similarity index 97% rename from patches/server/0133-Config-Enderman-aggressiveness-towards-Endermites.patch rename to patches/server/0131-Config-Enderman-aggressiveness-towards-Endermites.patch index d4d3733e0..7692383b5 100644 --- a/patches/server/0133-Config-Enderman-aggressiveness-towards-Endermites.patch +++ b/patches/server/0131-Config-Enderman-aggressiveness-towards-Endermites.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Config Enderman aggressiveness towards Endermites diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java -index e68b783b2af0fa34a083065e4d2d2ff21c4d6863..68847ab748e295b27d64d1a0addd374f57c14646 100644 +index a92c30b5d3079ce58e00b9824ec3a60e6b41f104..09a49b598c35c8d51142aee7b4958bc344536cb3 100644 --- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java +++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java @@ -132,7 +132,7 @@ public class EnderMan extends Monster implements NeutralMob { diff --git a/patches/server/0134-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch b/patches/server/0132-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch similarity index 96% rename from patches/server/0134-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch rename to patches/server/0132-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch index f965557c2..0656e5abb 100644 --- a/patches/server/0134-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch +++ b/patches/server/0132-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch @@ -7,7 +7,7 @@ Prevents Enderman from becoming aggresive towards players that are wearing a Dra Adds functionality to a useless item! diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java -index 68847ab748e295b27d64d1a0addd374f57c14646..3fa5d2f2c8759f7777e3391e820bd6b7ade57b00 100644 +index 09a49b598c35c8d51142aee7b4958bc344536cb3..efeb8a214c3e0ab6cb28a6f6e0d6417916ed670f 100644 --- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java +++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java @@ -260,7 +260,7 @@ public class EnderMan extends Monster implements NeutralMob { diff --git a/patches/server/0135-Tick-fluids-config.patch b/patches/server/0133-Tick-fluids-config.patch similarity index 100% rename from patches/server/0135-Tick-fluids-config.patch rename to patches/server/0133-Tick-fluids-config.patch diff --git a/patches/server/0136-Config-to-disable-Llama-caravans.patch b/patches/server/0134-Config-to-disable-Llama-caravans.patch similarity index 100% rename from patches/server/0136-Config-to-disable-Llama-caravans.patch rename to patches/server/0134-Config-to-disable-Llama-caravans.patch diff --git a/patches/server/0137-Config-to-make-Creepers-explode-on-death.patch b/patches/server/0135-Config-to-make-Creepers-explode-on-death.patch similarity index 100% rename from patches/server/0137-Config-to-make-Creepers-explode-on-death.patch rename to patches/server/0135-Config-to-make-Creepers-explode-on-death.patch diff --git a/patches/server/0138-Configurable-ravager-griefable-blocks-list.patch b/patches/server/0136-Configurable-ravager-griefable-blocks-list.patch similarity index 100% rename from patches/server/0138-Configurable-ravager-griefable-blocks-list.patch rename to patches/server/0136-Configurable-ravager-griefable-blocks-list.patch diff --git a/patches/server/0139-Sneak-to-bulk-process-composter.patch b/patches/server/0137-Sneak-to-bulk-process-composter.patch similarity index 100% rename from patches/server/0139-Sneak-to-bulk-process-composter.patch rename to patches/server/0137-Sneak-to-bulk-process-composter.patch diff --git a/patches/server/0140-Config-for-skipping-night.patch b/patches/server/0138-Config-for-skipping-night.patch similarity index 96% rename from patches/server/0140-Config-for-skipping-night.patch rename to patches/server/0138-Config-for-skipping-night.patch index c828ace19..699ddae81 100644 --- a/patches/server/0140-Config-for-skipping-night.patch +++ b/patches/server/0138-Config-for-skipping-night.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Config for skipping night diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 756740b1be54631b4d25343f9a5c826b4b6288cf..e3d2c0f569c76fc9af95f28f29e24be12ab1c476 100644 +index 6585e0d72b2fbb8af5c62ceba57eef2fb7794e87..56fe25076109827815d7d8ebc45a62d391462bbf 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -749,7 +749,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe diff --git a/patches/server/0141-Add-config-for-villager-trading.patch b/patches/server/0139-Add-config-for-villager-trading.patch similarity index 96% rename from patches/server/0141-Add-config-for-villager-trading.patch rename to patches/server/0139-Add-config-for-villager-trading.patch index b84a65928..112f4ee78 100644 --- a/patches/server/0141-Add-config-for-villager-trading.patch +++ b/patches/server/0139-Add-config-for-villager-trading.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add config for villager trading 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 7f48e7fd14fe9b6c8d3ca5069663d67c250c7364..fcc5a794aa6f43f3b9e8bdb5f2c0601bf7004698 100644 +index e33a29c486d50c5f22888bcb1979830143c8b06d..0bca1eeaa0f35d702dad41758c72bb3c9ab35220 100644 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java -@@ -380,6 +380,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler +@@ -377,6 +377,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler } if (level().purpurConfig.villagerRidable && itemstack.isEmpty()) return tryRide(player, hand); // Purpur - Ridables diff --git a/patches/server/0142-Drowning-Settings.patch b/patches/server/0140-Drowning-Settings.patch similarity index 90% rename from patches/server/0142-Drowning-Settings.patch rename to patches/server/0140-Drowning-Settings.patch index df24f2234..dcbf8ab07 100644 --- a/patches/server/0142-Drowning-Settings.patch +++ b/patches/server/0140-Drowning-Settings.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Drowning Settings diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 114e3ce75fefef8bab339c09128601325d9084f9..60ffa728e6b8c861b0d108d1562150ccb671af33 100644 +index f15a8c14417b83b237dc7b9a11490116314cd4c6..a5f4f5d915a864240fd738ca32872829bfcabb41 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -3695,7 +3695,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -3692,7 +3692,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess } public int getMaxAirSupply() { @@ -18,7 +18,7 @@ index 114e3ce75fefef8bab339c09128601325d9084f9..60ffa728e6b8c861b0d108d1562150cc public int getAirSupply() { diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 062f05f855ef50872d9b3074bf1951eabd97e0c6..327ff173c3f1223d457112f094116e0eec90fcc8 100644 +index 7b60c84df74cb542e2da3c8d81383cc4afc47a55..dc0656378d81a77e1d49895a90f92f27e3e247f3 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -489,7 +489,7 @@ public abstract class LivingEntity extends Entity implements Attackable { @@ -40,7 +40,7 @@ index 062f05f855ef50872d9b3074bf1951eabd97e0c6..327ff173c3f1223d457112f094116e0e } else if (this.getAirSupply() < this.getMaxAirSupply()) { this.setAirSupply(this.increaseAirSupply(this.getAirSupply())); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index e6096491e26d5ad7df5f1d626a14c771662d2898..0f8348bedaf101fa9b9d50c3288aec0953cb56f6 100644 +index 913c3e0c66d005380782af7e7a3358ed5ef45afc..693f84494c622697b4803f81ee81e21c59a7ebe6 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -165,6 +165,15 @@ public class PurpurWorldConfig { diff --git a/patches/server/0143-Break-individual-slabs-when-sneaking.patch b/patches/server/0141-Break-individual-slabs-when-sneaking.patch similarity index 100% rename from patches/server/0143-Break-individual-slabs-when-sneaking.patch rename to patches/server/0141-Break-individual-slabs-when-sneaking.patch diff --git a/patches/server/0144-Config-to-disable-hostile-mob-spawn-on-ice.patch b/patches/server/0142-Config-to-disable-hostile-mob-spawn-on-ice.patch similarity index 100% rename from patches/server/0144-Config-to-disable-hostile-mob-spawn-on-ice.patch rename to patches/server/0142-Config-to-disable-hostile-mob-spawn-on-ice.patch diff --git a/patches/server/0145-Config-to-show-Armor-Stand-arms-on-spawn.patch b/patches/server/0143-Config-to-show-Armor-Stand-arms-on-spawn.patch similarity index 92% rename from patches/server/0145-Config-to-show-Armor-Stand-arms-on-spawn.patch rename to patches/server/0143-Config-to-show-Armor-Stand-arms-on-spawn.patch index 2d7a172c8..a62f1e0fd 100644 --- a/patches/server/0145-Config-to-show-Armor-Stand-arms-on-spawn.patch +++ b/patches/server/0143-Config-to-show-Armor-Stand-arms-on-spawn.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Config to show Armor Stand arms on spawn diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java -index c954cb3255145e18e8ab1e5a1b0267b879bbd1f3..037586c0fdb42a02660aba89dd741a647c67e52b 100644 +index e1c7a644dc922ca726cebf71ec2f0b159d6db289..572bb7e1f6ae75f6dfe53b0e100b3654e42bf4c2 100644 --- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java +++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java @@ -128,6 +128,7 @@ public class ArmorStand extends LivingEntity { @@ -17,7 +17,7 @@ index c954cb3255145e18e8ab1e5a1b0267b879bbd1f3..037586c0fdb42a02660aba89dd741a64 public ArmorStand(Level world, double x, double y, double z) { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index c9cc7f51b2f86b4caf25d642159be418ddd20d61..908953ee49fa46c1cf11a815b6c48fd0e78d251b 100644 +index f83e25e7586aa5b84a6a87cdd32ca7ee005e01c6..0c3438c1914d6ec828c270fecfc7cf101fcfd211 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -103,6 +103,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0146-Option-to-make-doors-require-redstone.patch b/patches/server/0144-Option-to-make-doors-require-redstone.patch similarity index 100% rename from patches/server/0146-Option-to-make-doors-require-redstone.patch rename to patches/server/0144-Option-to-make-doors-require-redstone.patch diff --git a/patches/server/0147-Config-to-allow-unsafe-enchants.patch b/patches/server/0145-Config-to-allow-unsafe-enchants.patch similarity index 98% rename from patches/server/0147-Config-to-allow-unsafe-enchants.patch rename to patches/server/0145-Config-to-allow-unsafe-enchants.patch index 00ef5b20a..70cff0575 100644 --- a/patches/server/0147-Config-to-allow-unsafe-enchants.patch +++ b/patches/server/0145-Config-to-allow-unsafe-enchants.patch @@ -78,7 +78,7 @@ index a7c3338ed6edcd26fce869ec66fdcaa4c32c0e4f..346681cf9c3c9ff5274f63236b0cc7c4 ((ServerPlayer) this.player).connection.send(new ClientboundContainerSetDataPacket(this.containerId, 0, this.cost.get())); } diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java -index 7c5770a6a576e47c8ad90c5be80df423607e06f5..095c86ea25fc4f385d96d2e92fa67a150e27c489 100644 +index c616ebbf0f709b8c3a500a23a2190f7023f7757d..aac771d7d8aefc6d5fcb497763ab9bac1ce2dc31 100644 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java @@ -1369,6 +1369,12 @@ public final class ItemStack implements DataComponentHolder { @@ -95,7 +95,7 @@ index 7c5770a6a576e47c8ad90c5be80df423607e06f5..095c86ea25fc4f385d96d2e92fa67a15 return (ItemEnchantments) this.getOrDefault(DataComponents.ENCHANTMENTS, ItemEnchantments.EMPTY); } diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -index 28800c519ab8a6648d632a577ffbecae175f3844..ebeb7e756f8d8b499f0ad1a0948264cfe376a69a 100644 +index 693b9f04a35f055ea21a1b6be5ac27a04f1d80ad..eb9e18e2b71559ed945c40d489618ac3bf976e35 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -286,6 +286,36 @@ public class PurpurConfig { diff --git a/patches/server/0148-Configurable-sponge-absorption.patch b/patches/server/0146-Configurable-sponge-absorption.patch similarity index 100% rename from patches/server/0148-Configurable-sponge-absorption.patch rename to patches/server/0146-Configurable-sponge-absorption.patch diff --git a/patches/server/0149-Projectile-offset-config.patch b/patches/server/0147-Projectile-offset-config.patch similarity index 100% rename from patches/server/0149-Projectile-offset-config.patch rename to patches/server/0147-Projectile-offset-config.patch diff --git a/patches/server/0150-Config-for-powered-rail-activation-distance.patch b/patches/server/0148-Config-for-powered-rail-activation-distance.patch similarity index 100% rename from patches/server/0150-Config-for-powered-rail-activation-distance.patch rename to patches/server/0148-Config-for-powered-rail-activation-distance.patch diff --git a/patches/server/0151-Piglin-portal-spawn-modifier.patch b/patches/server/0149-Piglin-portal-spawn-modifier.patch similarity index 100% rename from patches/server/0151-Piglin-portal-spawn-modifier.patch rename to patches/server/0149-Piglin-portal-spawn-modifier.patch diff --git a/patches/server/0152-Config-to-change-max-number-of-bees.patch b/patches/server/0150-Config-to-change-max-number-of-bees.patch similarity index 96% rename from patches/server/0152-Config-to-change-max-number-of-bees.patch rename to patches/server/0150-Config-to-change-max-number-of-bees.patch index 4d77b178d..5dbcc264e 100644 --- a/patches/server/0152-Config-to-change-max-number-of-bees.patch +++ b/patches/server/0150-Config-to-change-max-number-of-bees.patch @@ -18,7 +18,7 @@ index 65a85b4a4e159cfe55e435ed342a87bcc07b21d5..7f0e37e23ff4c64355fdc822c0ac6839 public BeehiveBlockEntity(BlockPos pos, BlockState state) { super(BlockEntityType.BEEHIVE, pos, state); diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -index ebeb7e756f8d8b499f0ad1a0948264cfe376a69a..13dd4689491ca760be7451e5d4e721a240094664 100644 +index eb9e18e2b71559ed945c40d489618ac3bf976e35..3310fb33efdf129c424503eb07055ddb4c3a200b 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -253,6 +253,7 @@ public class PurpurConfig { diff --git a/patches/server/0153-Config-for-wither-explosion-radius.patch b/patches/server/0151-Config-for-wither-explosion-radius.patch similarity index 96% rename from patches/server/0153-Config-for-wither-explosion-radius.patch rename to patches/server/0151-Config-for-wither-explosion-radius.patch index b384ab056..dd386114f 100644 --- a/patches/server/0153-Config-for-wither-explosion-radius.patch +++ b/patches/server/0151-Config-for-wither-explosion-radius.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Config for wither explosion radius diff --git a/src/main/java/net/minecraft/world/entity/projectile/WitherSkull.java b/src/main/java/net/minecraft/world/entity/projectile/WitherSkull.java -index e0f25b057b7b908a10038d9e9695a500aa883c75..e63b408594b5d2673148e39c1deafc8510537bee 100644 +index 45e0b9b3653de2dcb51a579f939b991beac03149..eeb91f7e744d20c1a05212308a23102a347b9c19 100644 --- a/src/main/java/net/minecraft/world/entity/projectile/WitherSkull.java +++ b/src/main/java/net/minecraft/world/entity/projectile/WitherSkull.java @@ -103,7 +103,7 @@ public class WitherSkull extends AbstractHurtingProjectile { diff --git a/patches/server/0154-Gamemode-extra-permissions.patch b/patches/server/0152-Gamemode-extra-permissions.patch similarity index 97% rename from patches/server/0154-Gamemode-extra-permissions.patch rename to patches/server/0152-Gamemode-extra-permissions.patch index 7b7044fb4..e97cffe62 100644 --- a/patches/server/0154-Gamemode-extra-permissions.patch +++ b/patches/server/0152-Gamemode-extra-permissions.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Gamemode extra permissions diff --git a/src/main/java/net/minecraft/commands/CommandSourceStack.java b/src/main/java/net/minecraft/commands/CommandSourceStack.java -index ae2d9c91afe13d07fd0de6d455b90a2a704a2c91..0d133cd7993eb40b19e2aabe8e2bfcdcf5352398 100644 +index 7b2daf47e411362a462019a1612a99c952170200..8ed5e9293e80f53d741c145fa415fab6311036d7 100644 --- a/src/main/java/net/minecraft/commands/CommandSourceStack.java +++ b/src/main/java/net/minecraft/commands/CommandSourceStack.java @@ -211,6 +211,19 @@ public class CommandSourceStack implements ExecutionCommandSource diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index ec54766c12cc20fbbf7202ef647bc542d489e17b..d4faf0914d0e4d32f3274f984f14f7aa89372691 100644 +index a5f4f5d915a864240fd738ca32872829bfcabb41..25a6f228bad7deca7e7301868039d27bf65505c8 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -578,6 +578,22 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -575,6 +575,22 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess } // Purpur end - Add canSaveToDisk to Entity @@ -33,7 +33,7 @@ index ec54766c12cc20fbbf7202ef647bc542d489e17b..d4faf0914d0e4d32f3274f984f14f7aa this.id = Entity.ENTITY_COUNTER.incrementAndGet(); this.despawnTime = type == EntityType.PLAYER ? -1 : world.paperConfig().entities.spawning.despawnTime.getOrDefault(type, io.papermc.paper.configuration.type.number.IntOr.Disabled.DISABLED).or(-1); // Paper - entity despawn time limit diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 8bfb77d8a16fd71a13d76125670ccec1c03b5a39..148c3db2508a1f94a5b43e3581a0b995e4fb6f80 100644 +index 28d3b200ab0c3e8993dfb89a3e48146898c6b85e..ecf8e9742951c144170ce818c14d368011ef99a8 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -295,6 +295,7 @@ public abstract class LivingEntity extends Entity implements Attackable { @@ -44,7 +44,7 @@ index 8bfb77d8a16fd71a13d76125670ccec1c03b5a39..148c3db2508a1f94a5b43e3581a0b995 @Override public float getBukkitYaw() { -@@ -852,6 +853,7 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -839,6 +840,7 @@ public abstract class LivingEntity extends Entity implements Attackable { dataresult.resultOrPartial(logger::error).ifPresent((nbtbase) -> { nbt.put("Brain", nbtbase); }); @@ -52,7 +52,7 @@ index 8bfb77d8a16fd71a13d76125670ccec1c03b5a39..148c3db2508a1f94a5b43e3581a0b995 } @Override -@@ -940,6 +942,11 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -927,6 +929,11 @@ public abstract class LivingEntity extends Entity implements Attackable { this.brain = this.makeBrain(new Dynamic(NbtOps.INSTANCE, nbt.get("Brain"))); } @@ -64,7 +64,7 @@ index 8bfb77d8a16fd71a13d76125670ccec1c03b5a39..148c3db2508a1f94a5b43e3581a0b995 } // CraftBukkit start -@@ -3815,6 +3822,34 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -3788,6 +3795,34 @@ public abstract class LivingEntity extends Entity implements Attackable { } } @@ -100,10 +100,10 @@ index 8bfb77d8a16fd71a13d76125670ccec1c03b5a39..148c3db2508a1f94a5b43e3581a0b995 public boolean isSensitiveToWater() { diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java -index f6b2d533062d48a619e8d2ed3f24ae7fcaf97b96..0be6582e50ccc94036bb6782a5f811c0f9c42f01 100644 +index 6836f0ddab9d05d146fc03c234b1b58829ec96c0..30213b1917de318989f280aed8735bbe539de100 100644 --- a/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java -@@ -1779,17 +1779,8 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab +@@ -1773,17 +1773,8 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab protected void playAttackSound() {} public boolean isSunBurnTick() { diff --git a/patches/server/0169-Config-MobEffect-by-world.patch b/patches/server/0167-Config-MobEffect-by-world.patch similarity index 100% rename from patches/server/0169-Config-MobEffect-by-world.patch rename to patches/server/0167-Config-MobEffect-by-world.patch diff --git a/patches/server/0170-Beacon-Activation-Range-Configurable.patch b/patches/server/0168-Beacon-Activation-Range-Configurable.patch similarity index 100% rename from patches/server/0170-Beacon-Activation-Range-Configurable.patch rename to patches/server/0168-Beacon-Activation-Range-Configurable.patch diff --git a/patches/server/0171-Make-lightning-rod-range-configurable.patch b/patches/server/0169-Make-lightning-rod-range-configurable.patch similarity index 89% rename from patches/server/0171-Make-lightning-rod-range-configurable.patch rename to patches/server/0169-Make-lightning-rod-range-configurable.patch index 8235db415..d93da1f1b 100644 --- a/patches/server/0171-Make-lightning-rod-range-configurable.patch +++ b/patches/server/0169-Make-lightning-rod-range-configurable.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Make lightning rod range configurable diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index bd4dbaee9a90909b9fd63d7c6fbac235a1d2264e..01f20a248c15bf46377a8cdb37759b43e872fb08 100644 +index 56fe25076109827815d7d8ebc45a62d391462bbf..9ff7fb18e52bea06b02ebf0d1b97647df6b304dc 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -1087,7 +1087,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe +@@ -1073,7 +1073,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe return holder.is(PoiTypes.LIGHTNING_ROD); }, (blockposition1) -> { return blockposition1.getY() == this.getHeight(Heightmap.Types.WORLD_SURFACE, blockposition1.getX(), blockposition1.getZ()) - 1; @@ -18,7 +18,7 @@ index bd4dbaee9a90909b9fd63d7c6fbac235a1d2264e..01f20a248c15bf46377a8cdb37759b43 return optional.map((blockposition1) -> { return blockposition1.above(1); diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -index 711e63f2101e5a52ca3a3963fa9b0a976b4946a7..fe548c474113d6fa5b605557026e86a542bb03c9 100644 +index 52a8a0b6b78dae42c717cd8c34268d631eb3c1fe..f8028be8c5ac3349c8b4b5a337108e305765cc2e 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -273,6 +273,7 @@ public class PurpurConfig { diff --git a/patches/server/0172-Burp-delay-burp-after-eating-food-fills-hunger-bar-c.patch b/patches/server/0170-Burp-delay-burp-after-eating-food-fills-hunger-bar-c.patch similarity index 98% rename from patches/server/0172-Burp-delay-burp-after-eating-food-fills-hunger-bar-c.patch rename to patches/server/0170-Burp-delay-burp-after-eating-food-fills-hunger-bar-c.patch index e3e8d869d..291da503d 100644 --- a/patches/server/0172-Burp-delay-burp-after-eating-food-fills-hunger-bar-c.patch +++ b/patches/server/0170-Burp-delay-burp-after-eating-food-fills-hunger-bar-c.patch @@ -18,7 +18,7 @@ index 837bdc7d6bd4e05b0deded829c678c86ae3d79d5..0c7c0524e487ff32e16dd9939d92bc64 } diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index 1cb8a5391e31017c0e0d958c72338904efc708cb..6885f1fb87e9cb5ac5e1ddd55f8b836a711c6f0a 100644 +index bc3c67e8f70890831a0bb1799a3b7c10852b1273..a8b5869160cb75c314459403a0a229ec68b69086 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -201,6 +201,7 @@ public abstract class Player extends LivingEntity { diff --git a/patches/server/0173-Allow-player-join-full-server-by-permission.patch b/patches/server/0171-Allow-player-join-full-server-by-permission.patch similarity index 93% rename from patches/server/0173-Allow-player-join-full-server-by-permission.patch rename to patches/server/0171-Allow-player-join-full-server-by-permission.patch index fbcdb3243..e49803d32 100644 --- a/patches/server/0173-Allow-player-join-full-server-by-permission.patch +++ b/patches/server/0171-Allow-player-join-full-server-by-permission.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Allow player join full server by permission diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index db0fe267c1eeb6e2f3ac03a64431d3126d7f5d5a..e1d195ab8b005edd7fcded810ddf903b47c000a1 100644 +index 0969a713df3150b0b2d2dd2d595e5f49e491f8af..5b1705794a8c3914cb11fdd35f75c8e0c128ecd0 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -711,7 +711,7 @@ public abstract class PlayerList { diff --git a/patches/server/0174-Add-portal-permission-bypass.patch b/patches/server/0172-Add-portal-permission-bypass.patch similarity index 96% rename from patches/server/0174-Add-portal-permission-bypass.patch rename to patches/server/0172-Add-portal-permission-bypass.patch index 766f9270f..193fdeefd 100644 --- a/patches/server/0174-Add-portal-permission-bypass.patch +++ b/patches/server/0172-Add-portal-permission-bypass.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add portal permission bypass diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index 6885f1fb87e9cb5ac5e1ddd55f8b836a711c6f0a..7fccb7672e41545d747de1425335df7061222e52 100644 +index a8b5869160cb75c314459403a0a229ec68b69086..ee88c493119a4a4629d6456c8698dd89e4f477f4 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -202,6 +202,7 @@ public abstract class Player extends LivingEntity { diff --git a/patches/server/0175-Shulker-spawn-from-bullet-options.patch b/patches/server/0173-Shulker-spawn-from-bullet-options.patch similarity index 98% rename from patches/server/0175-Shulker-spawn-from-bullet-options.patch rename to patches/server/0173-Shulker-spawn-from-bullet-options.patch index b5f702948..806e99e22 100644 --- a/patches/server/0175-Shulker-spawn-from-bullet-options.patch +++ b/patches/server/0173-Shulker-spawn-from-bullet-options.patch @@ -13,7 +13,7 @@ Subject: [PATCH] Shulker spawn from bullet options (7 - 1) / 5.0 = 1.2 1.0 - 1.2 = -0.2 0% (6 other shulkers) diff --git a/src/main/java/net/minecraft/world/entity/monster/Shulker.java b/src/main/java/net/minecraft/world/entity/monster/Shulker.java -index ef44ab79cba3778111c9f27f77219b384761d9e4..8464a8288f7ec7ae14e44b93607ebb0617790c46 100644 +index 2b2e68e1449606ecfe5c414834ce3e2c6912d820..1957e2be5087e7bf85be5dfba53de8385dbeadd6 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Shulker.java +++ b/src/main/java/net/minecraft/world/entity/monster/Shulker.java @@ -512,12 +512,21 @@ public class Shulker extends AbstractGolem implements VariantHolder 0.0F) { this.playSound(this.getFallDamageSound((int) f), 1.0F, 1.0F); @@ -17,7 +17,7 @@ index 33fe6d19b3702d8de987fd9292dfca35e08ca875..0af3e463971697626f847cb96f8a4318 } } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 74515ad36cae0e838224caee3853d2f3d8bc0b11..1522df03dab1e9e8e6d471f62067a15350b909d9 100644 +index c541cba787c4a07786a4d800f167a70e287c7d9e..3837d3857f92bf90d2e5abbd0ccbecff7c796e4e 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -182,11 +182,13 @@ public class PurpurWorldConfig { diff --git a/patches/server/0191-Add-Option-for-disable-observer-clocks.patch b/patches/server/0189-Add-Option-for-disable-observer-clocks.patch similarity index 95% rename from patches/server/0191-Add-Option-for-disable-observer-clocks.patch rename to patches/server/0189-Add-Option-for-disable-observer-clocks.patch index b7997cd7c..7a58123ef 100644 --- a/patches/server/0191-Add-Option-for-disable-observer-clocks.patch +++ b/patches/server/0189-Add-Option-for-disable-observer-clocks.patch @@ -18,7 +18,7 @@ index 93ed9406c34804831b86d006dbd6087db9948f08..26cb9990b91991e0a2eadc2dcbbf229e } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index e4abac46f4bf2011a84acb07df424af10214588b..1f7a8f2b5196d5b15b047e6d67491a8335cbdbc3 100644 +index 3837d3857f92bf90d2e5abbd0ccbecff7c796e4e..683ae285004e1a6e3f58e0c2c16d5cb31f56a0d8 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -364,6 +364,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0192-Customizeable-Zombie-Villager-curing-times.patch b/patches/server/0190-Customizeable-Zombie-Villager-curing-times.patch similarity index 100% rename from patches/server/0192-Customizeable-Zombie-Villager-curing-times.patch rename to patches/server/0190-Customizeable-Zombie-Villager-curing-times.patch diff --git a/patches/server/0193-Option-for-sponges-to-work-on-lava-and-mud.patch b/patches/server/0191-Option-for-sponges-to-work-on-lava-and-mud.patch similarity index 96% rename from patches/server/0193-Option-for-sponges-to-work-on-lava-and-mud.patch rename to patches/server/0191-Option-for-sponges-to-work-on-lava-and-mud.patch index 0e175d40e..0503e6d71 100644 --- a/patches/server/0193-Option-for-sponges-to-work-on-lava-and-mud.patch +++ b/patches/server/0191-Option-for-sponges-to-work-on-lava-and-mud.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Option for sponges to work on lava and mud Co-authored by: granny diff --git a/src/main/java/net/minecraft/world/level/block/SpongeBlock.java b/src/main/java/net/minecraft/world/level/block/SpongeBlock.java -index 9201d911cf155aab7735600073426a0d4213f38b..4540d3a31ed89ea3684feeffb85a391655e9cbbc 100644 +index 0edb7e821a60fe95fea3cae900e5b88192946fe6..295c1439645c8da7f84f0a72abb3235ee879e89c 100644 --- a/src/main/java/net/minecraft/world/level/block/SpongeBlock.java +++ b/src/main/java/net/minecraft/world/level/block/SpongeBlock.java @@ -80,7 +80,7 @@ public class SpongeBlock extends Block { diff --git a/patches/server/0194-Toggle-for-Wither-s-spawn-sound.patch b/patches/server/0192-Toggle-for-Wither-s-spawn-sound.patch similarity index 93% rename from patches/server/0194-Toggle-for-Wither-s-spawn-sound.patch rename to patches/server/0192-Toggle-for-Wither-s-spawn-sound.patch index f5807cb10..892d480f4 100644 --- a/patches/server/0194-Toggle-for-Wither-s-spawn-sound.patch +++ b/patches/server/0192-Toggle-for-Wither-s-spawn-sound.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Toggle for Wither's spawn sound diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java -index cf1450d891d096e073360e9a4c930510b5fd0535..a7e9b536d6c1eb5c811c15b7033f513543a4b519 100644 +index 5f40d6d5b002f1f098245c3aa1174c85759191ce..9e37864a630151aee431aa4031ecc4033de1766f 100644 --- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java +++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java -@@ -432,7 +432,7 @@ public class WitherBoss extends Monster implements RangedAttackMob { +@@ -425,7 +425,7 @@ public class WitherBoss extends Monster implements RangedAttackMob { } // CraftBukkit end diff --git a/patches/server/0195-Cactus-breaks-from-solid-neighbors-config.patch b/patches/server/0193-Cactus-breaks-from-solid-neighbors-config.patch similarity index 100% rename from patches/server/0195-Cactus-breaks-from-solid-neighbors-config.patch rename to patches/server/0193-Cactus-breaks-from-solid-neighbors-config.patch diff --git a/patches/server/0196-Config-to-remove-curse-of-binding-with-weakness.patch b/patches/server/0194-Config-to-remove-curse-of-binding-with-weakness.patch similarity index 96% rename from patches/server/0196-Config-to-remove-curse-of-binding-with-weakness.patch rename to patches/server/0194-Config-to-remove-curse-of-binding-with-weakness.patch index f80ba5e24..14da388ac 100644 --- a/patches/server/0196-Config-to-remove-curse-of-binding-with-weakness.patch +++ b/patches/server/0194-Config-to-remove-curse-of-binding-with-weakness.patch @@ -18,7 +18,7 @@ index db7caaa2e77b9b98adac8add3040131c673c036b..262d9b2507d37edf0ed9c0821059e518 } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 72d2f15839d04b588e8f43d6a1f06680e7b3d9ee..bb8f71030a2da27cc66820a032ffacf667c0d42b 100644 +index 84c01175dd4d65b1cb8b185f03d93a4cea0e0656..8f90dbc4395381f712befbbf09b6ae94887843e7 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -399,6 +399,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0197-Conduit-behavior-configuration.patch b/patches/server/0195-Conduit-behavior-configuration.patch similarity index 100% rename from patches/server/0197-Conduit-behavior-configuration.patch rename to patches/server/0195-Conduit-behavior-configuration.patch diff --git a/patches/server/0198-Cauldron-fill-chances.patch b/patches/server/0196-Cauldron-fill-chances.patch similarity index 100% rename from patches/server/0198-Cauldron-fill-chances.patch rename to patches/server/0196-Cauldron-fill-chances.patch diff --git a/patches/server/0199-Config-to-allow-mobs-to-pathfind-over-rails.patch b/patches/server/0197-Config-to-allow-mobs-to-pathfind-over-rails.patch similarity index 100% rename from patches/server/0199-Config-to-allow-mobs-to-pathfind-over-rails.patch rename to patches/server/0197-Config-to-allow-mobs-to-pathfind-over-rails.patch diff --git a/patches/server/0200-Shulker-change-color-with-dye.patch b/patches/server/0198-Shulker-change-color-with-dye.patch similarity index 100% rename from patches/server/0200-Shulker-change-color-with-dye.patch rename to patches/server/0198-Shulker-change-color-with-dye.patch diff --git a/patches/server/0201-Extended-OfflinePlayer-API.patch b/patches/server/0199-Extended-OfflinePlayer-API.patch similarity index 99% rename from patches/server/0201-Extended-OfflinePlayer-API.patch rename to patches/server/0199-Extended-OfflinePlayer-API.patch index 4f5f184e5..721d5726b 100644 --- a/patches/server/0201-Extended-OfflinePlayer-API.patch +++ b/patches/server/0199-Extended-OfflinePlayer-API.patch @@ -243,7 +243,7 @@ index 94ca0407303c4493ab4928b12ec6ecc75aaca549..a138e1b6b66d99f2035de054137a607a + // Purpur end - OfflinePlayer API } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 57515361aab6dbf0ec7d4029b34a48b36c4f498b..6590bb419f7480dbe40bb3df5218da9aeebb3f03 100644 +index ea8b1f01b2dd626c422649488c1e605a8054dbf2..da20ebe8858b4ab5bf8ac62aeac1942320bfa91c 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -2769,6 +2769,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0202-Added-the-ability-to-add-combustible-items.patch b/patches/server/0200-Added-the-ability-to-add-combustible-items.patch similarity index 100% rename from patches/server/0202-Added-the-ability-to-add-combustible-items.patch rename to patches/server/0200-Added-the-ability-to-add-combustible-items.patch diff --git a/patches/server/0203-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch b/patches/server/0201-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch similarity index 90% rename from patches/server/0203-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch rename to patches/server/0201-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch index f129de9a3..738a82630 100644 --- a/patches/server/0203-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch +++ b/patches/server/0201-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Option for if rain and thunder should stop on sleep diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 04b2d2d917465898f919650d2346608390664bd2..9ceaf051ebc9d58b584b93832cc21ad43ac1a558 100644 +index 361885b28305e1c3e314b3b9f9807cf3c5ab843a..0487d55861302e1bf84225901d873b02c2f11d6e 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -1296,6 +1296,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe +@@ -1282,6 +1282,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe @VisibleForTesting public void resetWeatherCycle() { // CraftBukkit start @@ -16,7 +16,7 @@ index 04b2d2d917465898f919650d2346608390664bd2..9ceaf051ebc9d58b584b93832cc21ad4 this.serverLevelData.setRaining(false, org.bukkit.event.weather.WeatherChangeEvent.Cause.SLEEP); // Paper - Add cause to Weather/ThunderChangeEvents // If we stop due to everyone sleeping we should reset the weather duration to some other random value. // Not that everyone ever manages to get the whole server to sleep at the same time.... -@@ -1303,6 +1304,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe +@@ -1289,6 +1290,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe this.serverLevelData.setRainTime(0); } // CraftBukkit end @@ -25,7 +25,7 @@ index 04b2d2d917465898f919650d2346608390664bd2..9ceaf051ebc9d58b584b93832cc21ad4 // CraftBukkit start // If we stop due to everyone sleeping we should reset the weather duration to some other random value. diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index cf0ca3f712e825898cda9ca0a8d6699195d6f26c..16d2dbafb996932dd99edbe6eea37c7036f4b77e 100644 +index a47ddcb40340c19ce99a8befe8034240e0457acb..e5934c276e286820944488e2d629b01d58dbf200 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -140,6 +140,8 @@ public class PurpurWorldConfig { diff --git a/patches/server/0204-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch b/patches/server/0202-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch similarity index 100% rename from patches/server/0204-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch rename to patches/server/0202-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch diff --git a/patches/server/0205-Shift-right-click-to-use-exp-for-mending.patch b/patches/server/0203-Shift-right-click-to-use-exp-for-mending.patch similarity index 94% rename from patches/server/0205-Shift-right-click-to-use-exp-for-mending.patch rename to patches/server/0203-Shift-right-click-to-use-exp-for-mending.patch index 9988db300..15f0e872f 100644 --- a/patches/server/0205-Shift-right-click-to-use-exp-for-mending.patch +++ b/patches/server/0203-Shift-right-click-to-use-exp-for-mending.patch @@ -36,10 +36,10 @@ index 7315e604a2f9cb068eb5bbca744e44eeabac09c9..88eb3774f688bcff383efa7f113bd0b1 + // Purpur end } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index c8cf05ac72a7b30e8d2239c4e07c9cc52d5990e2..be98cb1fa2ad79d41ebb6b6052b877253492174a 100644 +index ea6713bd5a2807cf00d664296c13e076b2fca3a0..47952e504cc4d36b1d875651bb9bbd0a90606ae2 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -2156,6 +2156,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl +@@ -2155,6 +2155,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl boolean cancelled; if (movingobjectposition == null || movingobjectposition.getType() != HitResult.Type.BLOCK) { @@ -48,7 +48,7 @@ index c8cf05ac72a7b30e8d2239c4e07c9cc52d5990e2..be98cb1fa2ad79d41ebb6b6052b87725 cancelled = event.useItemInHand() == Event.Result.DENY; } else { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 8fc61bd5ac93ea63d7ed01c34ef0dc971bb73290..fcc093edad7e4e79cd51dbbf1be13a3d13035fe1 100644 +index c44be697e59049adb50967b6d91016035fb69956..382ce37738d278400b609af7fb9189c93b907eeb 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -406,6 +406,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0206-Dolphins-naturally-aggressive-to-players-chance.patch b/patches/server/0204-Dolphins-naturally-aggressive-to-players-chance.patch similarity index 100% rename from patches/server/0206-Dolphins-naturally-aggressive-to-players-chance.patch rename to patches/server/0204-Dolphins-naturally-aggressive-to-players-chance.patch diff --git a/patches/server/0207-Cows-naturally-aggressive-to-players-chance.patch b/patches/server/0205-Cows-naturally-aggressive-to-players-chance.patch similarity index 100% rename from patches/server/0207-Cows-naturally-aggressive-to-players-chance.patch rename to patches/server/0205-Cows-naturally-aggressive-to-players-chance.patch diff --git a/patches/server/0208-Option-for-beds-to-explode-on-villager-sleep.patch b/patches/server/0206-Option-for-beds-to-explode-on-villager-sleep.patch similarity index 94% rename from patches/server/0208-Option-for-beds-to-explode-on-villager-sleep.patch rename to patches/server/0206-Option-for-beds-to-explode-on-villager-sleep.patch index 575b30d90..190da8867 100644 --- a/patches/server/0208-Option-for-beds-to-explode-on-villager-sleep.patch +++ b/patches/server/0206-Option-for-beds-to-explode-on-villager-sleep.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Option for beds to explode on villager sleep 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 fcc5a794aa6f43f3b9e8bdb5f2c0601bf7004698..3788709dbccd76103ba81d478f7402136637cd95 100644 +index 0bca1eeaa0f35d702dad41758c72bb3c9ab35220..c912268081beda34c472cff13e41c9dfd51902f2 100644 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java -@@ -1083,6 +1083,12 @@ public class Villager extends AbstractVillager implements ReputationEventHandler +@@ -1080,6 +1080,12 @@ public class Villager extends AbstractVillager implements ReputationEventHandler @Override public void startSleeping(BlockPos pos) { diff --git a/patches/server/0209-Halloween-options-and-optimizations.patch b/patches/server/0207-Halloween-options-and-optimizations.patch similarity index 91% rename from patches/server/0209-Halloween-options-and-optimizations.patch rename to patches/server/0207-Halloween-options-and-optimizations.patch index 512af69a7..556e882da 100644 --- a/patches/server/0209-Halloween-options-and-optimizations.patch +++ b/patches/server/0207-Halloween-options-and-optimizations.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Halloween options and optimizations diff --git a/src/main/java/net/minecraft/world/entity/ambient/Bat.java b/src/main/java/net/minecraft/world/entity/ambient/Bat.java -index 2a8aa8d3887c700f465d296c35892b2c405d5f51..89b7ed0ea739775b8baa18b7ba21db222ff85dd4 100644 +index 79175bd42f37f10fae812e101dd5b09b209ebe30..7b647f41bd5ca4fa62795ad2fbcb5b73a3405979 100644 --- a/src/main/java/net/minecraft/world/entity/ambient/Bat.java +++ b/src/main/java/net/minecraft/world/entity/ambient/Bat.java @@ -307,7 +307,7 @@ public class Bat extends AmbientCreature { @@ -17,14 +17,18 @@ index 2a8aa8d3887c700f465d296c35892b2c405d5f51..89b7ed0ea739775b8baa18b7ba21db22 b0 = 7; } else if (random.nextBoolean()) { return false; -@@ -321,6 +321,7 @@ public class Bat extends AmbientCreature { - private static boolean isSpookySeason = false; - private static final int ONE_HOUR = 20 * 60 * 60; - private static int lastSpookyCheck = -ONE_HOUR; +@@ -317,6 +317,11 @@ public class Bat extends AmbientCreature { + } + } + ++ // Pufferfish start - only check for spooky season once an hour ++ //private static boolean isSpookySeason = false; ++ //private static final int ONE_HOUR = 20 * 60 * 60; ++ //private static int lastSpookyCheck = -ONE_HOUR; + public static boolean isHalloweenSeason(Level level) { return level.purpurConfig.forceHalloweenSeason || isHalloween(); } // Purpur private static boolean isHalloween() { - if (net.minecraft.server.MinecraftServer.currentTick - lastSpookyCheck > ONE_HOUR) { LocalDate localdate = LocalDate.now(); + int i = localdate.get(ChronoField.DAY_OF_MONTH); diff --git a/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java b/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java index 27bdd3c4e0dc3fbb906689e2390c945bf3d40eea..20252b22c88d4cbfe7700052a8c56c9e0d703752 100644 --- a/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java diff --git a/patches/server/0210-Config-for-grindstones.patch b/patches/server/0208-Config-for-grindstones.patch similarity index 98% rename from patches/server/0210-Config-for-grindstones.patch rename to patches/server/0208-Config-for-grindstones.patch index ce708ec80..c697acf1d 100644 --- a/patches/server/0210-Config-for-grindstones.patch +++ b/patches/server/0208-Config-for-grindstones.patch @@ -123,7 +123,7 @@ index 5687f492fc76f699e2a388790ca5380d9b8c8d0a..cc229f3e1e9527cbedf929e326731943 } diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -index e8dc97694f59cfce67e2fe061868a9f080ef3004..a1e1aad7a1b845e2efd381da0221559443808cf7 100644 +index 639b534982547beede11654edc2ed719c66709b6..82903b6ce4cf30b2d95001455ee4e3a454b3ddd5 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -312,6 +312,9 @@ public class PurpurConfig { diff --git a/patches/server/0211-UPnP-Port-Forwarding.patch b/patches/server/0209-UPnP-Port-Forwarding.patch similarity index 93% rename from patches/server/0211-UPnP-Port-Forwarding.patch rename to patches/server/0209-UPnP-Port-Forwarding.patch index 7db8b6a22..e26abf20e 100644 --- a/patches/server/0211-UPnP-Port-Forwarding.patch +++ b/patches/server/0209-UPnP-Port-Forwarding.patch @@ -5,7 +5,7 @@ Subject: [PATCH] UPnP Port Forwarding diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index f83e41b3550fba692378bf7a6f8a12bba4249f0e..260df0edd90d6b27f9525683a84887a1cf94542a 100644 +index 9219b31a7273b08e7acd1a953c260a5520333922..80a8bd2dc32763f8ee2062c2d1b36188f2532523 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -331,6 +331,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop, B @@ -447,7 +447,7 @@ index 7177459f086de5f8e4ff1151e416e1193881756c..4bff73b108ba9d76409baeed7c266828 public float getWalkTargetValue(BlockPos pos, LevelReader world) { return 0.0F; diff --git a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java -index 904c64cbe2c9ae6c52784ffba449884304466f5a..e2223f0f5e8704841e78bea6b3db40052fdb2bcf 100644 +index 4a8ac3d75a3c75eea8e361d7eb729f27ea807347..214a97aa88c569f55619512e712b7bfe32d26b30 100644 --- a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java +++ b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java @@ -122,6 +122,12 @@ public class Goat extends Animal { @@ -583,7 +583,7 @@ index d7f96f19c3a4eec8497ff1b8bffdf9bc5bacfbb7..339829bfc7ec9298ae6c31562ec9899d return createBaseHorseAttributes().add(Attributes.MAX_HEALTH, 15.0).add(Attributes.MOVEMENT_SPEED, 0.2F); } diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java -index a7e9b536d6c1eb5c811c15b7033f513543a4b519..505c84731b4731588b4568d82a852a17121e5ec8 100644 +index 9e37864a630151aee431aa4031ecc4033de1766f..a732226a889d7eafd10f4a0d7129e60542fe90e7 100644 --- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java +++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java @@ -137,6 +137,12 @@ public class WitherBoss extends Monster implements RangedAttackMob { @@ -685,7 +685,7 @@ index d69716edb777155d0b52db25af64107e4657e03c..16edee73b099b66f12c45062df310812 return Guardian.createAttributes().add(Attributes.MOVEMENT_SPEED, 0.30000001192092896D).add(Attributes.ATTACK_DAMAGE, 8.0D).add(Attributes.MAX_HEALTH, 80.0D); } diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java -index cb28c794d66ab90f6855741635a1b7e4725663da..6ab8abd52836a2a06496652a134dafc21a456a9e 100644 +index 327686f0c47894259532a15e98d69d332a6d483a..6edc95de8fd03538c36dc1a21e4539e81647642f 100644 --- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java +++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java @@ -118,6 +118,12 @@ public class EnderMan extends Monster implements NeutralMob { @@ -1144,7 +1144,7 @@ index 3070f4484276f8ea6b95134abda6409e58f1161a..c0e611f3222ffacfbd0683c8c65b778f public void setPersistentAngerTarget(@Nullable UUID angryAt) { this.persistentAngerTarget = angryAt; diff --git a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java -index 6d890e09a49d2ff02efcab5abdf803df87c01362..e140d068b08d94c55945b30eab11adbface6fa09 100644 +index 534626336e45da2c67cb023f4e5feea59daa8b5d..5e8da964681cb63d7733af8b5173715fd7e54a63 100644 --- a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java +++ b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java @@ -112,6 +112,12 @@ public class Hoglin extends Animal implements Enemy, HoglinBase { @@ -1161,7 +1161,7 @@ index 6d890e09a49d2ff02efcab5abdf803df87c01362..e140d068b08d94c55945b30eab11adbf public boolean canBeLeashed() { return true; diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java -index 72ff00f2a97dc05d02f3be920c98999028fbcb75..e6cb1f067f9920252e0bba9a493365c23b12cea7 100644 +index f0b0642571a242f9c22febbafba587f1ca6caaaa..468be0368d0f485eaa2a5c321f45986bf5156b4b 100644 --- a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java +++ b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java @@ -129,6 +129,12 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento @@ -1195,10 +1195,10 @@ index 0e77e9e4a4fd14b5cecc377a03f0d6b2c9df039f..24e198440d4841daac664dc6c5a8a3dc return Monster.createMonsterAttributes() .add(Attributes.MAX_HEALTH, 50.0) 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 3788709dbccd76103ba81d478f7402136637cd95..c82e1fa06658c5543b893b1e174b221ab8f58483 100644 +index c912268081beda34c472cff13e41c9dfd51902f2..fcaf3db893d14b8359bddc1cc69da82e533ebc87 100644 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java -@@ -201,6 +201,12 @@ public class Villager extends AbstractVillager implements ReputationEventHandler +@@ -199,6 +199,12 @@ public class Villager extends AbstractVillager implements ReputationEventHandler return this.level().purpurConfig.villagerTakeDamageFromWater; } // Purpur end - Toggle for water sensitive mob damage diff --git a/patches/server/0219-Grindstone-API.patch b/patches/server/0217-Grindstone-API.patch similarity index 100% rename from patches/server/0219-Grindstone-API.patch rename to patches/server/0217-Grindstone-API.patch diff --git a/patches/server/0220-Ability-for-hoe-to-replant-crops-and-nether-warts.patch b/patches/server/0218-Ability-for-hoe-to-replant-crops-and-nether-warts.patch similarity index 98% rename from patches/server/0220-Ability-for-hoe-to-replant-crops-and-nether-warts.patch rename to patches/server/0218-Ability-for-hoe-to-replant-crops-and-nether-warts.patch index 0dbccf0dd..d4e0e6585 100644 --- a/patches/server/0220-Ability-for-hoe-to-replant-crops-and-nether-warts.patch +++ b/patches/server/0218-Ability-for-hoe-to-replant-crops-and-nether-warts.patch @@ -34,7 +34,7 @@ index eb324fda54ada3ed7941713a784ed2d686ec8c4b..09cc76f3fee4a767c9ec3fa592f2c3c6 + // Purpur end } diff --git a/src/main/java/net/minecraft/world/level/block/CropBlock.java b/src/main/java/net/minecraft/world/level/block/CropBlock.java -index c1707b502911d76d0c3a706e44bfdc3a12eb8f97..7f6f7a114e9930e7655c9695a5737739503999de 100644 +index 00a06146e119a47eeaf66d240b8dd84e38498676..34f338a246824dbabc7bc386b74cb62c78a8f1b6 100644 --- a/src/main/java/net/minecraft/world/level/block/CropBlock.java +++ b/src/main/java/net/minecraft/world/level/block/CropBlock.java @@ -216,4 +216,15 @@ public class CropBlock extends BushBlock implements BonemealableBlock { diff --git a/patches/server/0221-Turtle-eggs-random-tick-crack-chance.patch b/patches/server/0219-Turtle-eggs-random-tick-crack-chance.patch similarity index 95% rename from patches/server/0221-Turtle-eggs-random-tick-crack-chance.patch rename to patches/server/0219-Turtle-eggs-random-tick-crack-chance.patch index 6577395fd..e26d4a114 100644 --- a/patches/server/0221-Turtle-eggs-random-tick-crack-chance.patch +++ b/patches/server/0219-Turtle-eggs-random-tick-crack-chance.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Turtle eggs random tick crack chance diff --git a/src/main/java/net/minecraft/world/level/block/TurtleEggBlock.java b/src/main/java/net/minecraft/world/level/block/TurtleEggBlock.java -index a265c5bf1a4d6f3c84cad20f9b3c285dcebd0372..72c89f14977844e1460e9a914f39e896c9d498fd 100644 +index 30af2a98a52208c3a36dfaad474582806f86aede..6f02cec4384382569ad7d7c830dd6349aeac5293 100644 --- a/src/main/java/net/minecraft/world/level/block/TurtleEggBlock.java +++ b/src/main/java/net/minecraft/world/level/block/TurtleEggBlock.java @@ -171,7 +171,7 @@ public class TurtleEggBlock extends Block { diff --git a/patches/server/0222-Mob-head-visibility-percent.patch b/patches/server/0220-Mob-head-visibility-percent.patch similarity index 97% rename from patches/server/0222-Mob-head-visibility-percent.patch rename to patches/server/0220-Mob-head-visibility-percent.patch index 2af47a948..525033eaa 100644 --- a/patches/server/0222-Mob-head-visibility-percent.patch +++ b/patches/server/0220-Mob-head-visibility-percent.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Mob head visibility percent diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 0af3e463971697626f847cb96f8a431857c1261e..8c2c14769ae32c9a92bc043f9e753abf7e32e1c3 100644 +index c7e2330e7f30081dbf5d79f08c8adb1d7d84fa03..480617d9e59bfbb21cccf2555616ad3985b7f7be 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -1082,9 +1082,20 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -1069,9 +1069,20 @@ public abstract class LivingEntity extends Entity implements Attackable { ItemStack itemstack = this.getItemBySlot(EquipmentSlot.HEAD); EntityType entitytypes = entity.getType(); diff --git a/patches/server/0223-Configurable-valid-characters-for-usernames.patch b/patches/server/0221-Configurable-valid-characters-for-usernames.patch similarity index 94% rename from patches/server/0223-Configurable-valid-characters-for-usernames.patch rename to patches/server/0221-Configurable-valid-characters-for-usernames.patch index 4aef457d7..214ad260c 100644 --- a/patches/server/0223-Configurable-valid-characters-for-usernames.patch +++ b/patches/server/0221-Configurable-valid-characters-for-usernames.patch @@ -17,7 +17,7 @@ index 6c33002dc8bbb3759c3156302ab7d1f26ce5e8ee..c89fc375aff548a2b03eaf4da3b6a075 return false; } diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -index 4aac9004892030772eb4791209d3de71e9e480cc..b3eba9f3d15ff94dd9044e135f5b304916e17c72 100644 +index 80647bd8a776fea7cfedf3a991e9da73ce6c5ac1..00f02ad5f248120ce031048e02fe1bacda5567b7 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -455,4 +455,11 @@ public class PurpurConfig { diff --git a/patches/server/0224-Stop-bees-from-dying-after-stinging.patch b/patches/server/0222-Stop-bees-from-dying-after-stinging.patch similarity index 95% rename from patches/server/0224-Stop-bees-from-dying-after-stinging.patch rename to patches/server/0222-Stop-bees-from-dying-after-stinging.patch index b60e170c7..89b001233 100644 --- a/patches/server/0224-Stop-bees-from-dying-after-stinging.patch +++ b/patches/server/0222-Stop-bees-from-dying-after-stinging.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Stop bees from dying after stinging diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java -index e2c6691ecca79df5828e6136568933b41ba5e1fa..c533e8c98411ea857df56a98581e903a871b98e2 100644 +index c73cc8ffe5f67826971872de78adce72d202325a..19d1facb4173c11bb3a1d519603e4ec6906cdaa3 100644 --- a/src/main/java/net/minecraft/world/entity/animal/Bee.java +++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java @@ -465,6 +465,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal { diff --git a/patches/server/0225-Give-bee-counts-in-beehives-to-Purpur-clients.patch b/patches/server/0223-Give-bee-counts-in-beehives-to-Purpur-clients.patch similarity index 95% rename from patches/server/0225-Give-bee-counts-in-beehives-to-Purpur-clients.patch rename to patches/server/0223-Give-bee-counts-in-beehives-to-Purpur-clients.patch index d00fb65c4..90bebd470 100644 --- a/patches/server/0225-Give-bee-counts-in-beehives-to-Purpur-clients.patch +++ b/patches/server/0223-Give-bee-counts-in-beehives-to-Purpur-clients.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Give bee counts in beehives to Purpur clients diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 260df0edd90d6b27f9525683a84887a1cf94542a..827e8b9b0fb0fa64f56de54a562f65e200c7b50f 100644 +index 80a8bd2dc32763f8ee2062c2d1b36188f2532523..1dc4476ca1fc41030001d4d23ffff1b810a056cd 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1171,6 +1171,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop entityType, Level world) { + this(entityType, world, VillagerType.PLAINS); +@@ -205,6 +207,49 @@ public class Villager extends AbstractVillager implements ReputationEventHandler return this.level().purpurConfig.villagerAlwaysDropExp; } // Purpur end - Mobs always drop experience @@ -67,7 +67,7 @@ index 0a554198b306c05a1c9566f9fda76c48021c7a54..576f6f05b35443aa89437b573330f111 @Override public Brain getBrain() { return (Brain) super.getBrain(); // CraftBukkit - decompile error -@@ -302,11 +347,19 @@ public class Villager extends AbstractVillager implements ReputationEventHandler +@@ -299,11 +344,19 @@ public class Villager extends AbstractVillager implements ReputationEventHandler // Paper start - EAR 2 this.customServerAiStep(world, false); } @@ -86,7 +86,7 @@ index 0a554198b306c05a1c9566f9fda76c48021c7a54..576f6f05b35443aa89437b573330f111 + } + // Purpur end // Pufferfish start - if (!inactive && (getRider() == null || !this.isControllable()) && this.behaviorTick++ % this.activatedPriority == 0) { + if (!inactive && (getRider() == null || !this.isControllable()) /*&& this.behaviorTick++ % this.activatedPriority == 0*/) { this.getBrain().tick(world, this); // Paper // Purpur - Ridables diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java index 8e895d6f84f7d84b219f2424909dd42e5f08dec4..e5597563a6ed620ab9c9e81be4bad56fd5308305 100644 diff --git a/patches/server/0233-Option-for-villager-display-trade-item.patch b/patches/server/0231-Option-for-villager-display-trade-item.patch similarity index 100% rename from patches/server/0233-Option-for-villager-display-trade-item.patch rename to patches/server/0231-Option-for-villager-display-trade-item.patch diff --git a/patches/server/0234-MC-238526-Fix-spawner-not-spawning-water-animals-cor.patch b/patches/server/0232-MC-238526-Fix-spawner-not-spawning-water-animals-cor.patch similarity index 100% rename from patches/server/0234-MC-238526-Fix-spawner-not-spawning-water-animals-cor.patch rename to patches/server/0232-MC-238526-Fix-spawner-not-spawning-water-animals-cor.patch diff --git a/patches/server/0235-Config-for-mob-last-hurt-by-player-time.patch b/patches/server/0233-Config-for-mob-last-hurt-by-player-time.patch similarity index 93% rename from patches/server/0235-Config-for-mob-last-hurt-by-player-time.patch rename to patches/server/0233-Config-for-mob-last-hurt-by-player-time.patch index b30d8ae84..28635779e 100644 --- a/patches/server/0235-Config-for-mob-last-hurt-by-player-time.patch +++ b/patches/server/0233-Config-for-mob-last-hurt-by-player-time.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Config for mob last hurt by player time diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 8c2c14769ae32c9a92bc043f9e753abf7e32e1c3..239046ab467f499107d1e30ca183d79661a380f0 100644 +index 480617d9e59bfbb21cccf2555616ad3985b7f7be..b7607d917899823b0b95167a9dced495b7ae110f 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -1708,13 +1708,13 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -1695,13 +1695,13 @@ public abstract class LivingEntity extends Entity implements Attackable { Entity entity = damageSource.getEntity(); if (entity instanceof net.minecraft.world.entity.player.Player entityhuman) { @@ -38,7 +38,7 @@ index 7ccc40555964b906be6987532de1f319e38741ce..72498e233ece886941cca268e729336d // Paper end diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index f4584785ce8b16d3acc27c848eb79cc55bf08a18..74373b7875906bd79595ca02b86add222d9645e0 100644 +index 6572bbaf5d5548b1d2d6c224a9dcbbfe31f34339..13791cc140fa7643991f5c958f48bf4693b20895 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -144,6 +144,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0236-Anvil-repair-damage-options.patch b/patches/server/0234-Anvil-repair-damage-options.patch similarity index 100% rename from patches/server/0236-Anvil-repair-damage-options.patch rename to patches/server/0234-Anvil-repair-damage-options.patch diff --git a/patches/server/0237-Option-to-disable-turtle-egg-trampling-with-feather-.patch b/patches/server/0235-Option-to-disable-turtle-egg-trampling-with-feather-.patch similarity index 100% rename from patches/server/0237-Option-to-disable-turtle-egg-trampling-with-feather-.patch rename to patches/server/0235-Option-to-disable-turtle-egg-trampling-with-feather-.patch diff --git a/patches/server/0238-Add-toggle-for-enchant-level-clamping.patch b/patches/server/0236-Add-toggle-for-enchant-level-clamping.patch similarity index 98% rename from patches/server/0238-Add-toggle-for-enchant-level-clamping.patch rename to patches/server/0236-Add-toggle-for-enchant-level-clamping.patch index 792b82d66..99b336bea 100644 --- a/patches/server/0238-Add-toggle-for-enchant-level-clamping.patch +++ b/patches/server/0236-Add-toggle-for-enchant-level-clamping.patch @@ -59,7 +59,7 @@ index cfc6a657cae92c68868a76c1b7b1febe2a16e9f4..a12c08da793139e39dc11c213c94796b } diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -index 1763db5af790f590e047ddccd8ecc3220fb361ed..2090ecfebe8bc164239d198c1c50b134c7bc60c5 100644 +index 222d1850a9c0c6907dc9de534cff64c122a0bb89..6cd88ca590658adb8f79296fc74af3536e2e1be3 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -399,6 +399,7 @@ public class PurpurConfig { diff --git a/patches/server/0239-Skip-junit-tests-for-purpur-commands.patch b/patches/server/0237-Skip-junit-tests-for-purpur-commands.patch similarity index 100% rename from patches/server/0239-Skip-junit-tests-for-purpur-commands.patch rename to patches/server/0237-Skip-junit-tests-for-purpur-commands.patch diff --git a/patches/server/0240-Implement-configurable-search-radius-for-villagers-t.patch b/patches/server/0238-Implement-configurable-search-radius-for-villagers-t.patch similarity index 94% rename from patches/server/0240-Implement-configurable-search-radius-for-villagers-t.patch rename to patches/server/0238-Implement-configurable-search-radius-for-villagers-t.patch index e46429438..32df779fd 100644 --- a/patches/server/0240-Implement-configurable-search-radius-for-villagers-t.patch +++ b/patches/server/0238-Implement-configurable-search-radius-for-villagers-t.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Implement configurable search radius for villagers to spawn 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 576f6f05b35443aa89437b573330f1118a89f3b4..6f691a7b7e7e335cc564577854ea404f9f5e81d7 100644 +index 4170bd886f68e3c21df6f9680ad6f6aa26d74c01..e7ac8d4c6e839c19776b9c99bf6658104607a579 100644 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java -@@ -1078,6 +1078,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler +@@ -1075,6 +1075,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler } public void spawnGolemIfNeeded(ServerLevel world, long time, int requiredCount) { diff --git a/patches/server/0241-Stonecutter-damage.patch b/patches/server/0239-Stonecutter-damage.patch similarity index 100% rename from patches/server/0241-Stonecutter-damage.patch rename to patches/server/0239-Stonecutter-damage.patch diff --git a/patches/server/0242-Configurable-damage-settings-for-magma-blocks.patch b/patches/server/0240-Configurable-damage-settings-for-magma-blocks.patch similarity index 100% rename from patches/server/0242-Configurable-damage-settings-for-magma-blocks.patch rename to patches/server/0240-Configurable-damage-settings-for-magma-blocks.patch diff --git a/patches/server/0243-Add-config-for-snow-on-blue-ice.patch b/patches/server/0241-Add-config-for-snow-on-blue-ice.patch similarity index 100% rename from patches/server/0243-Add-config-for-snow-on-blue-ice.patch rename to patches/server/0241-Add-config-for-snow-on-blue-ice.patch diff --git a/patches/server/0244-Skeletons-eat-wither-roses.patch b/patches/server/0242-Skeletons-eat-wither-roses.patch similarity index 100% rename from patches/server/0244-Skeletons-eat-wither-roses.patch rename to patches/server/0242-Skeletons-eat-wither-roses.patch diff --git a/patches/server/0245-Enchantment-Table-Persists-Lapis.patch b/patches/server/0243-Enchantment-Table-Persists-Lapis.patch similarity index 100% rename from patches/server/0245-Enchantment-Table-Persists-Lapis.patch rename to patches/server/0243-Enchantment-Table-Persists-Lapis.patch diff --git a/patches/server/0246-Option-to-disable-kick-for-out-of-order-chat.patch b/patches/server/0244-Option-to-disable-kick-for-out-of-order-chat.patch similarity index 96% rename from patches/server/0246-Option-to-disable-kick-for-out-of-order-chat.patch rename to patches/server/0244-Option-to-disable-kick-for-out-of-order-chat.patch index 9e92ecb28..232030096 100644 --- a/patches/server/0246-Option-to-disable-kick-for-out-of-order-chat.patch +++ b/patches/server/0244-Option-to-disable-kick-for-out-of-order-chat.patch @@ -18,7 +18,7 @@ index 300929a406905f5ff1ede664d5b99fb0938d4d2e..a4e9ac0e07f08e0b6aa682e8c1587d9c throw new SignedMessageChain.DecodeException(SignedMessageChain.DecodeException.OUT_OF_ORDER_CHAT, org.bukkit.event.player.PlayerKickEvent.Cause.OUT_OF_ORDER_CHAT); // Paper - kick event causes } else { diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -index dba6a69891f50ba057187a8138ff227ad7501eaa..32e44e47cc6b5e6ed6e13f41dd8b4ba29459d7f0 100644 +index 4ad201f8457dca2305224cc74a1f55b90dd60140..4218aa563ba435a67c8e7af1fa9dc0c0d8d6b377 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -462,9 +462,11 @@ public class PurpurConfig { diff --git a/patches/server/0247-Config-for-sculk-shrieker-can_summon-state.patch b/patches/server/0245-Config-for-sculk-shrieker-can_summon-state.patch similarity index 100% rename from patches/server/0247-Config-for-sculk-shrieker-can_summon-state.patch rename to patches/server/0245-Config-for-sculk-shrieker-can_summon-state.patch diff --git a/patches/server/0248-Config-to-not-let-coral-die.patch b/patches/server/0246-Config-to-not-let-coral-die.patch similarity index 100% rename from patches/server/0248-Config-to-not-let-coral-die.patch rename to patches/server/0246-Config-to-not-let-coral-die.patch diff --git a/patches/server/0249-Add-local-difficulty-api.patch b/patches/server/0247-Add-local-difficulty-api.patch similarity index 100% rename from patches/server/0249-Add-local-difficulty-api.patch rename to patches/server/0247-Add-local-difficulty-api.patch diff --git a/patches/server/0250-Add-toggle-for-RNG-manipulation.patch b/patches/server/0248-Add-toggle-for-RNG-manipulation.patch similarity index 89% rename from patches/server/0250-Add-toggle-for-RNG-manipulation.patch rename to patches/server/0248-Add-toggle-for-RNG-manipulation.patch index 595ee9b9c..659c22c6f 100644 --- a/patches/server/0250-Add-toggle-for-RNG-manipulation.patch +++ b/patches/server/0248-Add-toggle-for-RNG-manipulation.patch @@ -7,10 +7,10 @@ Paper patches RNG maniplulation by using a shared (and locked) random source. This comes with a performance gain, but technical players may prefer the ability to manipulate RNG. diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 433dbe3c9350cd55ff22d490e077bf1a31ae83be..7435ff1996e0a6db2f98f1218bf7d2b73a3e2b1d 100644 +index 25a6f228bad7deca7e7301868039d27bf65505c8..35cd273eb885558003a728eedc63f958e5accf74 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -602,7 +602,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -599,7 +599,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess this.bb = Entity.INITIAL_AABB; this.stuckSpeedMultiplier = Vec3.ZERO; this.nextStep = 1.0F; @@ -20,7 +20,7 @@ index 433dbe3c9350cd55ff22d490e077bf1a31ae83be..7435ff1996e0a6db2f98f1218bf7d2b7 this.fluidHeight = new Object2DoubleArrayMap(2); this.fluidOnEyes = new HashSet(); diff --git a/src/main/java/net/minecraft/world/entity/animal/Squid.java b/src/main/java/net/minecraft/world/entity/animal/Squid.java -index da04ee901ad77637ee2c28a9a96f481affcce808..32d694b61e56431baeeb3feb32f57062bb6c5765 100644 +index a2f51788f88c20f282ea2a20485c56109b90c22b..c7a7d1df79beb527ff94f876ca36a861c37c4947 100644 --- a/src/main/java/net/minecraft/world/entity/animal/Squid.java +++ b/src/main/java/net/minecraft/world/entity/animal/Squid.java @@ -46,7 +46,7 @@ public class Squid extends AgeableWaterCreature { @@ -33,7 +33,7 @@ index da04ee901ad77637ee2c28a9a96f481affcce808..32d694b61e56431baeeb3feb32f57062 } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index e13d1e6d15cdfc58f4655ff288d9393e4c134a51..47b29febec2af1f3a8ef7b9afc6a4982df08eb47 100644 +index d80584a0412b6699c24f5817e8ec26cf9f46d92d..596a4d0a7c6851c31ee2c09cfc11400683336e6d 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -211,9 +211,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0251-Add-more-logger-output-for-invalid-movement-kicks.patch b/patches/server/0249-Add-more-logger-output-for-invalid-movement-kicks.patch similarity index 94% rename from patches/server/0251-Add-more-logger-output-for-invalid-movement-kicks.patch rename to patches/server/0249-Add-more-logger-output-for-invalid-movement-kicks.patch index a10328804..572e33eff 100644 --- a/patches/server/0251-Add-more-logger-output-for-invalid-movement-kicks.patch +++ b/patches/server/0249-Add-more-logger-output-for-invalid-movement-kicks.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add more logger output for invalid movement kicks diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 8d52446ddd452a62fa727469f2e191acba1b7d24..70d314a8d5ff077c337d468482b0f1e130ffdd28 100644 +index 47952e504cc4d36b1d875651bb9bbd0a90606ae2..5b33034f01c05b29cd1a90847aa27b356a02264f 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -756,6 +756,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl @@ -16,7 +16,7 @@ index 8d52446ddd452a62fa727469f2e191acba1b7d24..70d314a8d5ff077c337d468482b0f1e1 this.disconnect((Component) Component.translatable("multiplayer.disconnect.invalid_player_movement"), org.bukkit.event.player.PlayerKickEvent.Cause.INVALID_PLAYER_MOVEMENT); // Paper - kick event cause return; } -@@ -1426,7 +1427,15 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl +@@ -1425,7 +1426,15 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl @Override public void handleMovePlayer(ServerboundMovePlayerPacket packet) { PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel()); diff --git a/patches/server/0252-Add-Bee-API.patch b/patches/server/0250-Add-Bee-API.patch similarity index 100% rename from patches/server/0252-Add-Bee-API.patch rename to patches/server/0250-Add-Bee-API.patch diff --git a/patches/server/0253-Debug-Marker-API.patch b/patches/server/0251-Debug-Marker-API.patch similarity index 100% rename from patches/server/0253-Debug-Marker-API.patch rename to patches/server/0251-Debug-Marker-API.patch diff --git a/patches/server/0254-mob-spawning-option-to-ignore-creative-players.patch b/patches/server/0252-mob-spawning-option-to-ignore-creative-players.patch similarity index 96% rename from patches/server/0254-mob-spawning-option-to-ignore-creative-players.patch rename to patches/server/0252-mob-spawning-option-to-ignore-creative-players.patch index 41bb440a0..0f695e3fc 100644 --- a/patches/server/0254-mob-spawning-option-to-ignore-creative-players.patch +++ b/patches/server/0252-mob-spawning-option-to-ignore-creative-players.patch @@ -18,7 +18,7 @@ index c1b76a1ebc1eea7ab70cf61d8175a31794dd122a..dc15c15951e4ca30b8341d24f813259a if (entityhuman != null) { double d2 = entityhuman.distanceToSqr(d0, (double) i, d1); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index a0c49166a93ee18abc24dd40e95bdf4ece7e90b3..bff614ae120300622b803187bcfdf7e6f88fa7a8 100644 +index 596a4d0a7c6851c31ee2c09cfc11400683336e6d..dee8860d593b126353f9f284de65b5fccbe4f530 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -380,6 +380,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0255-Add-skeleton-bow-accuracy-option.patch b/patches/server/0253-Add-skeleton-bow-accuracy-option.patch similarity index 97% rename from patches/server/0255-Add-skeleton-bow-accuracy-option.patch rename to patches/server/0253-Add-skeleton-bow-accuracy-option.patch index 339c16887..bc48af87d 100644 --- a/patches/server/0255-Add-skeleton-bow-accuracy-option.patch +++ b/patches/server/0253-Add-skeleton-bow-accuracy-option.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add skeleton bow accuracy option diff --git a/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java b/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java -index f90f3e3ad7c941e3222a8119d9b01d571eef4c1b..0235488faee8078186fbb78038789da0846aca29 100644 +index 20252b22c88d4cbfe7700052a8c56c9e0d703752..26b64d83b7466863b7340c3292494091e9fb89c1 100644 --- a/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java +++ b/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java @@ -199,7 +199,7 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo diff --git a/patches/server/0256-Add-death-screen-API.patch b/patches/server/0254-Add-death-screen-API.patch similarity index 100% rename from patches/server/0256-Add-death-screen-API.patch rename to patches/server/0254-Add-death-screen-API.patch diff --git a/patches/server/0257-Implement-ram-and-rambar-commands.patch b/patches/server/0255-Implement-ram-and-rambar-commands.patch similarity index 100% rename from patches/server/0257-Implement-ram-and-rambar-commands.patch rename to patches/server/0255-Implement-ram-and-rambar-commands.patch diff --git a/patches/server/0258-Configurable-block-blast-resistance.patch b/patches/server/0256-Configurable-block-blast-resistance.patch similarity index 100% rename from patches/server/0258-Configurable-block-blast-resistance.patch rename to patches/server/0256-Configurable-block-blast-resistance.patch diff --git a/patches/server/0259-Configurable-block-fall-damage-modifiers.patch b/patches/server/0257-Configurable-block-fall-damage-modifiers.patch similarity index 100% rename from patches/server/0259-Configurable-block-fall-damage-modifiers.patch rename to patches/server/0257-Configurable-block-fall-damage-modifiers.patch diff --git a/patches/server/0260-Language-API.patch b/patches/server/0258-Language-API.patch similarity index 100% rename from patches/server/0260-Language-API.patch rename to patches/server/0258-Language-API.patch diff --git a/patches/server/0261-Milk-Keeps-Beneficial-Effects.patch b/patches/server/0259-Milk-Keeps-Beneficial-Effects.patch similarity index 96% rename from patches/server/0261-Milk-Keeps-Beneficial-Effects.patch rename to patches/server/0259-Milk-Keeps-Beneficial-Effects.patch index 3ba2d7246..c87e8663d 100644 --- a/patches/server/0261-Milk-Keeps-Beneficial-Effects.patch +++ b/patches/server/0259-Milk-Keeps-Beneficial-Effects.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Milk Keeps Beneficial Effects diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 601b74fdf423d66bc9ccee8e522451815a8883e7..e64ff857bf95436033baf38db1e6895f75856f9c 100644 +index b7607d917899823b0b95167a9dced495b7ae110f..4ec31b94803c15b7caad5053dc94b900a8601d07 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -1162,6 +1162,7 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -1149,6 +1149,7 @@ public abstract class LivingEntity extends Entity implements Attackable { while (iterator.hasNext()) { MobEffectInstance effect = iterator.next(); diff --git a/patches/server/0262-MC-121706-Fix-mobs-not-looking-up-and-down-when-stra.patch b/patches/server/0260-MC-121706-Fix-mobs-not-looking-up-and-down-when-stra.patch similarity index 100% rename from patches/server/0262-MC-121706-Fix-mobs-not-looking-up-and-down-when-stra.patch rename to patches/server/0260-MC-121706-Fix-mobs-not-looking-up-and-down-when-stra.patch diff --git a/patches/server/0263-Add-log-suppression-for-LibraryLoader.patch b/patches/server/0261-Add-log-suppression-for-LibraryLoader.patch similarity index 100% rename from patches/server/0263-Add-log-suppression-for-LibraryLoader.patch rename to patches/server/0261-Add-log-suppression-for-LibraryLoader.patch diff --git a/patches/server/0264-Add-an-option-to-fix-MC-3304-projectile-looting.patch b/patches/server/0262-Add-an-option-to-fix-MC-3304-projectile-looting.patch similarity index 100% rename from patches/server/0264-Add-an-option-to-fix-MC-3304-projectile-looting.patch rename to patches/server/0262-Add-an-option-to-fix-MC-3304-projectile-looting.patch diff --git a/patches/server/0265-Add-option-to-allow-creeper-to-encircle-target-when-.patch b/patches/server/0263-Add-option-to-allow-creeper-to-encircle-target-when-.patch similarity index 100% rename from patches/server/0265-Add-option-to-allow-creeper-to-encircle-target-when-.patch rename to patches/server/0263-Add-option-to-allow-creeper-to-encircle-target-when-.patch diff --git a/patches/server/0266-Fire-Immunity-API.patch b/patches/server/0264-Fire-Immunity-API.patch similarity index 84% rename from patches/server/0266-Fire-Immunity-API.patch rename to patches/server/0264-Fire-Immunity-API.patch index 44d9510bf..de0642277 100644 --- a/patches/server/0266-Fire-Immunity-API.patch +++ b/patches/server/0264-Fire-Immunity-API.patch @@ -5,18 +5,18 @@ Subject: [PATCH] Fire Immunity API diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 766301a14033fcc6b9270e556b9c08e019996530..e6d662b9e8d50abd9160aeaea705abc8310eb3b5 100644 +index 35cd273eb885558003a728eedc63f958e5accf74..c12594a49435440a6c96039b2a54c1a3b1707fc0 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -393,6 +393,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess - public boolean activatedPriorityReset = false; // Pufferfish - DAB - public int activatedPriority = gg.pufferfish.pufferfish.PufferfishConfig.maximumActivationPrio; // Pufferfish - DAB (golf score) - public final BlockPos.MutableBlockPos cachedBlockPos = new BlockPos.MutableBlockPos(); // Pufferfish - reduce entity allocations +@@ -390,6 +390,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess + public boolean freezeLocked = false; // Paper - Freeze Tick Lock API + public boolean fixedPose = false; // Paper - Expand Pose API + private final int despawnTime; // Paper - entity despawn time limit + public @Nullable Boolean immuneToFire = null; // Purpur - Fire immune API public void setOrigin(@javax.annotation.Nonnull Location location) { this.origin = location.toVector(); -@@ -1983,7 +1984,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -1980,7 +1981,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess } public boolean fireImmune() { @@ -25,7 +25,7 @@ index 766301a14033fcc6b9270e556b9c08e019996530..e6d662b9e8d50abd9160aeaea705abc8 } public boolean causeFallDamage(float fallDistance, float damageMultiplier, DamageSource damageSource) { -@@ -2738,6 +2739,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -2735,6 +2736,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess nbttagcompound.putBoolean("Paper.FreezeLock", true); } // Paper end @@ -37,7 +37,7 @@ index 766301a14033fcc6b9270e556b9c08e019996530..e6d662b9e8d50abd9160aeaea705abc8 return nbttagcompound; } catch (Throwable throwable) { CrashReport crashreport = CrashReport.forThrowable(throwable, "Saving entity NBT"); -@@ -2888,6 +2894,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -2885,6 +2891,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess freezeLocked = nbt.getBoolean("Paper.FreezeLock"); } // Paper end diff --git a/patches/server/0267-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch b/patches/server/0265-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch similarity index 94% rename from patches/server/0267-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch rename to patches/server/0265-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch index d117d16a3..c4e5f70f0 100644 --- a/patches/server/0267-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch +++ b/patches/server/0265-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add option to teleport to spawn on nether ceiling damage diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index e6d662b9e8d50abd9160aeaea705abc8310eb3b5..305a569f8cd83f3c67a4d4377f2881d36961dacd 100644 +index c12594a49435440a6c96039b2a54c1a3b1707fc0..c00a48fef499bc3b18a92010d88b32f10c839898 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -1004,6 +1004,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -1001,6 +1001,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess && this.level.paperConfig().environment.netherCeilingVoidDamageHeight.test(v -> this.getY() >= v) && (!(this instanceof Player player) || !player.getAbilities().invulnerable))) { // Paper end - Configurable nether ceiling damage diff --git a/patches/server/0268-Added-got-ram-event.patch b/patches/server/0266-Added-got-ram-event.patch similarity index 86% rename from patches/server/0268-Added-got-ram-event.patch rename to patches/server/0266-Added-got-ram-event.patch index c1eb50a27..d7f7524f0 100644 --- a/patches/server/0268-Added-got-ram-event.patch +++ b/patches/server/0266-Added-got-ram-event.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Added got ram event diff --git a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java -index e2223f0f5e8704841e78bea6b3db40052fdb2bcf..9cd08bb4e9069bb2f701ef3825ba4c5af6f56790 100644 +index 214a97aa88c569f55619512e712b7bfe32d26b30..54485641271a0570a4c6229eb1c5cb8ddff534b4 100644 --- a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java +++ b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java -@@ -436,6 +436,7 @@ public class Goat extends Animal { +@@ -435,6 +435,7 @@ public class Goat extends Animal { // Paper start - Goat ram API public void ram(net.minecraft.world.entity.LivingEntity entity) { diff --git a/patches/server/0269-Log-skipped-entity-s-position.patch b/patches/server/0267-Log-skipped-entity-s-position.patch similarity index 86% rename from patches/server/0269-Log-skipped-entity-s-position.patch rename to patches/server/0267-Log-skipped-entity-s-position.patch index 3146d795b..e2d39db9e 100644 --- a/patches/server/0269-Log-skipped-entity-s-position.patch +++ b/patches/server/0267-Log-skipped-entity-s-position.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Log skipped entity's position diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java -index bf82c21b144c88f95991dbd7cb575839d8bd8e57..d09664949f924b4bd240abcc4a9f96f142310aa9 100644 +index 20a7fe2995db717f394fc3041435a95dbfee2ff7..2203410d3eac6362e949315b0ec15c270bdb5cb8 100644 --- a/src/main/java/net/minecraft/world/entity/EntityType.java +++ b/src/main/java/net/minecraft/world/entity/EntityType.java -@@ -693,6 +693,12 @@ public class EntityType implements FeatureElement, EntityTypeT +@@ -692,6 +692,12 @@ public class EntityType implements FeatureElement, EntityTypeT entity.load(nbt); }, () -> { EntityType.LOGGER.warn("Skipping Entity with id {}", nbt.getString("id")); diff --git a/patches/server/0270-End-Crystal-Cramming.patch b/patches/server/0268-End-Crystal-Cramming.patch similarity index 100% rename from patches/server/0270-End-Crystal-Cramming.patch rename to patches/server/0268-End-Crystal-Cramming.patch diff --git a/patches/server/0271-Option-to-allow-beacon-effects-when-covered-by-tinte.patch b/patches/server/0269-Option-to-allow-beacon-effects-when-covered-by-tinte.patch similarity index 100% rename from patches/server/0271-Option-to-allow-beacon-effects-when-covered-by-tinte.patch rename to patches/server/0269-Option-to-allow-beacon-effects-when-covered-by-tinte.patch diff --git a/patches/server/0272-Add-attribute-clamping-and-armor-limit-config.patch b/patches/server/0270-Add-attribute-clamping-and-armor-limit-config.patch similarity index 100% rename from patches/server/0272-Add-attribute-clamping-and-armor-limit-config.patch rename to patches/server/0270-Add-attribute-clamping-and-armor-limit-config.patch diff --git a/patches/server/0273-Config-to-remove-explosion-radius-clamp.patch b/patches/server/0271-Config-to-remove-explosion-radius-clamp.patch similarity index 100% rename from patches/server/0273-Config-to-remove-explosion-radius-clamp.patch rename to patches/server/0271-Config-to-remove-explosion-radius-clamp.patch diff --git a/patches/server/0274-bonemealable-sugarcane-cactus-and-netherwart.patch b/patches/server/0272-bonemealable-sugarcane-cactus-and-netherwart.patch similarity index 100% rename from patches/server/0274-bonemealable-sugarcane-cactus-and-netherwart.patch rename to patches/server/0272-bonemealable-sugarcane-cactus-and-netherwart.patch diff --git a/patches/server/0275-Add-PreExplodeEvents.patch b/patches/server/0273-Add-PreExplodeEvents.patch similarity index 100% rename from patches/server/0275-Add-PreExplodeEvents.patch rename to patches/server/0273-Add-PreExplodeEvents.patch diff --git a/patches/server/0276-Improve-output-of-plugins-command.patch b/patches/server/0274-Improve-output-of-plugins-command.patch similarity index 100% rename from patches/server/0276-Improve-output-of-plugins-command.patch rename to patches/server/0274-Improve-output-of-plugins-command.patch diff --git a/patches/server/0277-Make-GUI-Great-Again.patch b/patches/server/0275-Make-GUI-Great-Again.patch similarity index 99% rename from patches/server/0277-Make-GUI-Great-Again.patch rename to patches/server/0275-Make-GUI-Great-Again.patch index 920ec5b45..2a79d5d76 100644 --- a/patches/server/0277-Make-GUI-Great-Again.patch +++ b/patches/server/0275-Make-GUI-Great-Again.patch @@ -96,7 +96,7 @@ index 0000000000000000000000000000000000000000..15a226e3854d731f7724025ea3459c8a + } +} diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index 07ec10fe4c96d0fd2a5f8a3df11c37cda7fff76a..0a579af1f1ecd6e73a8440e6821c41338dd28829 100644 +index 509e67eeab1f07ecce3bce0c8c222bc2c184ca6f..df035169ea89c4078e9a9226ac6e752f29d585a1 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java @@ -111,6 +111,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface diff --git a/patches/server/0278-Stored-Bee-API.patch b/patches/server/0276-Stored-Bee-API.patch similarity index 100% rename from patches/server/0278-Stored-Bee-API.patch rename to patches/server/0276-Stored-Bee-API.patch diff --git a/patches/server/0279-Shears-can-defuse-TNT.patch b/patches/server/0277-Shears-can-defuse-TNT.patch similarity index 100% rename from patches/server/0279-Shears-can-defuse-TNT.patch rename to patches/server/0277-Shears-can-defuse-TNT.patch diff --git a/patches/server/0280-Explorer-Map-API.patch b/patches/server/0278-Explorer-Map-API.patch similarity index 100% rename from patches/server/0280-Explorer-Map-API.patch rename to patches/server/0278-Explorer-Map-API.patch diff --git a/patches/server/0281-Option-Ocelot-Spawn-Under-Sea-Level.patch b/patches/server/0279-Option-Ocelot-Spawn-Under-Sea-Level.patch similarity index 100% rename from patches/server/0281-Option-Ocelot-Spawn-Under-Sea-Level.patch rename to patches/server/0279-Option-Ocelot-Spawn-Under-Sea-Level.patch diff --git a/patches/server/0282-add-an-option-for-piglins-to-ignore-gold-trimmed-arm.patch b/patches/server/0280-add-an-option-for-piglins-to-ignore-gold-trimmed-arm.patch similarity index 100% rename from patches/server/0282-add-an-option-for-piglins-to-ignore-gold-trimmed-arm.patch rename to patches/server/0280-add-an-option-for-piglins-to-ignore-gold-trimmed-arm.patch diff --git a/patches/server/0283-Add-option-for-always-showing-item-in-player-death-m.patch b/patches/server/0281-Add-option-for-always-showing-item-in-player-death-m.patch similarity index 100% rename from patches/server/0283-Add-option-for-always-showing-item-in-player-death-m.patch rename to patches/server/0281-Add-option-for-always-showing-item-in-player-death-m.patch diff --git a/patches/server/0284-place-end-crystal-on-any-block.patch b/patches/server/0282-place-end-crystal-on-any-block.patch similarity index 96% rename from patches/server/0284-place-end-crystal-on-any-block.patch rename to patches/server/0282-place-end-crystal-on-any-block.patch index e2927fcac..3000e2897 100644 --- a/patches/server/0284-place-end-crystal-on-any-block.patch +++ b/patches/server/0282-place-end-crystal-on-any-block.patch @@ -5,7 +5,7 @@ Subject: [PATCH] place end crystal on any block diff --git a/src/main/java/net/minecraft/world/item/EndCrystalItem.java b/src/main/java/net/minecraft/world/item/EndCrystalItem.java -index 2bee342e59e600426c8681a3ce641a12f22790be..e75930f26604b772a141a93c6f4b77828abc4503 100644 +index b62db8c7c8c57e43869ee239ebf4b02f112355d9..f60e39e56a5dab2de62ae9cfd7a30a70b4985c09 100644 --- a/src/main/java/net/minecraft/world/item/EndCrystalItem.java +++ b/src/main/java/net/minecraft/world/item/EndCrystalItem.java @@ -27,7 +27,7 @@ public class EndCrystalItem extends Item { diff --git a/patches/server/0285-Add-option-to-disable-the-copper-oxidation-proximity.patch b/patches/server/0283-Add-option-to-disable-the-copper-oxidation-proximity.patch similarity index 100% rename from patches/server/0285-Add-option-to-disable-the-copper-oxidation-proximity.patch rename to patches/server/0283-Add-option-to-disable-the-copper-oxidation-proximity.patch diff --git a/patches/server/0286-register-minecraft-debug-commands.patch b/patches/server/0284-register-minecraft-debug-commands.patch similarity index 100% rename from patches/server/0286-register-minecraft-debug-commands.patch rename to patches/server/0284-register-minecraft-debug-commands.patch diff --git a/patches/server/0287-Configurable-villager-search-radius.patch b/patches/server/0285-Configurable-villager-search-radius.patch similarity index 100% rename from patches/server/0287-Configurable-villager-search-radius.patch rename to patches/server/0285-Configurable-villager-search-radius.patch diff --git a/patches/server/0288-option-to-make-ravagers-afraid-of-rabbits.patch b/patches/server/0286-option-to-make-ravagers-afraid-of-rabbits.patch similarity index 100% rename from patches/server/0288-option-to-make-ravagers-afraid-of-rabbits.patch rename to patches/server/0286-option-to-make-ravagers-afraid-of-rabbits.patch diff --git a/patches/server/0289-config-for-startup-commands.patch b/patches/server/0287-config-for-startup-commands.patch similarity index 93% rename from patches/server/0289-config-for-startup-commands.patch rename to patches/server/0287-config-for-startup-commands.patch index 30677462c..b1ee06163 100644 --- a/patches/server/0289-config-for-startup-commands.patch +++ b/patches/server/0287-config-for-startup-commands.patch @@ -5,10 +5,10 @@ Subject: [PATCH] config for startup commands diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 827e8b9b0fb0fa64f56de54a562f65e200c7b50f..fa5f7bc53f3dfa5581f7c747c732ebc7737a7820 100644 +index 1dc4476ca1fc41030001d4d23ffff1b810a056cd..115069f2bce9b7742d8d3fbf181a47cacf8b0046 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1294,6 +1294,17 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop