diff --git a/patches/server/0176-Configurable-mob-blindness.patch b/patches/server/0175-Configurable-mob-blindness.patch similarity index 100% rename from patches/server/0176-Configurable-mob-blindness.patch rename to patches/server/0175-Configurable-mob-blindness.patch diff --git a/patches/server/0175-Fix-SPIGOT-6278.patch b/patches/server/0175-Fix-SPIGOT-6278.patch deleted file mode 100644 index d39fc277f..000000000 --- a/patches/server/0175-Fix-SPIGOT-6278.patch +++ /dev/null @@ -1,19 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: William Blake Galbreath -Date: Mon, 10 May 2021 02:08:53 -0500 -Subject: [PATCH] Fix SPIGOT-6278 - - -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 9410c57b4999915ccff9588895fd9bec307499bd..825a2fe1eac36812744b134be76798d8ae3d0bbf 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 -@@ -221,7 +221,7 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento - - @Override - public boolean removeWhenFarAway(double distanceSquared) { -- return !this.isPersistenceRequired(); -+ return true || !this.isPersistenceRequired(); // Purpur - fix SPIGOT-6278 - } - - @Override diff --git a/patches/server/0177-Hide-hidden-players-from-entity-selector.patch b/patches/server/0176-Hide-hidden-players-from-entity-selector.patch similarity index 100% rename from patches/server/0177-Hide-hidden-players-from-entity-selector.patch rename to patches/server/0176-Hide-hidden-players-from-entity-selector.patch diff --git a/patches/server/0178-Config-for-health-to-impact-Creeper-explosion-radius.patch b/patches/server/0177-Config-for-health-to-impact-Creeper-explosion-radius.patch similarity index 96% rename from patches/server/0178-Config-for-health-to-impact-Creeper-explosion-radius.patch rename to patches/server/0177-Config-for-health-to-impact-Creeper-explosion-radius.patch index afc0d64af..c145fa5d3 100644 --- a/patches/server/0178-Config-for-health-to-impact-Creeper-explosion-radius.patch +++ b/patches/server/0177-Config-for-health-to-impact-Creeper-explosion-radius.patch @@ -21,7 +21,7 @@ index 525b94c61693cfd7d68305cbf4eb08a87f3ca66a..35cbd013b1d58bb5fd1480922c2bd430 if (!event.isCancelled()) { this.dead = true; diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 4766ff27a4dab68877b0517b7698aa800e747a3f..f72469212455a82246b2d498d059887458bebe31 100644 +index 78e1a64946daec89d7724fd966c3ecdc346f468c..8e54e6a6c1132430f45c249fb7a08f05329c5200 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -874,6 +874,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0179-Iron-golem-poppy-calms-anger.patch b/patches/server/0178-Iron-golem-poppy-calms-anger.patch similarity index 98% rename from patches/server/0179-Iron-golem-poppy-calms-anger.patch rename to patches/server/0178-Iron-golem-poppy-calms-anger.patch index 5144a6539..862cbd7a2 100644 --- a/patches/server/0179-Iron-golem-poppy-calms-anger.patch +++ b/patches/server/0178-Iron-golem-poppy-calms-anger.patch @@ -17,7 +17,7 @@ index 52cc0df083d5a4685fd00f7db0d92b277fb0c994..ff5d6f437b880ab0aa5897089694a620 this.goalSelector.addGoal(2, new MoveTowardsTargetGoal(this, 0.9D, 32.0F)); this.goalSelector.addGoal(2, new MoveBackToVillageGoal(this, 0.6D, false)); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index f72469212455a82246b2d498d059887458bebe31..aed1dfb0d73cf5abdc78bccf85255907e59ba1c2 100644 +index 8e54e6a6c1132430f45c249fb7a08f05329c5200..3c415cbc62ae2b75c3ce7d78f6ce683f905fa703 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1285,6 +1285,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0180-Breedable-parrots.patch b/patches/server/0179-Breedable-parrots.patch similarity index 97% rename from patches/server/0180-Breedable-parrots.patch rename to patches/server/0179-Breedable-parrots.patch index c1542303c..e4c13af07 100644 --- a/patches/server/0180-Breedable-parrots.patch +++ b/patches/server/0179-Breedable-parrots.patch @@ -50,7 +50,7 @@ index de702ce3e2dffc44e380b8470aa540a3226a54cb..bb9717d1b2039469aae26e0eb9a4304b @Override diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index aed1dfb0d73cf5abdc78bccf85255907e59ba1c2..3b4bba58765dde47fc12ab863fadaca84e1e7442 100644 +index 3c415cbc62ae2b75c3ce7d78f6ce683f905fa703..247eb8a5be4e3401b805f8175f2beee96ed60739 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1435,6 +1435,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0181-Configurable-powered-rail-boost-modifier.patch b/patches/server/0180-Configurable-powered-rail-boost-modifier.patch similarity index 96% rename from patches/server/0181-Configurable-powered-rail-boost-modifier.patch rename to patches/server/0180-Configurable-powered-rail-boost-modifier.patch index 929c1457c..1763503bd 100644 --- a/patches/server/0181-Configurable-powered-rail-boost-modifier.patch +++ b/patches/server/0180-Configurable-powered-rail-boost-modifier.patch @@ -18,7 +18,7 @@ index 6b58b32711b3aba9b7de9e7dee6d02073dad3b7f..0e6f2d1d48910c573ec2237002a02f33 Vec3 vec3d5 = this.getDeltaMovement(); double d21 = vec3d5.x; diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 3b4bba58765dde47fc12ab863fadaca84e1e7442..27e57b560463c789d08f5d2df423d85809c59c68 100644 +index 247eb8a5be4e3401b805f8175f2beee96ed60739..eb84241da3245a541359449589402ea6d7ae5366 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -227,6 +227,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0182-Add-config-change-multiplier-critical-damage-value.patch b/patches/server/0181-Add-config-change-multiplier-critical-damage-value.patch similarity index 96% rename from patches/server/0182-Add-config-change-multiplier-critical-damage-value.patch rename to patches/server/0181-Add-config-change-multiplier-critical-damage-value.patch index 4334db826..8eaf56629 100644 --- a/patches/server/0182-Add-config-change-multiplier-critical-damage-value.patch +++ b/patches/server/0181-Add-config-change-multiplier-critical-damage-value.patch @@ -18,7 +18,7 @@ index 4ddeb2361528406a359eb0ccb204c965a03fc729..4252ff0201cbfbecc7b95ca86c1763dc f += f1; diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 27e57b560463c789d08f5d2df423d85809c59c68..156b5e9cc26d75c3930450be79efc9535ddb0d05 100644 +index eb84241da3245a541359449589402ea6d7ae5366..8644825997ea2b7d575708aee29bd718f23c57a6 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -326,6 +326,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0183-Option-to-disable-dragon-egg-teleporting.patch b/patches/server/0182-Option-to-disable-dragon-egg-teleporting.patch similarity index 95% rename from patches/server/0183-Option-to-disable-dragon-egg-teleporting.patch rename to patches/server/0182-Option-to-disable-dragon-egg-teleporting.patch index 8cdc56e30..32bfb96ed 100644 --- a/patches/server/0183-Option-to-disable-dragon-egg-teleporting.patch +++ b/patches/server/0182-Option-to-disable-dragon-egg-teleporting.patch @@ -19,7 +19,7 @@ index 7e1edcc7b9f170b7c649437c2f0dd78c0bab9be4..5f8ac1fdac2c334951261f2b9702f5e7 BlockPos blockposition1 = pos.offset(world.random.nextInt(16) - world.random.nextInt(16), world.random.nextInt(8) - world.random.nextInt(8), world.random.nextInt(16) - world.random.nextInt(16)); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 156b5e9cc26d75c3930450be79efc9535ddb0d05..6688ae6c5b8e5a2dc69e253b320f35c28dd24c5c 100644 +index 8644825997ea2b7d575708aee29bd718f23c57a6..7e3d6c474cae696a9c97bd72b8d6ae9685962c63 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -540,6 +540,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0184-Config-for-unverified-username-message.patch b/patches/server/0183-Config-for-unverified-username-message.patch similarity index 97% rename from patches/server/0184-Config-for-unverified-username-message.patch rename to patches/server/0183-Config-for-unverified-username-message.patch index f152cd8bd..54babd3c3 100644 --- a/patches/server/0184-Config-for-unverified-username-message.patch +++ b/patches/server/0183-Config-for-unverified-username-message.patch @@ -18,7 +18,7 @@ index 33a29890435d6065a2cc4f8e8bf8209c01d5d114..b86d5e736d786ac3c74fec3ad1285400 } } catch (AuthenticationUnavailableException authenticationunavailableexception) { diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -index 47a731efd6f28096439089d69a3502193ba3f000..552e3cbd352302fb0dbc4c2b80df465c13012b84 100644 +index 111efe9539cb8e70cb2302aa1c4045871509c324..a1a6f7ae168c3cd4cdc0a002c74c803024e41190 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -166,6 +166,7 @@ public class PurpurConfig { diff --git a/patches/server/0185-Make-anvil-cumulative-cost-configurable.patch b/patches/server/0184-Make-anvil-cumulative-cost-configurable.patch similarity index 100% rename from patches/server/0185-Make-anvil-cumulative-cost-configurable.patch rename to patches/server/0184-Make-anvil-cumulative-cost-configurable.patch diff --git a/patches/server/0186-ShulkerBox-allow-oversized-stacks.patch b/patches/server/0185-ShulkerBox-allow-oversized-stacks.patch similarity index 94% rename from patches/server/0186-ShulkerBox-allow-oversized-stacks.patch rename to patches/server/0185-ShulkerBox-allow-oversized-stacks.patch index a7e8e9663..0d7324e99 100644 --- a/patches/server/0186-ShulkerBox-allow-oversized-stacks.patch +++ b/patches/server/0185-ShulkerBox-allow-oversized-stacks.patch @@ -9,7 +9,7 @@ creating an itemstack using the TileEntity's NBT data (how it handles it for creative players) instead of routing it through the LootableBuilder. diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java -index cd1d5c3a21b08105b00e2d10671cfa0c7f24330d..6954d96cf4324f8b608a867463b2b8feb2acd494 100644 +index 0409daff0f01db6d0644934fc8ffd64b6158e378..7649742f5e37d875e79c169c709ae82529b0db77 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java @@ -447,7 +447,7 @@ public class ServerPlayerGameMode { @@ -35,7 +35,7 @@ index 7f1230d915c98b6f30b13a06c2788bc2f7b7e912..9439119a70a411b1a7d9cd6a0090e413 blockEntity.saveToItem(itemStack); if (shulkerBoxBlockEntity.hasCustomName()) { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 6688ae6c5b8e5a2dc69e253b320f35c28dd24c5c..c15b2234f3e670990e0ca70054967da349f347eb 100644 +index 7e3d6c474cae696a9c97bd72b8d6ae9685962c63..0bff4ac90f1256bad935d1964d4d365c163beea9 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -660,6 +660,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0187-Bee-can-work-when-raining-or-at-night.patch b/patches/server/0186-Bee-can-work-when-raining-or-at-night.patch similarity index 100% rename from patches/server/0187-Bee-can-work-when-raining-or-at-night.patch rename to patches/server/0186-Bee-can-work-when-raining-or-at-night.patch diff --git a/patches/server/0188-API-for-any-mob-to-burn-daylight.patch b/patches/server/0187-API-for-any-mob-to-burn-daylight.patch similarity index 100% rename from patches/server/0188-API-for-any-mob-to-burn-daylight.patch rename to patches/server/0187-API-for-any-mob-to-burn-daylight.patch diff --git a/patches/server/0189-Config-MobEffect-by-world.patch b/patches/server/0188-Config-MobEffect-by-world.patch similarity index 100% rename from patches/server/0189-Config-MobEffect-by-world.patch rename to patches/server/0188-Config-MobEffect-by-world.patch diff --git a/patches/server/0190-Beacon-Activation-Range-Configurable.patch b/patches/server/0189-Beacon-Activation-Range-Configurable.patch similarity index 100% rename from patches/server/0190-Beacon-Activation-Range-Configurable.patch rename to patches/server/0189-Beacon-Activation-Range-Configurable.patch diff --git a/patches/server/0191-Add-toggle-for-sand-duping-fix.patch b/patches/server/0190-Add-toggle-for-sand-duping-fix.patch similarity index 100% rename from patches/server/0191-Add-toggle-for-sand-duping-fix.patch rename to patches/server/0190-Add-toggle-for-sand-duping-fix.patch diff --git a/patches/server/0192-Add-toggle-for-end-portal-safe-teleporting.patch b/patches/server/0191-Add-toggle-for-end-portal-safe-teleporting.patch similarity index 97% rename from patches/server/0192-Add-toggle-for-end-portal-safe-teleporting.patch rename to patches/server/0191-Add-toggle-for-end-portal-safe-teleporting.patch index b0c658d58..d6c9d7f1f 100644 --- a/patches/server/0192-Add-toggle-for-end-portal-safe-teleporting.patch +++ b/patches/server/0191-Add-toggle-for-end-portal-safe-teleporting.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add toggle for end portal safe teleporting diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 953506523b7bd5835bd727d9d4e6759f946e2afc..d965fa9b1f7ab84268a4a8e2d4898a0eb59706a0 100644 +index 2673c49e46e0acbac413feec146000d535721404..8fb0b23f7b643c6bc321f3a3b4acfab78646721b 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2764,7 +2764,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i diff --git a/patches/server/0193-Flying-Fall-Damage-API.patch b/patches/server/0192-Flying-Fall-Damage-API.patch similarity index 100% rename from patches/server/0193-Flying-Fall-Damage-API.patch rename to patches/server/0192-Flying-Fall-Damage-API.patch diff --git a/patches/server/0194-Make-lightning-rod-range-configurable.patch b/patches/server/0193-Make-lightning-rod-range-configurable.patch similarity index 100% rename from patches/server/0194-Make-lightning-rod-range-configurable.patch rename to patches/server/0193-Make-lightning-rod-range-configurable.patch diff --git a/patches/server/0195-Burp-after-eating-food-fills-hunger-bar-completely.patch b/patches/server/0194-Burp-after-eating-food-fills-hunger-bar-completely.patch similarity index 100% rename from patches/server/0195-Burp-after-eating-food-fills-hunger-bar-completely.patch rename to patches/server/0194-Burp-after-eating-food-fills-hunger-bar-completely.patch diff --git a/patches/server/0196-Allow-player-join-full-server-by-permission.patch b/patches/server/0195-Allow-player-join-full-server-by-permission.patch similarity index 100% rename from patches/server/0196-Allow-player-join-full-server-by-permission.patch rename to patches/server/0195-Allow-player-join-full-server-by-permission.patch diff --git a/patches/server/0197-Add-permission-bypass-for-portal-waiting.patch b/patches/server/0196-Add-permission-bypass-for-portal-waiting.patch similarity index 100% rename from patches/server/0197-Add-permission-bypass-for-portal-waiting.patch rename to patches/server/0196-Add-permission-bypass-for-portal-waiting.patch diff --git a/patches/server/0198-Shulker-spawn-from-bullet-options.patch b/patches/server/0197-Shulker-spawn-from-bullet-options.patch similarity index 100% rename from patches/server/0198-Shulker-spawn-from-bullet-options.patch rename to patches/server/0197-Shulker-spawn-from-bullet-options.patch diff --git a/patches/server/0199-Eating-glow-berries-adds-glow-effect.patch b/patches/server/0198-Eating-glow-berries-adds-glow-effect.patch similarity index 100% rename from patches/server/0199-Eating-glow-berries-adds-glow-effect.patch rename to patches/server/0198-Eating-glow-berries-adds-glow-effect.patch diff --git a/patches/server/0200-Option-to-make-drowned-break-doors.patch b/patches/server/0199-Option-to-make-drowned-break-doors.patch similarity index 100% rename from patches/server/0200-Option-to-make-drowned-break-doors.patch rename to patches/server/0199-Option-to-make-drowned-break-doors.patch diff --git a/patches/server/0201-Configurable-hunger-starvation-damage.patch b/patches/server/0200-Configurable-hunger-starvation-damage.patch similarity index 100% rename from patches/server/0201-Configurable-hunger-starvation-damage.patch rename to patches/server/0200-Configurable-hunger-starvation-damage.patch diff --git a/patches/server/0202-Redirect-System.out-calls-to-plugin-loggers.patch b/patches/server/0201-Redirect-System.out-calls-to-plugin-loggers.patch similarity index 100% rename from patches/server/0202-Redirect-System.out-calls-to-plugin-loggers.patch rename to patches/server/0201-Redirect-System.out-calls-to-plugin-loggers.patch diff --git a/patches/server/0203-Armor-click-equip-options.patch b/patches/server/0202-Armor-click-equip-options.patch similarity index 100% rename from patches/server/0203-Armor-click-equip-options.patch rename to patches/server/0202-Armor-click-equip-options.patch diff --git a/patches/server/0204-Add-uptime-command.patch b/patches/server/0203-Add-uptime-command.patch similarity index 97% rename from patches/server/0204-Add-uptime-command.patch rename to patches/server/0203-Add-uptime-command.patch index c9bcd0395..b88a9081b 100644 --- a/patches/server/0204-Add-uptime-command.patch +++ b/patches/server/0203-Add-uptime-command.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add uptime command diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java -index bc418143e63bfe9553f6853b89c6f5e8fb73c36e..04aa3a9d98ff4de3ce0bbacb07dc30170ff232b1 100644 +index abf803d4627b4345c6a91763486320a484f8a81b..4c243155b4a4a5f69bcf0558574ac31b35bea971 100644 --- a/src/main/java/net/minecraft/commands/Commands.java +++ b/src/main/java/net/minecraft/commands/Commands.java @@ -208,6 +208,7 @@ public class Commands { @@ -17,7 +17,7 @@ index bc418143e63bfe9553f6853b89c6f5e8fb73c36e..04aa3a9d98ff4de3ce0bbacb07dc3017 } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index e759c7f4686a88fdfd15d9ecd6b891f60b026468..3d45aa3cf8e25790dba332105c397dce2b1ef5b1 100644 +index dc95a1230ac6f86c32b3c6a8e4876725dbb3c033..022cf286342abe9f5349b70e096373a0db2a810d 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -294,6 +294,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop