diff --git a/patches/unapplied-server/0047-Allow-leashing-villagers.patch b/patches/server/0046-Allow-leashing-villagers.patch similarity index 61% rename from patches/unapplied-server/0047-Allow-leashing-villagers.patch rename to patches/server/0046-Allow-leashing-villagers.patch index f112b76c1..b3a444270 100644 --- a/patches/unapplied-server/0047-Allow-leashing-villagers.patch +++ b/patches/server/0046-Allow-leashing-villagers.patch @@ -4,50 +4,50 @@ Date: Thu, 3 Oct 2019 18:08:03 -0500 Subject: [PATCH] Allow leashing villagers -diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java -index 3fdb1ba2e9249cda6f09406cfbf4cc677a258f13..a0e0d3ca25bf047a5520a3ed47f93ab97377b8b4 100644 ---- a/src/main/java/net/minecraft/world/entity/Mob.java -+++ b/src/main/java/net/minecraft/world/entity/Mob.java -@@ -1450,6 +1450,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Targeti - if (!this.isAlive()) { - return InteractionResult.PASS; - } else if (this.getLeashHolder() == player) { -+ if (hand == InteractionHand.OFF_HAND && (level().purpurConfig.villagerCanBeLeashed || level().purpurConfig.wanderingTraderCanBeLeashed) && this instanceof net.minecraft.world.entity.npc.AbstractVillager) return InteractionResult.CONSUME; // Purpur - // CraftBukkit start - fire PlayerUnleashEntityEvent - // Paper start - Expand EntityUnleashEvent - org.bukkit.event.player.PlayerUnleashEntityEvent event = CraftEventFactory.callPlayerUnleashEntityEvent(this, player, hand, !player.hasInfiniteMaterials()); +diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java +index de93640d0b458bafac8f661fb73c99c0bb596551..289a516b56a6a6c97ecda3768ea08b91348a79ed 100644 +--- a/src/main/java/net/minecraft/world/entity/Entity.java ++++ b/src/main/java/net/minecraft/world/entity/Entity.java +@@ -2731,6 +2731,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess + if (this.isAlive() && this instanceof Leashable leashable) { + if (leashable.getLeashHolder() == player) { + if (!this.level().isClientSide()) { ++ if (hand == InteractionHand.OFF_HAND && (level().purpurConfig.villagerCanBeLeashed || level().purpurConfig.wanderingTraderCanBeLeashed) && this instanceof net.minecraft.world.entity.npc.AbstractVillager) return InteractionResult.CONSUME; // Purpur + // CraftBukkit start - fire PlayerUnleashEntityEvent + // Paper start - Expand EntityUnleashEvent + org.bukkit.event.player.PlayerUnleashEntityEvent event = CraftEventFactory.callPlayerUnleashEntityEvent(this, player, hand, !player.hasInfiniteMaterials()); 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 fad0d393a96d818e90aaa42f3d8d32fa97f7b337..051940da69567274f48485f060cbc3ac21a0907f 100644 +index 4ae45a7dae279cb1b8048ce4eff2aa1ae4e19f68..33c0ac18fa4c5b47d60cc774fe72d2d68c14e025 100644 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java -@@ -184,6 +184,11 @@ public class Villager extends AbstractVillager implements ReputationEventHandler - this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.villagerMaxHealth); +@@ -177,6 +177,11 @@ public class Villager extends AbstractVillager implements ReputationEventHandler + protected void registerGoals() { + this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); } - -+ @Override -+ public boolean canBeLeashed(Player player) { -+ return level().purpurConfig.villagerCanBeLeashed && !this.isLeashed(); -+ } + ++ @Override ++ public boolean canBeLeashed() { ++ return level().purpurConfig.villagerCanBeLeashed; ++ } + // Purpur end + @Override - public Brain getBrain() { - return (Brain) super.getBrain(); // CraftBukkit - decompile error diff --git a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java -index 30f13bc35a96950f05b065b5c77830834e5792d1..9d5eaaf1869a3ecb61947ab0c09af558fa1cd283 100644 +index 6990d6dc306b1d25544793b365fd6f7be8a37201..0d5e828a7fb6fd6facc04a27175541ac463c918e 100644 --- a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java +++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java -@@ -93,6 +93,11 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill - this.getAttribute(net.minecraft.world.entity.ai.attributes.Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.wanderingTraderMaxHealth); +@@ -86,6 +86,11 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill + public boolean isControllable() { + return level().purpurConfig.wanderingTraderControllable; } - -+ @Override -+ public boolean canBeLeashed(Player player) { -+ return level().purpurConfig.wanderingTraderCanBeLeashed && !this.isLeashed(); -+ } + ++ @Override ++ public boolean canBeLeashed() { ++ return level().purpurConfig.wanderingTraderCanBeLeashed; ++ } + // Purpur end + @Override - protected void registerGoals() { - this.goalSelector.addGoal(0, new FloatGoal(this)); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 851014c5c02491cdbe778844251d3ec6a4236ff8..28ca277a383eefbc96f07e05d98d4a9f460807af 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java diff --git a/patches/server/0046-Implement-infinite-liquids.patch b/patches/server/0047-Implement-infinite-liquids.patch similarity index 97% rename from patches/server/0046-Implement-infinite-liquids.patch rename to patches/server/0047-Implement-infinite-liquids.patch index 6df5f5602..33071e8a2 100644 --- a/patches/server/0046-Implement-infinite-liquids.patch +++ b/patches/server/0047-Implement-infinite-liquids.patch @@ -67,7 +67,7 @@ index 109f71401c65f476ccf6813137386fc9fef10254..9dcdb2f4001115db0c26fdbf86531dbe @Override protected void beforeDestroyingBlock(LevelAccessor world, BlockPos pos, BlockState state, BlockPos source) { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 851014c5c02491cdbe778844251d3ec6a4236ff8..72c5c766b20622713ed6971d1d78bf0a615a5cd1 100644 +index 28ca277a383eefbc96f07e05d98d4a9f460807af..de44c8ffa61bb5d694cd635ebf3a5ce8ac9ef414 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -221,6 +221,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0047-Make-lava-flow-speed-configurable.patch b/patches/server/0048-Make-lava-flow-speed-configurable.patch similarity index 95% rename from patches/server/0047-Make-lava-flow-speed-configurable.patch rename to patches/server/0048-Make-lava-flow-speed-configurable.patch index 652705ec9..71fafd7bc 100644 --- a/patches/server/0047-Make-lava-flow-speed-configurable.patch +++ b/patches/server/0048-Make-lava-flow-speed-configurable.patch @@ -18,7 +18,7 @@ index 4c230136d832d50ae16ffa037b0b30ff1101b50a..2d492d849ff73a738dfbcb16507feb89 @Override diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 72c5c766b20622713ed6971d1d78bf0a615a5cd1..2e47b2d81d99b7f1c2e1ee1d658e890e64c7212f 100644 +index de44c8ffa61bb5d694cd635ebf3a5ce8ac9ef414..b9a1a8497b5d5a55d7547da5755ceeb4fd35f3c8 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -222,8 +222,12 @@ public class PurpurWorldConfig { diff --git a/patches/server/0048-Add-player-death-exp-control-options.patch b/patches/server/0049-Add-player-death-exp-control-options.patch similarity index 97% rename from patches/server/0048-Add-player-death-exp-control-options.patch rename to patches/server/0049-Add-player-death-exp-control-options.patch index f5622cf1b..e98c594fd 100644 --- a/patches/server/0048-Add-player-death-exp-control-options.patch +++ b/patches/server/0049-Add-player-death-exp-control-options.patch @@ -32,7 +32,7 @@ index 9ef4ab973508eb139f7a44feb4bd484d8e0e03cd..025309a47e9683ec29cd94f997663b7f return 0; } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 2e47b2d81d99b7f1c2e1ee1d658e890e64c7212f..ea0268f2b8a3fc7c1b25c8d80e98096cc607031e 100644 +index b9a1a8497b5d5a55d7547da5755ceeb4fd35f3c8..c6c38f53357f79c984e3e5d23298067a7688efcd 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -171,6 +171,8 @@ public class PurpurWorldConfig { diff --git a/patches/server/0049-Configurable-void-damage-height-and-damage.patch b/patches/server/0050-Configurable-void-damage-height-and-damage.patch similarity index 94% rename from patches/server/0049-Configurable-void-damage-height-and-damage.patch rename to patches/server/0050-Configurable-void-damage-height-and-damage.patch index 219143453..5406f98e5 100644 --- a/patches/server/0049-Configurable-void-damage-height-and-damage.patch +++ b/patches/server/0050-Configurable-void-damage-height-and-damage.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configurable void damage height and damage diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index de93640d0b458bafac8f661fb73c99c0bb596551..2a0bbf6bc92be8f30dd7b1d82f22a92f18df0901 100644 +index 289a516b56a6a6c97ecda3768ea08b91348a79ed..0056b23f6e883a057c267b4ca4c807b8a929a515 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -881,7 +881,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess @@ -31,7 +31,7 @@ index a3f400336e0013dab8845492b0e124f4414cf59f..6f7188ccba2675264ba8fbfd05cacc1c protected void updateSwingTime() { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index ea0268f2b8a3fc7c1b25c8d80e98096cc607031e..d9b3dacbb61027437dae8a2afec396cd9b484f6e 100644 +index c6c38f53357f79c984e3e5d23298067a7688efcd..be57857fc31ba32b47bd5d50d2898c5eb1ff9bd8 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -98,10 +98,14 @@ public class PurpurWorldConfig { diff --git a/patches/server/0050-Add-canSaveToDisk-to-Entity.patch b/patches/server/0051-Add-canSaveToDisk-to-Entity.patch similarity index 97% rename from patches/server/0050-Add-canSaveToDisk-to-Entity.patch rename to patches/server/0051-Add-canSaveToDisk-to-Entity.patch index 85d1e9d21..ec74ae3a1 100644 --- a/patches/server/0050-Add-canSaveToDisk-to-Entity.patch +++ b/patches/server/0051-Add-canSaveToDisk-to-Entity.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add canSaveToDisk to Entity diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 2a0bbf6bc92be8f30dd7b1d82f22a92f18df0901..ccee271764b3bffff1a7d302d71a02c8533ff8cc 100644 +index 0056b23f6e883a057c267b4ca4c807b8a929a515..92c7c8e75a8d8d97496b24bf0b6719aeeb1440dc 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -530,6 +530,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0051-Dispenser-curse-of-binding-protection.patch b/patches/server/0052-Dispenser-curse-of-binding-protection.patch similarity index 96% rename from patches/server/0051-Dispenser-curse-of-binding-protection.patch rename to patches/server/0052-Dispenser-curse-of-binding-protection.patch index a2347e36b..9609ff1c3 100644 --- a/patches/server/0051-Dispenser-curse-of-binding-protection.patch +++ b/patches/server/0052-Dispenser-curse-of-binding-protection.patch @@ -35,7 +35,7 @@ index 647a4601deace52f8d855f512a73671f82b4762a..d6bdd6313e0e5be3ddfa04f40cf035e7 // CraftBukkit start Level world = pointer.level(); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index d9b3dacbb61027437dae8a2afec396cd9b484f6e..55b8f6d46637b56a6f175649a5fdfbe3154b6323 100644 +index be57857fc31ba32b47bd5d50d2898c5eb1ff9bd8..4e4f037c6b1c75467a4f2c58001c8a1cb7a9d79f 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -224,6 +224,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0052-Add-option-for-boats-to-eject-players-on-land.patch b/patches/server/0053-Add-option-for-boats-to-eject-players-on-land.patch similarity index 95% rename from patches/server/0052-Add-option-for-boats-to-eject-players-on-land.patch rename to patches/server/0053-Add-option-for-boats-to-eject-players-on-land.patch index 5f0d77abe..ca772507e 100644 --- a/patches/server/0052-Add-option-for-boats-to-eject-players-on-land.patch +++ b/patches/server/0053-Add-option-for-boats-to-eject-players-on-land.patch @@ -17,7 +17,7 @@ index 907f751c859855484151fb5d607acee2f2a35076..4e1b2d65182f7d562a8470449b9f7c2e } else { return Boat.Status.IN_AIR; diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 55b8f6d46637b56a6f175649a5fdfbe3154b6323..e6333a4177e5e3bde40fa66d57299e676b8aebef 100644 +index 4e4f037c6b1c75467a4f2c58001c8a1cb7a9d79f..240c34bd95be07f19fb92d9b6678e6feffe2430e 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -95,12 +95,14 @@ public class PurpurWorldConfig { diff --git a/patches/server/0053-Mending-mends-most-damages-equipment-first.patch b/patches/server/0054-Mending-mends-most-damages-equipment-first.patch similarity index 96% rename from patches/server/0053-Mending-mends-most-damages-equipment-first.patch rename to patches/server/0054-Mending-mends-most-damages-equipment-first.patch index f080fefdb..1442d8bb4 100644 --- a/patches/server/0053-Mending-mends-most-damages-equipment-first.patch +++ b/patches/server/0054-Mending-mends-most-damages-equipment-first.patch @@ -26,7 +26,7 @@ index 15844971ce2cca8c679ad3aaa2dfe160e6d0b564..6598a737db11fb0c7e7a95b9bbfaabd7 if (optional.isPresent()) { ItemStack itemstack = ((EnchantedItemInUse) optional.get()).itemStack(); diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java -index 86197725f0f2ac1e650297ae7a79907578e0e8f1..5e86f7d7d7594bd82c50db6d17763a50dc58e7a5 100644 +index 312b57b4ef340935f4335989ce1d6a4b8b61532c..930cc4c38a7c7631b140f7735cb03f4c82553375 100644 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java @@ -643,6 +643,16 @@ public final class ItemStack implements DataComponentHolder { @@ -89,7 +89,7 @@ index fce49b17905ab97e691aa8499a5dfed67adf0c40..5ef8f69a4271c0a70380b5bd321735ff MutableBoolean mutableBoolean = new MutableBoolean(false); runIterationOnItem(stack, (enchantment, level) -> { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index e6333a4177e5e3bde40fa66d57299e676b8aebef..69df43378e11579715fac8afbed3207892d69242 100644 +index 240c34bd95be07f19fb92d9b6678e6feffe2430e..9c87144050ed62ca030e51ae08d8a977e935ba68 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -95,6 +95,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0054-Add-5-second-tps-average-in-tps.patch b/patches/server/0055-Add-5-second-tps-average-in-tps.patch similarity index 100% rename from patches/server/0054-Add-5-second-tps-average-in-tps.patch rename to patches/server/0055-Add-5-second-tps-average-in-tps.patch diff --git a/patches/server/0055-Implement-elytra-settings.patch b/patches/server/0056-Implement-elytra-settings.patch similarity index 96% rename from patches/server/0055-Implement-elytra-settings.patch rename to patches/server/0056-Implement-elytra-settings.patch index 7b2541400..8cf62b22c 100644 --- a/patches/server/0055-Implement-elytra-settings.patch +++ b/patches/server/0056-Implement-elytra-settings.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Implement elytra settings diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index f35663c26b17a5c89cd4dbb3c9d1a439018b3b07..6f6427b47d5ec64fedcc9c50ee9e11618ba8a672 100644 +index 6f7188ccba2675264ba8fbfd05cacc1c60211157..b183a9e42178ff02c5d70abacee3cfaa7b7b93c3 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3558,7 +3558,16 @@ public abstract class LivingEntity extends Entity implements Attackable { @@ -46,7 +46,7 @@ index 218f2f085309f04438f8b07bc41cf242583db2dc..ea8e49b42b9dde74784189430be66ed6 itemStack.shrink(1); } else ((net.minecraft.server.level.ServerPlayer) user).getBukkitEntity().updateInventory(); diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java -index 5e86f7d7d7594bd82c50db6d17763a50dc58e7a5..ff721322468571aa86aa1fadf4e59fc0e62c457a 100644 +index 930cc4c38a7c7631b140f7735cb03f4c82553375..bb9f480e5a2083633ddde5607b05048bab5f1b52 100644 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java @@ -675,6 +675,7 @@ public final class ItemStack implements DataComponentHolder { @@ -90,7 +90,7 @@ index f1b2d388a1a40a1d909a2e726f32d6c15e1eb0eb..4934bae61114b49a9f8d0ed044fbb881 entityhuman.startAutoSpinAttack(20, 8.0F, stack); if (entityhuman.onGround()) { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 69df43378e11579715fac8afbed3207892d69242..b1f8030868c938525916011b8a207058b702d4b8 100644 +index 9c87144050ed62ca030e51ae08d8a977e935ba68..e408d9753b6e2bae9bf276e60c3670654ab4782f 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -112,6 +112,19 @@ public class PurpurWorldConfig { diff --git a/patches/server/0056-Item-entity-immunities.patch b/patches/server/0057-Item-entity-immunities.patch similarity index 98% rename from patches/server/0056-Item-entity-immunities.patch rename to patches/server/0057-Item-entity-immunities.patch index 8f7f8edcc..b45acf6dd 100644 --- a/patches/server/0056-Item-entity-immunities.patch +++ b/patches/server/0057-Item-entity-immunities.patch @@ -117,7 +117,7 @@ index 30d62ee4d5cd2ddacb8783b5bbbf475d592b3e02..01e4395f1669d21c30465aa1366bd2f1 + // Purpur end } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index b1f8030868c938525916011b8a207058b702d4b8..1c8ce9506007cdd68f314af866ea99a7cf1fc2e9 100644 +index e408d9753b6e2bae9bf276e60c3670654ab4782f..06acffbb57d961d1c8a48bce5983b063146181f3 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -125,6 +125,49 @@ public class PurpurWorldConfig { diff --git a/patches/server/0057-Add-ping-command.patch b/patches/server/0058-Add-ping-command.patch similarity index 97% rename from patches/server/0057-Add-ping-command.patch rename to patches/server/0058-Add-ping-command.patch index 28f0ecd98..2c0a77539 100644 --- a/patches/server/0057-Add-ping-command.patch +++ b/patches/server/0058-Add-ping-command.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add ping command diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java -index f12f208c1c4669b0aae35cb86b122bbf06fd884a..7af65fb843142ae1dbc4bc3a3b449f2463e5da55 100644 +index f5989a4e4a9f6d983d664a9f74ccdfebf91ed4d9..3bb11eeff4e855ae9a57f8179491c1756d14e04e 100644 --- a/src/main/java/net/minecraft/commands/Commands.java +++ b/src/main/java/net/minecraft/commands/Commands.java @@ -250,6 +250,7 @@ public class Commands { diff --git a/patches/server/0058-Add-demo-command.patch b/patches/server/0059-Add-demo-command.patch similarity index 97% rename from patches/server/0058-Add-demo-command.patch rename to patches/server/0059-Add-demo-command.patch index 255c73c3d..9d9c4185f 100644 --- a/patches/server/0058-Add-demo-command.patch +++ b/patches/server/0059-Add-demo-command.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add demo command diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java -index 7af65fb843142ae1dbc4bc3a3b449f2463e5da55..df5343bb6c4987e2c81b3eb33f131e2db93f9ddd 100644 +index 3bb11eeff4e855ae9a57f8179491c1756d14e04e..1da5184311b51494ca0cf426ba466404599b8d2c 100644 --- a/src/main/java/net/minecraft/commands/Commands.java +++ b/src/main/java/net/minecraft/commands/Commands.java @@ -250,6 +250,7 @@ public class Commands { diff --git a/patches/server/0059-Add-credits-command.patch b/patches/server/0060-Add-credits-command.patch similarity index 97% rename from patches/server/0059-Add-credits-command.patch rename to patches/server/0060-Add-credits-command.patch index d8935f0e2..4cc792c51 100644 --- a/patches/server/0059-Add-credits-command.patch +++ b/patches/server/0060-Add-credits-command.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add credits command diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java -index df5343bb6c4987e2c81b3eb33f131e2db93f9ddd..a8f81bcbfccbce42ca4d194fcaa35222c0a547cb 100644 +index 1da5184311b51494ca0cf426ba466404599b8d2c..c44832599a95039f9ca0f772e7b405e40d7a97b5 100644 --- a/src/main/java/net/minecraft/commands/Commands.java +++ b/src/main/java/net/minecraft/commands/Commands.java @@ -250,6 +250,7 @@ public class Commands { diff --git a/patches/server/0060-Configurable-jockey-options.patch b/patches/server/0061-Configurable-jockey-options.patch similarity index 97% rename from patches/server/0060-Configurable-jockey-options.patch rename to patches/server/0061-Configurable-jockey-options.patch index 505b055f5..988c51d2c 100644 --- a/patches/server/0060-Configurable-jockey-options.patch +++ b/patches/server/0061-Configurable-jockey-options.patch @@ -167,7 +167,7 @@ index 883cd9a96a1d4276ca10c5558b553c36a1bb0d79..0dcf5638e12c7670e6a5e577210e2542 public void setPersistentAngerTarget(@Nullable UUID angryAt) { this.persistentAngerTarget = angryAt; diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 1c8ce9506007cdd68f314af866ea99a7cf1fc2e9..5f72a1a5a4f26d2a6fa595c72e3557a10a3f5107 100644 +index 06acffbb57d961d1c8a48bce5983b063146181f3..803387f232c25ed43c252fa05335e5e1915048ff 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -610,6 +610,9 @@ public class PurpurWorldConfig { @@ -210,7 +210,7 @@ index 1c8ce9506007cdd68f314af866ea99a7cf1fc2e9..5f72a1a5a4f26d2a6fa595c72e3557a1 } public boolean illusionerRidable = false; -@@ -1692,6 +1704,9 @@ public class PurpurWorldConfig { +@@ -1696,6 +1708,9 @@ public class PurpurWorldConfig { public boolean zombieControllable = true; public double zombieMaxHealth = 20.0D; public double zombieSpawnReinforcements = 0.1D; @@ -220,7 +220,7 @@ index 1c8ce9506007cdd68f314af866ea99a7cf1fc2e9..5f72a1a5a4f26d2a6fa595c72e3557a1 private void zombieSettings() { zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable); zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater); -@@ -1703,6 +1718,9 @@ public class PurpurWorldConfig { +@@ -1707,6 +1722,9 @@ public class PurpurWorldConfig { } zombieMaxHealth = getDouble("mobs.zombie.attributes.max_health", zombieMaxHealth); zombieSpawnReinforcements = getDouble("mobs.zombie.attributes.spawn_reinforcements", zombieSpawnReinforcements); @@ -230,7 +230,7 @@ index 1c8ce9506007cdd68f314af866ea99a7cf1fc2e9..5f72a1a5a4f26d2a6fa595c72e3557a1 } public boolean zombieHorseRidable = false; -@@ -1739,6 +1757,9 @@ public class PurpurWorldConfig { +@@ -1743,6 +1761,9 @@ public class PurpurWorldConfig { public boolean zombieVillagerControllable = true; public double zombieVillagerMaxHealth = 20.0D; public double zombieVillagerSpawnReinforcements = 0.1D; @@ -240,7 +240,7 @@ index 1c8ce9506007cdd68f314af866ea99a7cf1fc2e9..5f72a1a5a4f26d2a6fa595c72e3557a1 private void zombieVillagerSettings() { zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable); zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater); -@@ -1750,6 +1771,9 @@ public class PurpurWorldConfig { +@@ -1754,6 +1775,9 @@ public class PurpurWorldConfig { } zombieVillagerMaxHealth = getDouble("mobs.zombie_villager.attributes.max_health", zombieVillagerMaxHealth); zombieVillagerSpawnReinforcements = getDouble("mobs.zombie_villager.attributes.spawn_reinforcements", zombieVillagerSpawnReinforcements); @@ -250,7 +250,7 @@ index 1c8ce9506007cdd68f314af866ea99a7cf1fc2e9..5f72a1a5a4f26d2a6fa595c72e3557a1 } public boolean zombifiedPiglinRidable = false; -@@ -1757,6 +1781,9 @@ public class PurpurWorldConfig { +@@ -1761,6 +1785,9 @@ public class PurpurWorldConfig { public boolean zombifiedPiglinControllable = true; public double zombifiedPiglinMaxHealth = 20.0D; public double zombifiedPiglinSpawnReinforcements = 0.0D; @@ -260,7 +260,7 @@ index 1c8ce9506007cdd68f314af866ea99a7cf1fc2e9..5f72a1a5a4f26d2a6fa595c72e3557a1 private void zombifiedPiglinSettings() { zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable); zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater); -@@ -1768,5 +1795,8 @@ public class PurpurWorldConfig { +@@ -1772,5 +1799,8 @@ public class PurpurWorldConfig { } zombifiedPiglinMaxHealth = getDouble("mobs.zombified_piglin.attributes.max_health", zombifiedPiglinMaxHealth); zombifiedPiglinSpawnReinforcements = getDouble("mobs.zombified_piglin.attributes.spawn_reinforcements", zombifiedPiglinSpawnReinforcements); diff --git a/patches/server/0061-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch b/patches/server/0062-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch similarity index 99% rename from patches/server/0061-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch rename to patches/server/0062-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch index f99ae775e..42053e2f9 100644 --- a/patches/server/0061-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch +++ b/patches/server/0062-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch @@ -256,7 +256,7 @@ index 4dea7aed072caf383986e09ead8ee790b35d9706..7a80cb45ff5d96380755d37ff43ddeac private float speed = 0.1F; diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 5f72a1a5a4f26d2a6fa595c72e3557a10a3f5107..b9b9d23929cc390ebb97e93758f6b746606edc95 100644 +index 803387f232c25ed43c252fa05335e5e1915048ff..bfa1ed9e0927f919648ab67ae49681fcd1286e3a 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1087,6 +1087,9 @@ public class PurpurWorldConfig { diff --git a/patches/server/0062-Add-phantom-spawning-options.patch b/patches/server/0063-Add-phantom-spawning-options.patch similarity index 98% rename from patches/server/0062-Add-phantom-spawning-options.patch rename to patches/server/0063-Add-phantom-spawning-options.patch index 926490bad..63bf22cea 100644 --- a/patches/server/0062-Add-phantom-spawning-options.patch +++ b/patches/server/0063-Add-phantom-spawning-options.patch @@ -40,7 +40,7 @@ index 1b1b475ca27e799e251d6f8a8c9fe1a4fd8bae83..04f67f7b43d2f461c776c76614dc3e5f for (int l = 0; l < k; ++l) { // Paper start - PhantomPreSpawnEvent diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index b9b9d23929cc390ebb97e93758f6b746606edc95..1ce621db17377c3f35151096db9bca048161981c 100644 +index bfa1ed9e0927f919648ab67ae49681fcd1286e3a..07f3b64e5d117957262ce6c8290052d707d17508 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1090,6 +1090,12 @@ public class PurpurWorldConfig { diff --git a/patches/server/0063-Implement-bed-explosion-options.patch b/patches/server/0064-Implement-bed-explosion-options.patch similarity index 97% rename from patches/server/0063-Implement-bed-explosion-options.patch rename to patches/server/0064-Implement-bed-explosion-options.patch index 19cae2047..9a8b35ef0 100644 --- a/patches/server/0063-Implement-bed-explosion-options.patch +++ b/patches/server/0064-Implement-bed-explosion-options.patch @@ -27,7 +27,7 @@ index 85d598c3354ee62f0fd1b26e485e0084967c0380..b59dd6b512021c335f3c21999958e2ea } } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 1ce621db17377c3f35151096db9bca048161981c..ff9d6c6b5e999c61f450d90327dff9461b7bc34a 100644 +index 07f3b64e5d117957262ce6c8290052d707d17508..6c4ada076bcabfbf0622e66ccaeaf3508ec6826c 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -284,6 +284,27 @@ public class PurpurWorldConfig { diff --git a/patches/server/0064-Implement-respawn-anchor-explosion-options.patch b/patches/server/0065-Implement-respawn-anchor-explosion-options.patch similarity index 97% rename from patches/server/0064-Implement-respawn-anchor-explosion-options.patch rename to patches/server/0065-Implement-respawn-anchor-explosion-options.patch index 9086ff605..0c6e14778 100644 --- a/patches/server/0064-Implement-respawn-anchor-explosion-options.patch +++ b/patches/server/0065-Implement-respawn-anchor-explosion-options.patch @@ -18,7 +18,7 @@ index 94d067e9eeee73183de25165d8c97043fe256103..00b6941951e1af9993f8f6da5425d31b public static boolean canSetSpawn(Level world) { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index ff9d6c6b5e999c61f450d90327dff9461b7bc34a..a922ae826a3c542094eacd551a9aa04cd81fd02b 100644 +index 6c4ada076bcabfbf0622e66ccaeaf3508ec6826c..709afe70fccfc31457a4743f441cdeb9f6abb9f9 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -324,6 +324,27 @@ public class PurpurWorldConfig { diff --git a/patches/server/0065-Add-allow-water-in-end-world-option.patch b/patches/server/0066-Add-allow-water-in-end-world-option.patch similarity index 100% rename from patches/server/0065-Add-allow-water-in-end-world-option.patch rename to patches/server/0066-Add-allow-water-in-end-world-option.patch diff --git a/patches/server/0066-Allow-color-codes-in-books.patch b/patches/server/0067-Allow-color-codes-in-books.patch similarity index 98% rename from patches/server/0066-Allow-color-codes-in-books.patch rename to patches/server/0067-Allow-color-codes-in-books.patch index 5d0976102..e4be1dbba 100644 --- a/patches/server/0066-Allow-color-codes-in-books.patch +++ b/patches/server/0067-Allow-color-codes-in-books.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Allow color codes in books diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 58e3f6f0febff3956b80ebeab387c46deb5fe8ae..9d5c044ec96be46c8ad32579e9a719fccf9f17f5 100644 +index dce0df639765a1c49b23f592c08cce14278f67b7..a2381960e213ade5ade22ad180666e4b74185beb 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1203,10 +1203,14 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0067-Entity-lifespan.patch b/patches/server/0068-Entity-lifespan.patch similarity index 98% rename from patches/server/0067-Entity-lifespan.patch rename to patches/server/0068-Entity-lifespan.patch index 6a64262b1..f2215900b 100644 --- a/patches/server/0067-Entity-lifespan.patch +++ b/patches/server/0068-Entity-lifespan.patch @@ -94,7 +94,7 @@ index 28ff18c341703148e880e4d4a64b73daa136c32a..1ebc4a8a54081ac9b3ba01e651d611f0 } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index a922ae826a3c542094eacd551a9aa04cd81fd02b..f601c4b0c40706a241ca2906f07dfcd869afe9cd 100644 +index 709afe70fccfc31457a4743f441cdeb9f6abb9f9..ccd571d2e4971a281479c24c7f84388ba3fbbf65 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -125,6 +125,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0068-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch b/patches/server/0069-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch similarity index 97% rename from patches/server/0068-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch rename to patches/server/0069-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch index a37c5bf99..6c6ac98a6 100644 --- a/patches/server/0068-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch +++ b/patches/server/0069-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch @@ -48,7 +48,7 @@ index b183a9e42178ff02c5d70abacee3cfaa7b7b93c3..d9215a42c8dd761fa04269c936ed0cca } } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index f601c4b0c40706a241ca2906f07dfcd869afe9cd..efc357e2a4eb33a8e77c84599d88103b29542dca 100644 +index ccd571d2e4971a281479c24c7f84388ba3fbbf65..859ea7beb9f9644d45f805c1ecc18e7b87be67a7 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -242,6 +242,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0069-Squid-EAR-immunity.patch b/patches/server/0070-Squid-EAR-immunity.patch similarity index 95% rename from patches/server/0069-Squid-EAR-immunity.patch rename to patches/server/0070-Squid-EAR-immunity.patch index 38de02c58..46b98e6fb 100644 --- a/patches/server/0069-Squid-EAR-immunity.patch +++ b/patches/server/0070-Squid-EAR-immunity.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Squid EAR immunity diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index efc357e2a4eb33a8e77c84599d88103b29542dca..9873f78eb7f4739c65014b0a0c63c328813c0d9c 100644 +index 859ea7beb9f9644d45f805c1ecc18e7b87be67a7..1da67c207b18e4c0eaf9a822360dbbe3215e7a6d 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1475,6 +1475,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0070-Phantoms-burn-in-light.patch b/patches/server/0071-Phantoms-burn-in-light.patch similarity index 98% rename from patches/server/0070-Phantoms-burn-in-light.patch rename to patches/server/0071-Phantoms-burn-in-light.patch index cb7813195..ace26bcf6 100644 --- a/patches/server/0070-Phantoms-burn-in-light.patch +++ b/patches/server/0071-Phantoms-burn-in-light.patch @@ -51,7 +51,7 @@ index 7a80cb45ff5d96380755d37ff43ddeac2cd451e1..8f221fe016ea7221eb3a2116a2213139 list.sort(Comparator.comparing((Entity e) -> { return e.getY(); }).reversed()); // CraftBukkit - decompile error Iterator iterator = list.iterator(); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 9873f78eb7f4739c65014b0a0c63c328813c0d9c..42ca14fb05af1c3088143aab064ea6fc594ade6e 100644 +index 1da67c207b18e4c0eaf9a822360dbbe3215e7a6d..2c6167946e8186f378142b0cd02b71abf1780bea 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1145,6 +1145,9 @@ public class PurpurWorldConfig { diff --git a/patches/server/0071-Configurable-villager-breeding.patch b/patches/server/0072-Configurable-villager-breeding.patch similarity index 78% rename from patches/server/0071-Configurable-villager-breeding.patch rename to patches/server/0072-Configurable-villager-breeding.patch index 9324dd165..86805b5a0 100644 --- a/patches/server/0071-Configurable-villager-breeding.patch +++ b/patches/server/0072-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 4ae45a7dae279cb1b8048ce4eff2aa1ae4e19f68..a72089363b458a9a880d31c9e2ae7aed500a4f7a 100644 +index 33c0ac18fa4c5b47d60cc774fe72d2d68c14e025..ad3e340c2487aa1dc2ed3ab08fa8747b7516022e 100644 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java -@@ -774,7 +774,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler +@@ -779,7 +779,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler @Override public boolean canBreed() { @@ -18,21 +18,21 @@ index 4ae45a7dae279cb1b8048ce4eff2aa1ae4e19f68..a72089363b458a9a880d31c9e2ae7aed private boolean hungry() { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 42ca14fb05af1c3088143aab064ea6fc594ade6e..e45b2ec9d119623ec53104a602aadc0ad4949f1d 100644 +index 2c6167946e8186f378142b0cd02b71abf1780bea..2a8ec23926af200a8bd8d33ecd930387117fc71b 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -@@ -1632,6 +1632,7 @@ public class PurpurWorldConfig { - public boolean villagerControllable = true; +@@ -1633,6 +1633,7 @@ public class PurpurWorldConfig { public double villagerMaxHealth = 20.0D; public boolean villagerFollowEmeraldBlock = false; + public boolean villagerCanBeLeashed = false; + public boolean villagerCanBreed = true; private void villagerSettings() { villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable); villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater); -@@ -1643,6 +1644,7 @@ public class PurpurWorldConfig { - } +@@ -1645,6 +1646,7 @@ public class PurpurWorldConfig { villagerMaxHealth = getDouble("mobs.villager.attributes.max_health", villagerMaxHealth); villagerFollowEmeraldBlock = getBoolean("mobs.villager.follow-emerald-blocks", villagerFollowEmeraldBlock); + villagerCanBeLeashed = getBoolean("mobs.villager.can-be-leashed", villagerCanBeLeashed); + villagerCanBreed = getBoolean("mobs.villager.can-breed", villagerCanBreed); } diff --git a/patches/server/0072-Redstone-deactivates-spawners.patch b/patches/server/0073-Redstone-deactivates-spawners.patch similarity index 94% rename from patches/server/0072-Redstone-deactivates-spawners.patch rename to patches/server/0073-Redstone-deactivates-spawners.patch index b1fec444e..dad11ae23 100644 --- a/patches/server/0072-Redstone-deactivates-spawners.patch +++ b/patches/server/0073-Redstone-deactivates-spawners.patch @@ -17,7 +17,7 @@ index f57e1b78204dff661ad5d3ee93a88a00330af2dc..967af8771ff8564c715d89f4b4b69b16 } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index e45b2ec9d119623ec53104a602aadc0ad4949f1d..41c097246b84920187969e4cac72d6d025a2a926 100644 +index 2a8ec23926af200a8bd8d33ecd930387117fc71b..03586ea6d669022461e02ead826596167f5bd1ae 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -352,6 +352,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0073-Totems-work-in-inventory.patch b/patches/server/0074-Totems-work-in-inventory.patch similarity index 93% rename from patches/server/0073-Totems-work-in-inventory.patch rename to patches/server/0074-Totems-work-in-inventory.patch index bda1a71a6..15ee7c024 100644 --- a/patches/server/0073-Totems-work-in-inventory.patch +++ b/patches/server/0074-Totems-work-in-inventory.patch @@ -5,7 +5,7 @@ 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 7ac62e6ada528e6efe1ea49db1a40edc891d74a8..d7175268bf615e20a7e14ad024ab5e3843c91f64 100644 +index d9215a42c8dd761fa04269c936ed0cca3d96ff84..7fa56c1bb7ba6a535a486cd452358b6d2dc59d9b 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1630,6 +1630,18 @@ public abstract class LivingEntity extends Entity implements Attackable { @@ -28,7 +28,7 @@ index 7ac62e6ada528e6efe1ea49db1a40edc891d74a8..d7175268bf615e20a7e14ad024ab5e38 EntityResurrectEvent event = new EntityResurrectEvent((org.bukkit.entity.LivingEntity) this.getBukkitEntity(), handSlot); event.setCancelled(itemstack == null); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 41c097246b84920187969e4cac72d6d025a2a926..5f0610d06902aa1fea9cd130ea2724b809790e0e 100644 +index 03586ea6d669022461e02ead826596167f5bd1ae..1c4446ce2ca2e9c9d3d85a38752a6f27f8121d12 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -243,6 +243,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0074-Add-vindicator-johnny-spawn-chance.patch b/patches/server/0075-Add-vindicator-johnny-spawn-chance.patch similarity index 91% rename from patches/server/0074-Add-vindicator-johnny-spawn-chance.patch rename to patches/server/0075-Add-vindicator-johnny-spawn-chance.patch index 899ff3440..efef76b65 100644 --- a/patches/server/0074-Add-vindicator-johnny-spawn-chance.patch +++ b/patches/server/0075-Add-vindicator-johnny-spawn-chance.patch @@ -21,10 +21,10 @@ index eb6dce8b2dcc7f4e63c69cfa6acbd9b36a923706..feb7eb93bd20e141ff86ed2e91b9cd0f } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 5f0610d06902aa1fea9cd130ea2724b809790e0e..c5c7ba3449fea61b8a94a99e97867f5d47be5c38 100644 +index 1c4446ce2ca2e9c9d3d85a38752a6f27f8121d12..8df777ce71b649de697bbf9b77636f3a30df3d1c 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -@@ -1658,6 +1658,7 @@ public class PurpurWorldConfig { +@@ -1660,6 +1660,7 @@ public class PurpurWorldConfig { public boolean vindicatorRidableInWater = true; public boolean vindicatorControllable = true; public double vindicatorMaxHealth = 24.0D; @@ -32,7 +32,7 @@ index 5f0610d06902aa1fea9cd130ea2724b809790e0e..c5c7ba3449fea61b8a94a99e97867f5d private void vindicatorSettings() { vindicatorRidable = getBoolean("mobs.vindicator.ridable", vindicatorRidable); vindicatorRidableInWater = getBoolean("mobs.vindicator.ridable-in-water", vindicatorRidableInWater); -@@ -1668,6 +1669,7 @@ public class PurpurWorldConfig { +@@ -1670,6 +1671,7 @@ public class PurpurWorldConfig { set("mobs.vindicator.attributes.max_health", oldValue); } vindicatorMaxHealth = getDouble("mobs.vindicator.attributes.max_health", vindicatorMaxHealth); diff --git a/patches/server/0075-Dispensers-place-anvils-option.patch b/patches/server/0076-Dispensers-place-anvils-option.patch similarity index 92% rename from patches/server/0075-Dispensers-place-anvils-option.patch rename to patches/server/0076-Dispensers-place-anvils-option.patch index b95656d4e..df856f765 100644 --- a/patches/server/0075-Dispensers-place-anvils-option.patch +++ b/patches/server/0076-Dispensers-place-anvils-option.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Dispensers place anvils option diff --git a/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java b/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java -index 9d71388c6e8ff56228afbf8cb18c37f861d0b246..b659f413d8c771e4b3b2e79a03ca21b72fba98a1 100644 +index 7bf250bba4179a506c0a39b7866a9389552d2905..6548e595ab5c06044be438bc7eac181f413c261a 100644 --- a/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java +++ b/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java @@ -1015,5 +1015,22 @@ public interface DispenseItemBehavior { @@ -32,7 +32,7 @@ index 9d71388c6e8ff56228afbf8cb18c37f861d0b246..b659f413d8c771e4b3b2e79a03ca21b7 } } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index c5c7ba3449fea61b8a94a99e97867f5d47be5c38..3d5c523611532b35453b86524af80d66879638c4 100644 +index 8df777ce71b649de697bbf9b77636f3a30df3d1c..913238de812cdb9e745201a28f5200f4c457d537 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -315,8 +315,10 @@ public class PurpurWorldConfig { diff --git a/patches/server/0076-Allow-anvil-colors.patch b/patches/server/0077-Allow-anvil-colors.patch similarity index 98% rename from patches/server/0076-Allow-anvil-colors.patch rename to patches/server/0077-Allow-anvil-colors.patch index c66485794..80b79488e 100644 --- a/patches/server/0076-Allow-anvil-colors.patch +++ b/patches/server/0077-Allow-anvil-colors.patch @@ -64,7 +64,7 @@ index 2348ee0065367ade5354d54aac53ab23d43d0622..48d803a3e8419a04fce934263f7a01db } } else if (itemstack.has(DataComponents.CUSTOM_NAME)) { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 3d5c523611532b35453b86524af80d66879638c4..e065cd4d0bc1f0ffe04023ceaa024d0598f343e9 100644 +index 913238de812cdb9e745201a28f5200f4c457d537..d6ebaed09f0b84ec7641ad660f47aed95fdac1b9 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -293,6 +293,13 @@ public class PurpurWorldConfig { diff --git a/patches/server/0077-Add-option-to-disable-dolphin-treasure-searching.patch b/patches/server/0078-Add-option-to-disable-dolphin-treasure-searching.patch similarity index 95% rename from patches/server/0077-Add-option-to-disable-dolphin-treasure-searching.patch rename to patches/server/0078-Add-option-to-disable-dolphin-treasure-searching.patch index e0905ce6c..d068a0e3d 100644 --- a/patches/server/0077-Add-option-to-disable-dolphin-treasure-searching.patch +++ b/patches/server/0078-Add-option-to-disable-dolphin-treasure-searching.patch @@ -17,7 +17,7 @@ index e60464efd9986e1cf857d8595b13535df7ffc7b1..30da8d977d5b591d6bce619eba71181c } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index e065cd4d0bc1f0ffe04023ceaa024d0598f343e9..5ff9c2977b4efd67743b898219ba0a68bfb92dd8 100644 +index d6ebaed09f0b84ec7641ad660f47aed95fdac1b9..dff99dafb0869106fc8f70ee583ba8e269e07777 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -632,6 +632,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0078-Short-enderman-height.patch b/patches/server/0079-Short-enderman-height.patch similarity index 100% rename from patches/server/0078-Short-enderman-height.patch rename to patches/server/0079-Short-enderman-height.patch diff --git a/patches/server/0079-Stop-squids-floating-on-top-of-water.patch b/patches/server/0080-Stop-squids-floating-on-top-of-water.patch similarity index 93% rename from patches/server/0079-Stop-squids-floating-on-top-of-water.patch rename to patches/server/0080-Stop-squids-floating-on-top-of-water.patch index 5da55c518..06d817abc 100644 --- a/patches/server/0079-Stop-squids-floating-on-top-of-water.patch +++ b/patches/server/0080-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 ccee271764b3bffff1a7d302d71a02c8533ff8cc..db9c0ac1f307c2750af1a4df07964b01955ff75d 100644 +index 92c7c8e75a8d8d97496b24bf0b6719aeeb1440dc..501684ad04b5ecfb20570284cf1031a84544a4c6 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -4298,6 +4298,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -4299,6 +4299,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess return Mth.lerp(delta, this.yRotO, this.yRot); } @@ -54,7 +54,7 @@ index c8f7c43134e7c51ce8af5b3c1a28c11db67715a2..5b98889715bf62eb4f15c0b45ada2c70 + // Purpur } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 5ff9c2977b4efd67743b898219ba0a68bfb92dd8..83e5f4437e88d56060db2278e8fa2dbba5256d64 100644 +index dff99dafb0869106fc8f70ee583ba8e269e07777..0ca54a08809ff058912a82e3a8e611cbfe61b682 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1500,6 +1500,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0080-Crying-obsidian-valid-for-portal-frames.patch b/patches/server/0081-Crying-obsidian-valid-for-portal-frames.patch similarity index 100% rename from patches/server/0080-Crying-obsidian-valid-for-portal-frames.patch rename to patches/server/0081-Crying-obsidian-valid-for-portal-frames.patch diff --git a/patches/server/0081-LivingEntity-broadcastItemBreak.patch b/patches/server/0082-LivingEntity-broadcastItemBreak.patch similarity index 100% rename from patches/server/0081-LivingEntity-broadcastItemBreak.patch rename to patches/server/0082-LivingEntity-broadcastItemBreak.patch diff --git a/patches/server/0082-Customizable-wither-health-and-healing.patch b/patches/server/0083-Customizable-wither-health-and-healing.patch similarity index 92% rename from patches/server/0082-Customizable-wither-health-and-healing.patch rename to patches/server/0083-Customizable-wither-health-and-healing.patch index 3b4b499fc..01d88df79 100644 --- a/patches/server/0082-Customizable-wither-health-and-healing.patch +++ b/patches/server/0083-Customizable-wither-health-and-healing.patch @@ -23,10 +23,10 @@ index c4894f62a2c3d84d063e5caa5a38df80575660cb..8f1458d250bb875396c6318a7abc520f this.bossEvent.setProgress(this.getHealth() / this.getMaxHealth()); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 83e5f4437e88d56060db2278e8fa2dbba5256d64..349129c09abb8d33b02753fe85412bf7b2ad3d72 100644 +index 0ca54a08809ff058912a82e3a8e611cbfe61b682..07160ebf5890dbbd1daa590055f7f6c03fdcae78 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -@@ -1733,6 +1733,8 @@ public class PurpurWorldConfig { +@@ -1737,6 +1737,8 @@ public class PurpurWorldConfig { public boolean witherControllable = true; public double witherMaxY = 320D; public double witherMaxHealth = 300.0D; @@ -35,7 +35,7 @@ index 83e5f4437e88d56060db2278e8fa2dbba5256d64..349129c09abb8d33b02753fe85412bf7 private void witherSettings() { witherRidable = getBoolean("mobs.wither.ridable", witherRidable); witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater); -@@ -1748,6 +1750,8 @@ public class PurpurWorldConfig { +@@ -1752,6 +1754,8 @@ public class PurpurWorldConfig { set("mobs.wither.attributes.max_health", oldValue); } witherMaxHealth = getDouble("mobs.wither.attributes.max_health", witherMaxHealth); diff --git a/patches/server/0083-Allow-toggling-special-MobSpawners-per-world.patch b/patches/server/0084-Allow-toggling-special-MobSpawners-per-world.patch similarity index 98% rename from patches/server/0083-Allow-toggling-special-MobSpawners-per-world.patch rename to patches/server/0084-Allow-toggling-special-MobSpawners-per-world.patch index cc439c6fd..054a6307a 100644 --- a/patches/server/0083-Allow-toggling-special-MobSpawners-per-world.patch +++ b/patches/server/0084-Allow-toggling-special-MobSpawners-per-world.patch @@ -59,7 +59,7 @@ index c72b6ea5530e54fc373c701028e1c147cea34b59..96e9fce5f9084737d2fcf4deb8330573 if (spawnplacementtype.isSpawnPositionOk(world, blockposition2, EntityType.WANDERING_TRADER)) { blockposition1 = blockposition2; diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 349129c09abb8d33b02753fe85412bf7b2ad3d72..41f29a0b6aaa76f2a1d4f269849f442f89cec6ac 100644 +index 07160ebf5890dbbd1daa590055f7f6c03fdcae78..f517a050e7634b0c7616a5c9878b78a3c0706cfa 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -69,6 +69,12 @@ public class PurpurWorldConfig { diff --git a/patches/server/0084-Raid-cooldown-setting.patch b/patches/server/0085-Raid-cooldown-setting.patch similarity index 97% rename from patches/server/0084-Raid-cooldown-setting.patch rename to patches/server/0085-Raid-cooldown-setting.patch index 20857746f..923a4964b 100644 --- a/patches/server/0084-Raid-cooldown-setting.patch +++ b/patches/server/0085-Raid-cooldown-setting.patch @@ -49,7 +49,7 @@ index 8c60f71270d909c10e6617eb64b8fdb42deb73e9..eedce2a3d67d875d5174ee125e267948 if (!raid.isStarted() && !this.raidMap.containsKey(raid.getId())) { this.raidMap.put(raid.getId(), raid); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 41f29a0b6aaa76f2a1d4f269849f442f89cec6ac..44ade9073446e80685bf264571a3922fbab5fb08 100644 +index f517a050e7634b0c7616a5c9878b78a3c0706cfa..bd6d7f795d81095d22e975e37835e53685c56f54 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -108,6 +108,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0085-Despawn-rate-config-options-per-projectile-type.patch b/patches/server/0086-Despawn-rate-config-options-per-projectile-type.patch similarity index 96% rename from patches/server/0085-Despawn-rate-config-options-per-projectile-type.patch rename to patches/server/0086-Despawn-rate-config-options-per-projectile-type.patch index 40da9e53a..f8e5d3131 100644 --- a/patches/server/0085-Despawn-rate-config-options-per-projectile-type.patch +++ b/patches/server/0086-Despawn-rate-config-options-per-projectile-type.patch @@ -7,7 +7,7 @@ This patch's implementation has been removed in favor of Pufferfish's entity-tim The config remains for migration purposes. diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 44ade9073446e80685bf264571a3922fbab5fb08..91c45e6da2ddd7547144f35f38cdfa2b3e1cc3fc 100644 +index bd6d7f795d81095d22e975e37835e53685c56f54..16b591138dc14414535ad48230a824597383a2fc 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -316,6 +316,40 @@ public class PurpurWorldConfig { diff --git a/patches/server/0086-Add-option-to-disable-zombie-aggressiveness-towards-.patch b/patches/server/0087-Add-option-to-disable-zombie-aggressiveness-towards-.patch similarity index 96% rename from patches/server/0086-Add-option-to-disable-zombie-aggressiveness-towards-.patch rename to patches/server/0087-Add-option-to-disable-zombie-aggressiveness-towards-.patch index b1a84c86e..48c69b555 100644 --- a/patches/server/0086-Add-option-to-disable-zombie-aggressiveness-towards-.patch +++ b/patches/server/0087-Add-option-to-disable-zombie-aggressiveness-towards-.patch @@ -70,10 +70,10 @@ index 43c48bb14957b93ee3b0191360c09f710bc008e0..b39d8ee4c6e9483a15991be3b1440384 this.targetSelector.addGoal(5, new NearestAttackableTargetGoal<>(this, Turtle.class, 10, true, false, Turtle.BABY_ON_LAND_SELECTOR)); } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 91c45e6da2ddd7547144f35f38cdfa2b3e1cc3fc..e1b809b493dddb6656903c10dd5e7d63037431c7 100644 +index 16b591138dc14414535ad48230a824597383a2fc..45ff2269cad6a54a2bcb5a46000555d6f56e77b9 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -@@ -1867,6 +1867,7 @@ public class PurpurWorldConfig { +@@ -1871,6 +1871,7 @@ public class PurpurWorldConfig { public boolean zombieJockeyOnlyBaby = true; public double zombieJockeyChance = 0.05D; public boolean zombieJockeyTryExistingChickens = true; @@ -81,7 +81,7 @@ index 91c45e6da2ddd7547144f35f38cdfa2b3e1cc3fc..e1b809b493dddb6656903c10dd5e7d63 private void zombieSettings() { zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable); zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater); -@@ -1881,6 +1882,7 @@ public class PurpurWorldConfig { +@@ -1885,6 +1886,7 @@ public class PurpurWorldConfig { zombieJockeyOnlyBaby = getBoolean("mobs.zombie.jockey.only-babies", zombieJockeyOnlyBaby); zombieJockeyChance = getDouble("mobs.zombie.jockey.chance", zombieJockeyChance); zombieJockeyTryExistingChickens = getBoolean("mobs.zombie.jockey.try-existing-chickens", zombieJockeyTryExistingChickens); diff --git a/patches/server/0087-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch b/patches/server/0088-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch similarity index 100% rename from patches/server/0087-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch rename to patches/server/0088-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch diff --git a/patches/server/0088-Flying-squids-Oh-my.patch b/patches/server/0089-Flying-squids-Oh-my.patch similarity index 98% rename from patches/server/0088-Flying-squids-Oh-my.patch rename to patches/server/0089-Flying-squids-Oh-my.patch index ba318a947..da2e6eab8 100644 --- a/patches/server/0088-Flying-squids-Oh-my.patch +++ b/patches/server/0089-Flying-squids-Oh-my.patch @@ -58,7 +58,7 @@ index df071be3179898b77ba82ce8697da18196f16ad8..b4cb9fc3f543b70233fe88a31565252e float g = Mth.cos(f) * 0.2F; float h = -0.1F + this.squid.getRandom().nextFloat() * 0.2F; diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index e1b809b493dddb6656903c10dd5e7d63037431c7..50e368eeaf0d34320a529fedc7ca6038b00c97bf 100644 +index 45ff2269cad6a54a2bcb5a46000555d6f56e77b9..ea071ec327ccfc524b3f6aefb46828e8cfc640c8 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -923,10 +923,12 @@ public class PurpurWorldConfig { diff --git a/patches/server/0089-Configurable-daylight-cycle.patch b/patches/server/0090-Configurable-daylight-cycle.patch similarity index 98% rename from patches/server/0089-Configurable-daylight-cycle.patch rename to patches/server/0090-Configurable-daylight-cycle.patch index 85aa48987..adfe4367c 100644 --- a/patches/server/0089-Configurable-daylight-cycle.patch +++ b/patches/server/0090-Configurable-daylight-cycle.patch @@ -88,7 +88,7 @@ index 6a2e5d18039310f8fbb3021db92d8f8f79c5c423..ce843a15043fb8bb40d96351ee00f044 public void tickCustomSpawners(boolean spawnMonsters, boolean spawnAnimals) { Iterator iterator = this.customSpawners.iterator(); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 50e368eeaf0d34320a529fedc7ca6038b00c97bf..c35776bd050820795edaed0cf9aa86cbfe1aed60 100644 +index ea071ec327ccfc524b3f6aefb46828e8cfc640c8..17295e0bebe94f76a18c71f5261ac99484e08bc9 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -120,6 +120,13 @@ public class PurpurWorldConfig { diff --git a/patches/server/0090-Furnace-uses-lava-from-underneath.patch b/patches/server/0091-Furnace-uses-lava-from-underneath.patch similarity index 97% rename from patches/server/0090-Furnace-uses-lava-from-underneath.patch rename to patches/server/0091-Furnace-uses-lava-from-underneath.patch index 4e836c76d..2acc5ddc7 100644 --- a/patches/server/0090-Furnace-uses-lava-from-underneath.patch +++ b/patches/server/0091-Furnace-uses-lava-from-underneath.patch @@ -39,7 +39,7 @@ index 730aca233f6e7564d4cb85b5b628d23c4f01d2f4..699bdc1f01a95ecdfe899493c8d81ec3 private static boolean canBurn(RegistryAccess registryManager, @Nullable RecipeHolder recipe, NonNullList slots, int count) { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index c35776bd050820795edaed0cf9aa86cbfe1aed60..aa6f4a02b9559fe1d60df0d57cdf72423fc12b76 100644 +index 17295e0bebe94f76a18c71f5261ac99484e08bc9..6398f3df493c6257398100ac92a6f65ae8740260 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -397,6 +397,17 @@ public class PurpurWorldConfig { diff --git a/patches/server/0091-Arrows-should-not-reset-despawn-counter.patch b/patches/server/0092-Arrows-should-not-reset-despawn-counter.patch similarity index 91% rename from patches/server/0091-Arrows-should-not-reset-despawn-counter.patch rename to patches/server/0092-Arrows-should-not-reset-despawn-counter.patch index 741dee159..9254d7b16 100644 --- a/patches/server/0091-Arrows-should-not-reset-despawn-counter.patch +++ b/patches/server/0092-Arrows-should-not-reset-despawn-counter.patch @@ -7,7 +7,7 @@ This prevents keeping arrows alive indefinitely (such as when the block the arrow is stuck in gets removed, like a piston head going up/down) diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java -index 0bf0e1586c80076a41b9f75b5e59e806b91bf825..4d8860c862a355969ec801c6a2a0abb95aabbfa6 100644 +index ddf47dab1ab92c45e3eea09239d418a9798ed59e..8d8944a0455b3401d84cab636d61447e7d51ab19 100644 --- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java +++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java @@ -356,7 +356,7 @@ public abstract class AbstractArrow extends Projectile { @@ -20,7 +20,7 @@ index 0bf0e1586c80076a41b9f75b5e59e806b91bf825..4d8860c862a355969ec801c6a2a0abb9 @Override diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index aa6f4a02b9559fe1d60df0d57cdf72423fc12b76..a8fbd9f4491076ae51a10b60047c28feac4e2ad3 100644 +index 6398f3df493c6257398100ac92a6f65ae8740260..fb942c024ee94f5d1b898a2b1c53b0cce9b9e0fd 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -101,6 +101,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0092-Ability-to-re-add-farmland-mechanics-from-Alpha.patch b/patches/server/0093-Ability-to-re-add-farmland-mechanics-from-Alpha.patch similarity index 95% rename from patches/server/0092-Ability-to-re-add-farmland-mechanics-from-Alpha.patch rename to patches/server/0093-Ability-to-re-add-farmland-mechanics-from-Alpha.patch index 8383d4d2e..eef53e64f 100644 --- a/patches/server/0092-Ability-to-re-add-farmland-mechanics-from-Alpha.patch +++ b/patches/server/0093-Ability-to-re-add-farmland-mechanics-from-Alpha.patch @@ -24,7 +24,7 @@ index da85fabd75e9bd5ebece7127ef5b512df16fe3ac..dc356bd0931af9bdab9ec71e3de66e88 return; } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index a8fbd9f4491076ae51a10b60047c28feac4e2ad3..54d4ee904372e2b5f3cc288e1c1438922ef082b4 100644 +index fb942c024ee94f5d1b898a2b1c53b0cce9b9e0fd..bce60b7f11b614cba639e716fdea5082a9f24722 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -398,8 +398,10 @@ public class PurpurWorldConfig { diff --git a/patches/server/0093-Add-adjustable-breeding-cooldown-to-config.patch b/patches/server/0094-Add-adjustable-breeding-cooldown-to-config.patch similarity index 98% rename from patches/server/0093-Add-adjustable-breeding-cooldown-to-config.patch rename to patches/server/0094-Add-adjustable-breeding-cooldown-to-config.patch index 049c2cdc8..2dfdd95b6 100644 --- a/patches/server/0093-Add-adjustable-breeding-cooldown-to-config.patch +++ b/patches/server/0094-Add-adjustable-breeding-cooldown-to-config.patch @@ -104,7 +104,7 @@ index 1da37b076fbbbd4b756fc30c5995995528653ddf..6b1dc40787e53723ff48b1ed4d408bb9 this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 54d4ee904372e2b5f3cc288e1c1438922ef082b4..aad064f27997ad4263de2d3afb162b53d2c891c1 100644 +index bce60b7f11b614cba639e716fdea5082a9f24722..faa6058548379cf38cdc8b6d4996eb44f5086700 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -114,6 +114,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0094-Make-entity-breeding-times-configurable.patch b/patches/server/0095-Make-entity-breeding-times-configurable.patch similarity index 99% rename from patches/server/0094-Make-entity-breeding-times-configurable.patch rename to patches/server/0095-Make-entity-breeding-times-configurable.patch index 30956457f..f908682d8 100644 --- a/patches/server/0094-Make-entity-breeding-times-configurable.patch +++ b/patches/server/0095-Make-entity-breeding-times-configurable.patch @@ -538,7 +538,7 @@ index 373bf138f8b77413e6c29724e01572f64e0bc005..d43e26af79be5078124d8013167f452b public boolean canBeLeashed() { return true; diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index aad064f27997ad4263de2d3afb162b53d2c891c1..49831c7589aefc6a9e9e5b9f563fe0330b3c2000 100644 +index faa6058548379cf38cdc8b6d4996eb44f5086700..6ec21dfc65117530fbfe9388f445d28cba887852 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -490,20 +490,24 @@ public class PurpurWorldConfig { @@ -941,23 +941,23 @@ index aad064f27997ad4263de2d3afb162b53d2c891c1..49831c7589aefc6a9e9e5b9f563fe033 } public boolean vexRidable = false; -@@ -1741,6 +1793,7 @@ public class PurpurWorldConfig { - public double villagerMaxHealth = 20.0D; +@@ -1742,6 +1794,7 @@ public class PurpurWorldConfig { public boolean villagerFollowEmeraldBlock = false; + public boolean villagerCanBeLeashed = false; public boolean villagerCanBreed = true; + public int villagerBreedingTicks = 6000; private void villagerSettings() { villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable); villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater); -@@ -1753,6 +1806,7 @@ public class PurpurWorldConfig { - villagerMaxHealth = getDouble("mobs.villager.attributes.max_health", villagerMaxHealth); +@@ -1755,6 +1808,7 @@ public class PurpurWorldConfig { villagerFollowEmeraldBlock = getBoolean("mobs.villager.follow-emerald-blocks", villagerFollowEmeraldBlock); + villagerCanBeLeashed = getBoolean("mobs.villager.can-be-leashed", villagerCanBeLeashed); villagerCanBreed = getBoolean("mobs.villager.can-breed", villagerCanBreed); + villagerBreedingTicks = getInt("mobs.villager.breeding-delay-ticks", villagerBreedingTicks); } public boolean vindicatorRidable = false; -@@ -1862,6 +1916,7 @@ public class PurpurWorldConfig { +@@ -1866,6 +1920,7 @@ public class PurpurWorldConfig { public boolean wolfRidableInWater = true; public boolean wolfControllable = true; public double wolfMaxHealth = 8.0D; @@ -965,7 +965,7 @@ index aad064f27997ad4263de2d3afb162b53d2c891c1..49831c7589aefc6a9e9e5b9f563fe033 private void wolfSettings() { wolfRidable = getBoolean("mobs.wolf.ridable", wolfRidable); wolfRidableInWater = getBoolean("mobs.wolf.ridable-in-water", wolfRidableInWater); -@@ -1872,6 +1927,7 @@ public class PurpurWorldConfig { +@@ -1876,6 +1931,7 @@ public class PurpurWorldConfig { set("mobs.wolf.attributes.max_health", oldValue); } wolfMaxHealth = getDouble("mobs.wolf.attributes.max_health", wolfMaxHealth); diff --git a/patches/server/0095-Apply-display-names-from-item-forms-of-entities-to-e.patch b/patches/server/0096-Apply-display-names-from-item-forms-of-entities-to-e.patch similarity index 99% rename from patches/server/0095-Apply-display-names-from-item-forms-of-entities-to-e.patch rename to patches/server/0096-Apply-display-names-from-item-forms-of-entities-to-e.patch index 2f3ca66ed..d03a35029 100644 --- a/patches/server/0095-Apply-display-names-from-item-forms-of-entities-to-e.patch +++ b/patches/server/0096-Apply-display-names-from-item-forms-of-entities-to-e.patch @@ -126,7 +126,7 @@ index d8a63ac5444eff8e3decb2f4addc2decb8a5d648..41cc9229108aa8e4f5655dfe590ff414 if (((HangingEntity) object).survives()) { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 49831c7589aefc6a9e9e5b9f563fe0330b3c2000..28e074e5d966d02c07bf9151d2452eff63871ac7 100644 +index 6ec21dfc65117530fbfe9388f445d28cba887852..10563f959d01cc1018ff335bfe47f0ca16edbfb4 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -97,8 +97,10 @@ public class PurpurWorldConfig { diff --git a/patches/server/0096-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch b/patches/server/0097-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch similarity index 96% rename from patches/server/0096-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch rename to patches/server/0097-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch index 2f7f5e035..69316e10b 100644 --- a/patches/server/0096-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch +++ b/patches/server/0097-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch @@ -17,7 +17,7 @@ index 774c982f28b4f127fc3f036c19dfb47fb9ae3264..d49b60e7e643498b49c03593dc0da2f8 // Paper end - Add PlayerNameEntityEvent mob.setPersistenceRequired(); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 28e074e5d966d02c07bf9151d2452eff63871ac7..50a21def146bf009f9275335f7b8640b8182441b 100644 +index 10563f959d01cc1018ff335bfe47f0ca16edbfb4..3b121f729214f206fb2c2ead8a56d503171db95d 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -98,9 +98,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0097-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch b/patches/server/0098-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch similarity index 96% rename from patches/server/0097-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch rename to patches/server/0098-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch index d640bbf34..7b08a36a4 100644 --- a/patches/server/0097-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch +++ b/patches/server/0098-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch @@ -21,7 +21,7 @@ index 8604db61d2c8042d0399262cb60b98457e4f894c..ada2403856aeb7cb50c0b00fb1dad18b private static class EndermanFreezeWhenLookedAt extends Goal { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 50a21def146bf009f9275335f7b8640b8182441b..f53b06363f2a7b3977bb8e99297468bb06e5be31 100644 +index 3b121f729214f206fb2c2ead8a56d503171db95d..0c29734755a7517dc3e010a70206afbbfbc6ba45 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -845,6 +845,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0098-Add-configurable-snowball-damage.patch b/patches/server/0099-Add-configurable-snowball-damage.patch similarity index 94% rename from patches/server/0098-Add-configurable-snowball-damage.patch rename to patches/server/0099-Add-configurable-snowball-damage.patch index 50134ac81..6c319a3a3 100644 --- a/patches/server/0098-Add-configurable-snowball-damage.patch +++ b/patches/server/0099-Add-configurable-snowball-damage.patch @@ -18,7 +18,7 @@ index 2b4d206c0d31ba38d7b2af654bd420e85145d441..f59a2903bfb8ae591a638ea5bb387caa entity.hurt(this.damageSources().thrown(this, this.getOwner()), (float) i); } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index f53b06363f2a7b3977bb8e99297468bb06e5be31..d0105b3673c0ef1e04b565e80f4f661463fbc75c 100644 +index 0c29734755a7517dc3e010a70206afbbfbc6ba45..cfa94a6941c4fa3288a7c7596cf6748381fec4fe 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -370,6 +370,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0099-Changeable-Mob-Left-Handed-Chance.patch b/patches/server/0100-Changeable-Mob-Left-Handed-Chance.patch similarity index 94% rename from patches/server/0099-Changeable-Mob-Left-Handed-Chance.patch rename to patches/server/0100-Changeable-Mob-Left-Handed-Chance.patch index 741b31af0..8872f8c44 100644 --- a/patches/server/0099-Changeable-Mob-Left-Handed-Chance.patch +++ b/patches/server/0100-Changeable-Mob-Left-Handed-Chance.patch @@ -18,7 +18,7 @@ index 1ebc4a8a54081ac9b3ba01e651d611f0237a8970..df5c13451e065a19cf195be4ddfd8d41 } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index d0105b3673c0ef1e04b565e80f4f661463fbc75c..8eb20e10b14b8798aed433a5b1a208add61573d7 100644 +index cfa94a6941c4fa3288a7c7596cf6748381fec4fe..4dd085fe116dbb965292485fddd0bc48410435ab 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -154,8 +154,10 @@ public class PurpurWorldConfig { diff --git a/patches/server/0100-Add-boat-fall-damage-config.patch b/patches/server/0101-Add-boat-fall-damage-config.patch similarity index 97% rename from patches/server/0100-Add-boat-fall-damage-config.patch rename to patches/server/0101-Add-boat-fall-damage-config.patch index 458568949..6fa6568d5 100644 --- a/patches/server/0100-Add-boat-fall-damage-config.patch +++ b/patches/server/0101-Add-boat-fall-damage-config.patch @@ -27,7 +27,7 @@ index b891e9ce0e0dcb7353f512a10ee0660c75f18e44..8a439ba84c5a27e24adfe47acee10a69 if (!flag && this.spawnInvulnerableTime > 0 && !source.is(DamageTypeTags.BYPASSES_INVULNERABILITY)) { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 8eb20e10b14b8798aed433a5b1a208add61573d7..28016e60278abafb6fc4cc2535eb63c5dbafd28b 100644 +index 4dd085fe116dbb965292485fddd0bc48410435ab..602db405b6675dd200386082b5f8256d7b2254a6 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -112,6 +112,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0101-Snow-Golem-rate-of-fire-config.patch b/patches/server/0102-Snow-Golem-rate-of-fire-config.patch similarity index 97% rename from patches/server/0101-Snow-Golem-rate-of-fire-config.patch rename to patches/server/0102-Snow-Golem-rate-of-fire-config.patch index 6227602d8..27e3f13f2 100644 --- a/patches/server/0101-Snow-Golem-rate-of-fire-config.patch +++ b/patches/server/0102-Snow-Golem-rate-of-fire-config.patch @@ -23,7 +23,7 @@ index 0060414b1d5afde56372ce121e9d37a1668cd03b..ee4d4a4fe314ee9bce69c96dd65d84ed this.goalSelector.addGoal(3, new LookAtPlayerGoal(this, Player.class, 6.0F)); this.goalSelector.addGoal(4, new RandomLookAroundGoal(this)); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 28016e60278abafb6fc4cc2535eb63c5dbafd28b..ed3e51879d558e65553d1ea2d6d135499baab318 100644 +index 602db405b6675dd200386082b5f8256d7b2254a6..16934efeea6a2da0adab1ff0bde9b80ebe1dcf7c 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1618,6 +1618,10 @@ public class PurpurWorldConfig { diff --git a/patches/server/0102-EMC-Configurable-disable-give-dropping.patch b/patches/server/0103-EMC-Configurable-disable-give-dropping.patch similarity index 100% rename from patches/server/0102-EMC-Configurable-disable-give-dropping.patch rename to patches/server/0103-EMC-Configurable-disable-give-dropping.patch diff --git a/patches/server/0103-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch b/patches/server/0104-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch similarity index 95% rename from patches/server/0103-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch rename to patches/server/0104-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch index 4b488516b..09db7c9a8 100644 --- a/patches/server/0103-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch +++ b/patches/server/0104-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 a72089363b458a9a880d31c9e2ae7aed500a4f7a..05185ddc9413633a9831e6c3e6e9deed7c6a4d95 100644 +index ad3e340c2487aa1dc2ed3ab08fa8747b7516022e..2368d4d347cc0a1d670b9b1ee568560ed8e1a98c 100644 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java -@@ -218,7 +218,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler +@@ -223,7 +223,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 a72089363b458a9a880d31c9e2ae7aed500a4f7a..05185ddc9413633a9831e6c3e6e9deed } brain.addActivity(Activity.CORE, VillagerGoalPackages.getCorePackage(villagerprofession, 0.5F)); -@@ -967,6 +967,11 @@ public class Villager extends AbstractVillager implements ReputationEventHandler +@@ -972,6 +972,11 @@ public class Villager extends AbstractVillager implements ReputationEventHandler public boolean hasFarmSeeds() { return this.getInventory().hasAnyMatching((itemstack) -> { @@ -174,11 +174,11 @@ index 8734ab1bd8299bbf43906d81a349c2a13e0981a7..3ca83269311cbc18c9ef3ce62cff6a2d "farmer", PoiTypes.FARMER, diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index ed3e51879d558e65553d1ea2d6d135499baab318..bbb9e5a420b327da9546f07592bc6e47eb365d5d 100644 +index 16934efeea6a2da0adab1ff0bde9b80ebe1dcf7c..154daa28ec56b4fbb2dc52ad69f30aaa5b96b1a7 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -@@ -1819,6 +1819,8 @@ public class PurpurWorldConfig { - public boolean villagerFollowEmeraldBlock = false; +@@ -1820,6 +1820,8 @@ public class PurpurWorldConfig { + public boolean villagerCanBeLeashed = false; public boolean villagerCanBreed = true; public int villagerBreedingTicks = 6000; + public boolean villagerClericsFarmWarts = false; @@ -186,8 +186,8 @@ index ed3e51879d558e65553d1ea2d6d135499baab318..bbb9e5a420b327da9546f07592bc6e47 private void villagerSettings() { villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable); villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater); -@@ -1832,6 +1834,8 @@ public class PurpurWorldConfig { - villagerFollowEmeraldBlock = getBoolean("mobs.villager.follow-emerald-blocks", villagerFollowEmeraldBlock); +@@ -1834,6 +1836,8 @@ public class PurpurWorldConfig { + villagerCanBeLeashed = getBoolean("mobs.villager.can-be-leashed", villagerCanBeLeashed); villagerCanBreed = getBoolean("mobs.villager.can-breed", villagerCanBreed); villagerBreedingTicks = getInt("mobs.villager.breeding-delay-ticks", villagerBreedingTicks); + villagerClericsFarmWarts = getBoolean("mobs.villager.clerics-farm-warts", villagerClericsFarmWarts); diff --git a/patches/server/0104-Toggle-for-Zombified-Piglin-death-always-counting-as.patch b/patches/server/0105-Toggle-for-Zombified-Piglin-death-always-counting-as.patch similarity index 94% rename from patches/server/0104-Toggle-for-Zombified-Piglin-death-always-counting-as.patch rename to patches/server/0105-Toggle-for-Zombified-Piglin-death-always-counting-as.patch index d26218e35..ffcf27412 100644 --- a/patches/server/0104-Toggle-for-Zombified-Piglin-death-always-counting-as.patch +++ b/patches/server/0105-Toggle-for-Zombified-Piglin-death-always-counting-as.patch @@ -35,10 +35,10 @@ index 0dcf5638e12c7670e6a5e577210e2542de1fd38b..47419219d4f435a17344361f4a60d5aa } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index bbb9e5a420b327da9546f07592bc6e47eb365d5d..a86332fceebc02466f194e038dd473c7a7b621cd 100644 +index 154daa28ec56b4fbb2dc52ad69f30aaa5b96b1a7..efaa50fa5ac586ca8b5ed3a977b812b0899d83d7 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -@@ -2062,6 +2062,7 @@ public class PurpurWorldConfig { +@@ -2066,6 +2066,7 @@ public class PurpurWorldConfig { public boolean zombifiedPiglinJockeyOnlyBaby = true; public double zombifiedPiglinJockeyChance = 0.05D; public boolean zombifiedPiglinJockeyTryExistingChickens = true; @@ -46,7 +46,7 @@ index bbb9e5a420b327da9546f07592bc6e47eb365d5d..a86332fceebc02466f194e038dd473c7 private void zombifiedPiglinSettings() { zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable); zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater); -@@ -2076,5 +2077,6 @@ public class PurpurWorldConfig { +@@ -2080,5 +2081,6 @@ public class PurpurWorldConfig { zombifiedPiglinJockeyOnlyBaby = getBoolean("mobs.zombified_piglin.jockey.only-babies", zombifiedPiglinJockeyOnlyBaby); zombifiedPiglinJockeyChance = getDouble("mobs.zombified_piglin.jockey.chance", zombifiedPiglinJockeyChance); zombifiedPiglinJockeyTryExistingChickens = getBoolean("mobs.zombified_piglin.jockey.try-existing-chickens", zombifiedPiglinJockeyTryExistingChickens); diff --git a/patches/server/0105-Configurable-chance-for-wolves-to-spawn-rabid.patch b/patches/server/0106-Configurable-chance-for-wolves-to-spawn-rabid.patch similarity index 98% rename from patches/server/0105-Configurable-chance-for-wolves-to-spawn-rabid.patch rename to patches/server/0106-Configurable-chance-for-wolves-to-spawn-rabid.patch index 032f64dc1..40e6dc674 100644 --- a/patches/server/0105-Configurable-chance-for-wolves-to-spawn-rabid.patch +++ b/patches/server/0106-Configurable-chance-for-wolves-to-spawn-rabid.patch @@ -182,10 +182,10 @@ index 86574da257731de7646a712ed73384955fe35aa3..e223234dd64b0e41441c3b9f649f0b64 + // Purpur end } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index a86332fceebc02466f194e038dd473c7a7b621cd..b108a65f9ef7487b19104791417b7f00ea42db5a 100644 +index efaa50fa5ac586ca8b5ed3a977b812b0899d83d7..4f32c632cc47de6c45b7d490ffdeab4e2e35323c 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -@@ -1945,6 +1945,8 @@ public class PurpurWorldConfig { +@@ -1949,6 +1949,8 @@ public class PurpurWorldConfig { public boolean wolfRidableInWater = true; public boolean wolfControllable = true; public double wolfMaxHealth = 8.0D; @@ -194,7 +194,7 @@ index a86332fceebc02466f194e038dd473c7a7b621cd..b108a65f9ef7487b19104791417b7f00 public int wolfBreedingTicks = 6000; private void wolfSettings() { wolfRidable = getBoolean("mobs.wolf.ridable", wolfRidable); -@@ -1956,6 +1958,8 @@ public class PurpurWorldConfig { +@@ -1960,6 +1962,8 @@ public class PurpurWorldConfig { set("mobs.wolf.attributes.max_health", oldValue); } wolfMaxHealth = getDouble("mobs.wolf.attributes.max_health", wolfMaxHealth); diff --git a/patches/server/0106-Configurable-default-collar-color.patch b/patches/server/0107-Configurable-default-collar-color.patch similarity index 95% rename from patches/server/0106-Configurable-default-collar-color.patch rename to patches/server/0107-Configurable-default-collar-color.patch index b2df05744..900c7db62 100644 --- a/patches/server/0106-Configurable-default-collar-color.patch +++ b/patches/server/0107-Configurable-default-collar-color.patch @@ -43,7 +43,7 @@ index 04d7e4bc6cc1deda5f53f6ae5f46d2402e0d0c10..5dd146d318851ce581a0d7841bd87ae9 protected void registerGoals() { this.goalSelector.addGoal(1, new FloatGoal(this)); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index b108a65f9ef7487b19104791417b7f00ea42db5a..97715b00dd469fc7d0a3862ea149300f48ddac8b 100644 +index 4f32c632cc47de6c45b7d490ffdeab4e2e35323c..0ff20cfbaf874a11ee04df4010d4d9d2f6dd3b4f 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -633,6 +633,7 @@ public class PurpurWorldConfig { @@ -66,7 +66,7 @@ index b108a65f9ef7487b19104791417b7f00ea42db5a..97715b00dd469fc7d0a3862ea149300f } public boolean caveSpiderRidable = false; -@@ -1945,6 +1951,7 @@ public class PurpurWorldConfig { +@@ -1949,6 +1955,7 @@ public class PurpurWorldConfig { public boolean wolfRidableInWater = true; public boolean wolfControllable = true; public double wolfMaxHealth = 8.0D; @@ -74,7 +74,7 @@ index b108a65f9ef7487b19104791417b7f00ea42db5a..97715b00dd469fc7d0a3862ea149300f public boolean wolfMilkCuresRabies = true; public double wolfNaturalRabid = 0.0D; public int wolfBreedingTicks = 6000; -@@ -1958,6 +1965,11 @@ public class PurpurWorldConfig { +@@ -1962,6 +1969,11 @@ public class PurpurWorldConfig { set("mobs.wolf.attributes.max_health", oldValue); } wolfMaxHealth = getDouble("mobs.wolf.attributes.max_health", wolfMaxHealth); diff --git a/patches/server/0107-Phantom-flames-on-swoop.patch b/patches/server/0108-Phantom-flames-on-swoop.patch similarity index 95% rename from patches/server/0107-Phantom-flames-on-swoop.patch rename to patches/server/0108-Phantom-flames-on-swoop.patch index 061a5a2a5..9963e0238 100644 --- a/patches/server/0107-Phantom-flames-on-swoop.patch +++ b/patches/server/0108-Phantom-flames-on-swoop.patch @@ -17,7 +17,7 @@ index 8f221fe016ea7221eb3a2116a2213139cf961797..88725e6f8c6490253e110485f5a62e9d @Override diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 97715b00dd469fc7d0a3862ea149300f48ddac8b..a3a3203fb34d4e22484a6c0d3461706029c82ae1 100644 +index 0ff20cfbaf874a11ee04df4010d4d9d2f6dd3b4f..fb808af2199abb6e15873be345a4d6e1e0cfe53a 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1311,6 +1311,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0108-Option-for-chests-to-open-even-with-a-solid-block-on.patch b/patches/server/0109-Option-for-chests-to-open-even-with-a-solid-block-on.patch similarity index 94% rename from patches/server/0108-Option-for-chests-to-open-even-with-a-solid-block-on.patch rename to patches/server/0109-Option-for-chests-to-open-even-with-a-solid-block-on.patch index e6f5657b3..433f3ed74 100644 --- a/patches/server/0108-Option-for-chests-to-open-even-with-a-solid-block-on.patch +++ b/patches/server/0109-Option-for-chests-to-open-even-with-a-solid-block-on.patch @@ -17,7 +17,7 @@ index 8fbfd18b3caeed769396b3ffb1b1778b2f38edc0..dbfe8f5d4df244cb694b73ea8763628c return world.getBlockState(blockposition1).isRedstoneConductor(world, blockposition1); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index a3a3203fb34d4e22484a6c0d3461706029c82ae1..cb5dd760a689107dbde6ef884577c233f88c3e9a 100644 +index fb808af2199abb6e15873be345a4d6e1e0cfe53a..82bf342f90cd47c110c8554abe8d1c10a32d9bd2 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -407,6 +407,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0109-Implement-TPSBar.patch b/patches/server/0110-Implement-TPSBar.patch similarity index 100% rename from patches/server/0109-Implement-TPSBar.patch rename to patches/server/0110-Implement-TPSBar.patch diff --git a/patches/server/0110-Striders-give-saddle-back.patch b/patches/server/0111-Striders-give-saddle-back.patch similarity index 96% rename from patches/server/0110-Striders-give-saddle-back.patch rename to patches/server/0111-Striders-give-saddle-back.patch index 57357ee01..5d0c7187f 100644 --- a/patches/server/0110-Striders-give-saddle-back.patch +++ b/patches/server/0111-Striders-give-saddle-back.patch @@ -29,7 +29,7 @@ index 0a297368678cafb92eb0374d1d410271c0d10033..13d40773ff8272ca081e852d4ae3dc09 if (!this.level().isClientSide) { player.startRiding(this); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index cb5dd760a689107dbde6ef884577c233f88c3e9a..0df12cd3ace5077e4a916a79af180316df0ad4c3 100644 +index 82bf342f90cd47c110c8554abe8d1c10a32d9bd2..436e89cac054e1ceebddc1fe14492a9f6d0b627b 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1723,6 +1723,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0111-PlayerBookTooLargeEvent.patch b/patches/server/0112-PlayerBookTooLargeEvent.patch similarity index 96% rename from patches/server/0111-PlayerBookTooLargeEvent.patch rename to patches/server/0112-PlayerBookTooLargeEvent.patch index a8adc4d00..1cbedbe7e 100644 --- a/patches/server/0111-PlayerBookTooLargeEvent.patch +++ b/patches/server/0112-PlayerBookTooLargeEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] PlayerBookTooLargeEvent diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 3de25a0f8e8242986c9fc8660ca9d0af976d9088..66fe42636f1b1d9f57121f7a98be4f512cc4f999 100644 +index 7c55d86901eb591554703e6c83bdfb67dfded0b1..010c03f9ec0b5fca563ce62bbb785af9cc28fad2 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1152,10 +1152,15 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0112-Full-netherite-armor-grants-fire-resistance.patch b/patches/server/0113-Full-netherite-armor-grants-fire-resistance.patch similarity index 94% rename from patches/server/0112-Full-netherite-armor-grants-fire-resistance.patch rename to patches/server/0113-Full-netherite-armor-grants-fire-resistance.patch index 86ab25a2d..b649a6481 100644 --- a/patches/server/0112-Full-netherite-armor-grants-fire-resistance.patch +++ b/patches/server/0113-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 db8b5a85895ef68f9c492103b0530951e2b71ba3..2578bfa9d31e04506d0e91da22913d3948f9656d 100644 +index 025309a47e9683ec29cd94f997663b7faec1acb4..2dafba96353c208b89da7b65c0d56a51e00547c3 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -386,6 +386,16 @@ public abstract class Player extends LivingEntity { @@ -26,7 +26,7 @@ index db8b5a85895ef68f9c492103b0530951e2b71ba3..2578bfa9d31e04506d0e91da22913d39 protected ItemCooldowns createItemCooldowns() { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 0df12cd3ace5077e4a916a79af180316df0ad4c3..706365b7299e5ae2c70a3ce99866982cd3f32729 100644 +index 436e89cac054e1ceebddc1fe14492a9f6d0b627b..f6628c2bee53f73d6471de1bf8108385900311ba 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -282,6 +282,19 @@ public class PurpurWorldConfig { diff --git a/patches/server/0113-Add-mobGriefing-bypass-to-everything-affected.patch b/patches/server/0114-Add-mobGriefing-bypass-to-everything-affected.patch similarity index 99% rename from patches/server/0113-Add-mobGriefing-bypass-to-everything-affected.patch rename to patches/server/0114-Add-mobGriefing-bypass-to-everything-affected.patch index 39c448d77..0d6734a13 100644 --- a/patches/server/0113-Add-mobGriefing-bypass-to-everything-affected.patch +++ b/patches/server/0114-Add-mobGriefing-bypass-to-everything-affected.patch @@ -375,7 +375,7 @@ index c7377d04ceac3ea624117439783a443c6d6f6d08..0c732cfbd9ce50198a3f85ae8ef2263d } } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 706365b7299e5ae2c70a3ce99866982cd3f32729..c03e7560b09d2540278e557867569bcb1eb9722c 100644 +index f6628c2bee53f73d6471de1bf8108385900311ba..34de8ed25ee4f7c5bd95a004e83c6016ede396bc 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -114,8 +114,11 @@ public class PurpurWorldConfig { @@ -630,7 +630,7 @@ index 706365b7299e5ae2c70a3ce99866982cd3f32729..c03e7560b09d2540278e557867569bcb } public boolean snifferRidable = false; -@@ -1849,6 +1888,7 @@ public class PurpurWorldConfig { +@@ -1850,6 +1889,7 @@ public class PurpurWorldConfig { public int villagerBreedingTicks = 6000; public boolean villagerClericsFarmWarts = false; public boolean villagerClericFarmersThrowWarts = true; @@ -638,7 +638,7 @@ index 706365b7299e5ae2c70a3ce99866982cd3f32729..c03e7560b09d2540278e557867569bcb private void villagerSettings() { villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable); villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater); -@@ -1864,6 +1904,7 @@ public class PurpurWorldConfig { +@@ -1866,6 +1906,7 @@ public class PurpurWorldConfig { villagerBreedingTicks = getInt("mobs.villager.breeding-delay-ticks", villagerBreedingTicks); villagerClericsFarmWarts = getBoolean("mobs.villager.clerics-farm-warts", villagerClericsFarmWarts); villagerClericFarmersThrowWarts = getBoolean("mobs.villager.cleric-wart-farmers-throw-warts-at-villagers", villagerClericFarmersThrowWarts); @@ -646,7 +646,7 @@ index 706365b7299e5ae2c70a3ce99866982cd3f32729..c03e7560b09d2540278e557867569bcb } public boolean vindicatorRidable = false; -@@ -1934,6 +1975,7 @@ public class PurpurWorldConfig { +@@ -1938,6 +1979,7 @@ public class PurpurWorldConfig { public double witherMaxHealth = 300.0D; public float witherHealthRegenAmount = 1.0f; public int witherHealthRegenDelay = 20; @@ -654,7 +654,7 @@ index 706365b7299e5ae2c70a3ce99866982cd3f32729..c03e7560b09d2540278e557867569bcb private void witherSettings() { witherRidable = getBoolean("mobs.wither.ridable", witherRidable); witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater); -@@ -1951,6 +1993,7 @@ public class PurpurWorldConfig { +@@ -1955,6 +1997,7 @@ public class PurpurWorldConfig { witherMaxHealth = getDouble("mobs.wither.attributes.max_health", witherMaxHealth); witherHealthRegenAmount = (float) getDouble("mobs.wither.health-regen-amount", witherHealthRegenAmount); witherHealthRegenDelay = getInt("mobs.wither.health-regen-delay", witherHealthRegenDelay); @@ -662,7 +662,7 @@ index 706365b7299e5ae2c70a3ce99866982cd3f32729..c03e7560b09d2540278e557867569bcb } public boolean witherSkeletonRidable = false; -@@ -2022,6 +2065,7 @@ public class PurpurWorldConfig { +@@ -2026,6 +2069,7 @@ public class PurpurWorldConfig { public double zombieJockeyChance = 0.05D; public boolean zombieJockeyTryExistingChickens = true; public boolean zombieAggressiveTowardsVillagerWhenLagging = true; @@ -670,7 +670,7 @@ index 706365b7299e5ae2c70a3ce99866982cd3f32729..c03e7560b09d2540278e557867569bcb private void zombieSettings() { zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable); zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater); -@@ -2037,6 +2081,7 @@ public class PurpurWorldConfig { +@@ -2041,6 +2085,7 @@ public class PurpurWorldConfig { zombieJockeyChance = getDouble("mobs.zombie.jockey.chance", zombieJockeyChance); zombieJockeyTryExistingChickens = getBoolean("mobs.zombie.jockey.try-existing-chickens", zombieJockeyTryExistingChickens); zombieAggressiveTowardsVillagerWhenLagging = getBoolean("mobs.zombie.aggressive-towards-villager-when-lagging", zombieAggressiveTowardsVillagerWhenLagging); diff --git a/patches/server/0114-Config-to-allow-Note-Block-sounds-when-blocked.patch b/patches/server/0115-Config-to-allow-Note-Block-sounds-when-blocked.patch similarity index 97% rename from patches/server/0114-Config-to-allow-Note-Block-sounds-when-blocked.patch rename to patches/server/0115-Config-to-allow-Note-Block-sounds-when-blocked.patch index 57d0953a3..766387582 100644 --- a/patches/server/0114-Config-to-allow-Note-Block-sounds-when-blocked.patch +++ b/patches/server/0115-Config-to-allow-Note-Block-sounds-when-blocked.patch @@ -22,7 +22,7 @@ index 1d82cfe7af0dc42f88901fb0c44896771fdf8a93..43dd972b374daa1072608f3a68e812e7 // org.bukkit.event.block.NotePlayEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callNotePlayEvent(world, pos, state.getValue(NoteBlock.INSTRUMENT), state.getValue(NoteBlock.NOTE)); // if (event.isCancelled()) { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index c03e7560b09d2540278e557867569bcb1eb9722c..e7bcc4cd6b9e2018e717e62b85165d203ed0d925 100644 +index 34de8ed25ee4f7c5bd95a004e83c6016ede396bc..4440d17e6f375c6687273ae8172f6ac593ec16b0 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -117,6 +117,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0115-Farmland-trampling-changes.patch b/patches/server/0116-Farmland-trampling-changes.patch similarity index 97% rename from patches/server/0115-Farmland-trampling-changes.patch rename to patches/server/0116-Farmland-trampling-changes.patch index bf77f0535..3177619e4 100644 --- a/patches/server/0115-Farmland-trampling-changes.patch +++ b/patches/server/0116-Farmland-trampling-changes.patch @@ -37,7 +37,7 @@ index 99798220b6e0ad06db2ba5c9b74bfb72af185fee..12a0c69f8fec30fad64cbb00af2ca1bb if (!CraftEventFactory.callEntityChangeBlockEvent(entity, pos, Blocks.DIRT.defaultBlockState())) { return; diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index e7bcc4cd6b9e2018e717e62b85165d203ed0d925..255203353384df09f09ffe481094b37f6aa499e0 100644 +index 4440d17e6f375c6687273ae8172f6ac593ec16b0..ac1c901b023c3d21f1f4cb258c3eeebe71979d82 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -443,10 +443,16 @@ public class PurpurWorldConfig { diff --git a/patches/server/0116-Movement-options-for-armor-stands.patch b/patches/server/0117-Movement-options-for-armor-stands.patch similarity index 96% rename from patches/server/0116-Movement-options-for-armor-stands.patch rename to patches/server/0117-Movement-options-for-armor-stands.patch index 70d3d97d6..5f6863ff7 100644 --- a/patches/server/0116-Movement-options-for-armor-stands.patch +++ b/patches/server/0117-Movement-options-for-armor-stands.patch @@ -17,7 +17,7 @@ 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 db9c0ac1f307c2750af1a4df07964b01955ff75d..c9eee2c313f658a027dfab977c6a7cb0992e97a2 100644 +index 501684ad04b5ecfb20570284cf1031a84544a4c6..10aaa05948839d43933a2de32bfc6fe54f61fbff 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1791,7 +1791,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess @@ -66,7 +66,7 @@ index a37054d39ee142e5f3ca3c5e1e3a15c150a3ba32..ea3cad6c9cc561b225cd41f04bd204c9 + // Purpur end } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 255203353384df09f09ffe481094b37f6aa499e0..24b90abc3171c824008af0a8e49b7963a9636493 100644 +index ac1c901b023c3d21f1f4cb258c3eeebe71979d82..fc653ee2afaae715a4c57a3cc764079c58e692c0 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -99,10 +99,16 @@ public class PurpurWorldConfig { diff --git a/patches/server/0117-Toggle-for-water-sensitive-mob-damage.patch b/patches/server/0118-Toggle-for-water-sensitive-mob-damage.patch similarity index 98% rename from patches/server/0117-Toggle-for-water-sensitive-mob-damage.patch rename to patches/server/0118-Toggle-for-water-sensitive-mob-damage.patch index a6ddcd263..2c5d87858 100644 --- a/patches/server/0117-Toggle-for-water-sensitive-mob-damage.patch +++ b/patches/server/0118-Toggle-for-water-sensitive-mob-damage.patch @@ -1167,10 +1167,10 @@ index 362f3fddd8090799278f4b4e58c5af5de00315f2..6c7e0f177382cb6329002dcde270f6ce return Monster.createMonsterAttributes().add(Attributes.MAX_HEALTH, 50.0).add(Attributes.MOVEMENT_SPEED, 0.35F).add(Attributes.ATTACK_DAMAGE, 7.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 ba2e1ea184bf31efdf30050fdcc3a5f193d2f096..80f6a5a6553d752857ccd53815a9341c5e7502e8 100644 +index 2368d4d347cc0a1d670b9b1ee568560ed8e1a98c..7d1dca008bd506a4cbd1b25624f03a1c378e80a0 100644 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java -@@ -184,6 +184,11 @@ public class Villager extends AbstractVillager implements ReputationEventHandler +@@ -189,6 +189,11 @@ public class Villager extends AbstractVillager implements ReputationEventHandler this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.villagerMaxHealth); } @@ -1183,10 +1183,10 @@ index ba2e1ea184bf31efdf30050fdcc3a5f193d2f096..80f6a5a6553d752857ccd53815a9341c public Brain getBrain() { return (Brain) super.getBrain(); // CraftBukkit - decompile error diff --git a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java -index 6990d6dc306b1d25544793b365fd6f7be8a37201..5951e0f583b5ab8a5b13dca6d8fcb537be4be73f 100644 +index 0d5e828a7fb6fd6facc04a27175541ac463c918e..05c63eb6cf8a7067105c58d244c7cc27d6bf1125 100644 --- a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java +++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java -@@ -93,6 +93,11 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill +@@ -98,6 +98,11 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill this.getAttribute(net.minecraft.world.entity.ai.attributes.Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.wanderingTraderMaxHealth); } @@ -1199,7 +1199,7 @@ index 6990d6dc306b1d25544793b365fd6f7be8a37201..5951e0f583b5ab8a5b13dca6d8fcb537 protected void registerGoals() { this.goalSelector.addGoal(0, new FloatGoal(this)); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 24b90abc3171c824008af0a8e49b7963a9636493..409cd7ab15931b378a39993e906a7cc92eb1273e 100644 +index fc653ee2afaae715a4c57a3cc764079c58e692c0..f788114ef17fec22d329029b62d52137cc4d006b 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -565,11 +565,13 @@ public class PurpurWorldConfig { @@ -2153,7 +2153,7 @@ index 24b90abc3171c824008af0a8e49b7963a9636493..409cd7ab15931b378a39993e906a7cc9 } public boolean villagerRidable = false; -@@ -1903,6 +2025,7 @@ public class PurpurWorldConfig { +@@ -1904,6 +2026,7 @@ public class PurpurWorldConfig { public boolean villagerClericsFarmWarts = false; public boolean villagerClericFarmersThrowWarts = true; public boolean villagerBypassMobGriefing = false; @@ -2161,7 +2161,7 @@ index 24b90abc3171c824008af0a8e49b7963a9636493..409cd7ab15931b378a39993e906a7cc9 private void villagerSettings() { villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable); villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater); -@@ -1919,6 +2042,7 @@ public class PurpurWorldConfig { +@@ -1921,6 +2044,7 @@ public class PurpurWorldConfig { villagerClericsFarmWarts = getBoolean("mobs.villager.clerics-farm-warts", villagerClericsFarmWarts); villagerClericFarmersThrowWarts = getBoolean("mobs.villager.cleric-wart-farmers-throw-warts-at-villagers", villagerClericFarmersThrowWarts); villagerBypassMobGriefing = getBoolean("mobs.villager.bypass-mob-griefing", villagerBypassMobGriefing); @@ -2169,7 +2169,7 @@ index 24b90abc3171c824008af0a8e49b7963a9636493..409cd7ab15931b378a39993e906a7cc9 } public boolean vindicatorRidable = false; -@@ -1926,6 +2050,7 @@ public class PurpurWorldConfig { +@@ -1928,6 +2052,7 @@ public class PurpurWorldConfig { public boolean vindicatorControllable = true; public double vindicatorMaxHealth = 24.0D; public double vindicatorJohnnySpawnChance = 0D; @@ -2177,7 +2177,7 @@ index 24b90abc3171c824008af0a8e49b7963a9636493..409cd7ab15931b378a39993e906a7cc9 private void vindicatorSettings() { vindicatorRidable = getBoolean("mobs.vindicator.ridable", vindicatorRidable); vindicatorRidableInWater = getBoolean("mobs.vindicator.ridable-in-water", vindicatorRidableInWater); -@@ -1937,6 +2062,7 @@ public class PurpurWorldConfig { +@@ -1939,6 +2064,7 @@ public class PurpurWorldConfig { } vindicatorMaxHealth = getDouble("mobs.vindicator.attributes.max_health", vindicatorMaxHealth); vindicatorJohnnySpawnChance = getDouble("mobs.vindicator.johnny.spawn-chance", vindicatorJohnnySpawnChance); @@ -2185,23 +2185,23 @@ index 24b90abc3171c824008af0a8e49b7963a9636493..409cd7ab15931b378a39993e906a7cc9 } public boolean wanderingTraderRidable = false; -@@ -1944,6 +2070,7 @@ public class PurpurWorldConfig { - public boolean wanderingTraderControllable = true; +@@ -1947,6 +2073,7 @@ public class PurpurWorldConfig { public double wanderingTraderMaxHealth = 20.0D; public boolean wanderingTraderFollowEmeraldBlock = false; + public boolean wanderingTraderCanBeLeashed = false; + public boolean wanderingTraderTakeDamageFromWater = false; private void wanderingTraderSettings() { wanderingTraderRidable = getBoolean("mobs.wandering_trader.ridable", wanderingTraderRidable); wanderingTraderRidableInWater = getBoolean("mobs.wandering_trader.ridable-in-water", wanderingTraderRidableInWater); -@@ -1955,6 +2082,7 @@ public class PurpurWorldConfig { - } +@@ -1959,6 +2086,7 @@ public class PurpurWorldConfig { wanderingTraderMaxHealth = getDouble("mobs.wandering_trader.attributes.max_health", wanderingTraderMaxHealth); wanderingTraderFollowEmeraldBlock = getBoolean("mobs.wandering_trader.follow-emerald-blocks", wanderingTraderFollowEmeraldBlock); + wanderingTraderCanBeLeashed = getBoolean("mobs.wandering_trader.can-be-leashed", wanderingTraderCanBeLeashed); + wanderingTraderTakeDamageFromWater = getBoolean("mobs.wandering_trader.takes-damage-from-water", wanderingTraderTakeDamageFromWater); } public boolean wardenRidable = false; -@@ -1970,6 +2098,7 @@ public class PurpurWorldConfig { +@@ -1974,6 +2102,7 @@ public class PurpurWorldConfig { public boolean witchRidableInWater = true; public boolean witchControllable = true; public double witchMaxHealth = 26.0D; @@ -2209,7 +2209,7 @@ index 24b90abc3171c824008af0a8e49b7963a9636493..409cd7ab15931b378a39993e906a7cc9 private void witchSettings() { witchRidable = getBoolean("mobs.witch.ridable", witchRidable); witchRidableInWater = getBoolean("mobs.witch.ridable-in-water", witchRidableInWater); -@@ -1980,6 +2109,7 @@ public class PurpurWorldConfig { +@@ -1984,6 +2113,7 @@ public class PurpurWorldConfig { set("mobs.witch.attributes.max_health", oldValue); } witchMaxHealth = getDouble("mobs.witch.attributes.max_health", witchMaxHealth); @@ -2217,7 +2217,7 @@ index 24b90abc3171c824008af0a8e49b7963a9636493..409cd7ab15931b378a39993e906a7cc9 } public boolean witherRidable = false; -@@ -1990,6 +2120,7 @@ public class PurpurWorldConfig { +@@ -1994,6 +2124,7 @@ public class PurpurWorldConfig { public float witherHealthRegenAmount = 1.0f; public int witherHealthRegenDelay = 20; public boolean witherBypassMobGriefing = false; @@ -2225,7 +2225,7 @@ index 24b90abc3171c824008af0a8e49b7963a9636493..409cd7ab15931b378a39993e906a7cc9 private void witherSettings() { witherRidable = getBoolean("mobs.wither.ridable", witherRidable); witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater); -@@ -2008,12 +2139,14 @@ public class PurpurWorldConfig { +@@ -2012,12 +2143,14 @@ public class PurpurWorldConfig { witherHealthRegenAmount = (float) getDouble("mobs.wither.health-regen-amount", witherHealthRegenAmount); witherHealthRegenDelay = getInt("mobs.wither.health-regen-delay", witherHealthRegenDelay); witherBypassMobGriefing = getBoolean("mobs.wither.bypass-mob-griefing", witherBypassMobGriefing); @@ -2240,7 +2240,7 @@ index 24b90abc3171c824008af0a8e49b7963a9636493..409cd7ab15931b378a39993e906a7cc9 private void witherSkeletonSettings() { witherSkeletonRidable = getBoolean("mobs.wither_skeleton.ridable", witherSkeletonRidable); witherSkeletonRidableInWater = getBoolean("mobs.wither_skeleton.ridable-in-water", witherSkeletonRidableInWater); -@@ -2024,6 +2157,7 @@ public class PurpurWorldConfig { +@@ -2028,6 +2161,7 @@ public class PurpurWorldConfig { set("mobs.wither_skeleton.attributes.max_health", oldValue); } witherSkeletonMaxHealth = getDouble("mobs.wither_skeleton.attributes.max_health", witherSkeletonMaxHealth); @@ -2248,7 +2248,7 @@ index 24b90abc3171c824008af0a8e49b7963a9636493..409cd7ab15931b378a39993e906a7cc9 } public boolean wolfRidable = false; -@@ -2034,6 +2168,7 @@ public class PurpurWorldConfig { +@@ -2038,6 +2172,7 @@ public class PurpurWorldConfig { public boolean wolfMilkCuresRabies = true; public double wolfNaturalRabid = 0.0D; public int wolfBreedingTicks = 6000; @@ -2256,7 +2256,7 @@ index 24b90abc3171c824008af0a8e49b7963a9636493..409cd7ab15931b378a39993e906a7cc9 private void wolfSettings() { wolfRidable = getBoolean("mobs.wolf.ridable", wolfRidable); wolfRidableInWater = getBoolean("mobs.wolf.ridable-in-water", wolfRidableInWater); -@@ -2052,12 +2187,14 @@ public class PurpurWorldConfig { +@@ -2056,12 +2191,14 @@ public class PurpurWorldConfig { wolfMilkCuresRabies = getBoolean("mobs.wolf.milk-cures-rabid-wolves", wolfMilkCuresRabies); wolfNaturalRabid = getDouble("mobs.wolf.spawn-rabid-chance", wolfNaturalRabid); wolfBreedingTicks = getInt("mobs.wolf.breeding-delay-ticks", wolfBreedingTicks); @@ -2271,7 +2271,7 @@ index 24b90abc3171c824008af0a8e49b7963a9636493..409cd7ab15931b378a39993e906a7cc9 private void zoglinSettings() { zoglinRidable = getBoolean("mobs.zoglin.ridable", zoglinRidable); zoglinRidableInWater = getBoolean("mobs.zoglin.ridable-in-water", zoglinRidableInWater); -@@ -2068,6 +2205,7 @@ public class PurpurWorldConfig { +@@ -2072,6 +2209,7 @@ public class PurpurWorldConfig { set("mobs.zoglin.attributes.max_health", oldValue); } zoglinMaxHealth = getDouble("mobs.zoglin.attributes.max_health", zoglinMaxHealth); @@ -2279,7 +2279,7 @@ index 24b90abc3171c824008af0a8e49b7963a9636493..409cd7ab15931b378a39993e906a7cc9 } public boolean zombieRidable = false; -@@ -2080,6 +2218,7 @@ public class PurpurWorldConfig { +@@ -2084,6 +2222,7 @@ public class PurpurWorldConfig { public boolean zombieJockeyTryExistingChickens = true; public boolean zombieAggressiveTowardsVillagerWhenLagging = true; public boolean zombieBypassMobGriefing = false; @@ -2287,7 +2287,7 @@ index 24b90abc3171c824008af0a8e49b7963a9636493..409cd7ab15931b378a39993e906a7cc9 private void zombieSettings() { zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable); zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater); -@@ -2096,6 +2235,7 @@ public class PurpurWorldConfig { +@@ -2100,6 +2239,7 @@ public class PurpurWorldConfig { zombieJockeyTryExistingChickens = getBoolean("mobs.zombie.jockey.try-existing-chickens", zombieJockeyTryExistingChickens); zombieAggressiveTowardsVillagerWhenLagging = getBoolean("mobs.zombie.aggressive-towards-villager-when-lagging", zombieAggressiveTowardsVillagerWhenLagging); zombieBypassMobGriefing = getBoolean("mobs.zombie.bypass-mob-griefing", zombieBypassMobGriefing); @@ -2295,7 +2295,7 @@ index 24b90abc3171c824008af0a8e49b7963a9636493..409cd7ab15931b378a39993e906a7cc9 } public boolean zombieHorseRidable = false; -@@ -2108,6 +2248,7 @@ public class PurpurWorldConfig { +@@ -2112,6 +2252,7 @@ public class PurpurWorldConfig { public double zombieHorseMovementSpeedMin = 0.2D; public double zombieHorseMovementSpeedMax = 0.2D; public double zombieHorseSpawnChance = 0.0D; @@ -2303,7 +2303,7 @@ index 24b90abc3171c824008af0a8e49b7963a9636493..409cd7ab15931b378a39993e906a7cc9 private void zombieHorseSettings() { zombieHorseRidable = getBoolean("mobs.zombie_horse.ridable", zombieHorseRidable); zombieHorseRidableInWater = getBoolean("mobs.zombie_horse.ridable-in-water", zombieHorseRidableInWater); -@@ -2125,6 +2266,7 @@ public class PurpurWorldConfig { +@@ -2129,6 +2270,7 @@ public class PurpurWorldConfig { zombieHorseMovementSpeedMin = getDouble("mobs.zombie_horse.attributes.movement_speed.min", zombieHorseMovementSpeedMin); zombieHorseMovementSpeedMax = getDouble("mobs.zombie_horse.attributes.movement_speed.max", zombieHorseMovementSpeedMax); zombieHorseSpawnChance = getDouble("mobs.zombie_horse.spawn-chance", zombieHorseSpawnChance); @@ -2311,7 +2311,7 @@ index 24b90abc3171c824008af0a8e49b7963a9636493..409cd7ab15931b378a39993e906a7cc9 } public boolean zombieVillagerRidable = false; -@@ -2135,6 +2277,7 @@ public class PurpurWorldConfig { +@@ -2139,6 +2281,7 @@ public class PurpurWorldConfig { public boolean zombieVillagerJockeyOnlyBaby = true; public double zombieVillagerJockeyChance = 0.05D; public boolean zombieVillagerJockeyTryExistingChickens = true; @@ -2319,7 +2319,7 @@ index 24b90abc3171c824008af0a8e49b7963a9636493..409cd7ab15931b378a39993e906a7cc9 private void zombieVillagerSettings() { zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable); zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater); -@@ -2149,6 +2292,7 @@ public class PurpurWorldConfig { +@@ -2153,6 +2296,7 @@ public class PurpurWorldConfig { zombieVillagerJockeyOnlyBaby = getBoolean("mobs.zombie_villager.jockey.only-babies", zombieVillagerJockeyOnlyBaby); zombieVillagerJockeyChance = getDouble("mobs.zombie_villager.jockey.chance", zombieVillagerJockeyChance); zombieVillagerJockeyTryExistingChickens = getBoolean("mobs.zombie_villager.jockey.try-existing-chickens", zombieVillagerJockeyTryExistingChickens); @@ -2327,7 +2327,7 @@ index 24b90abc3171c824008af0a8e49b7963a9636493..409cd7ab15931b378a39993e906a7cc9 } public boolean zombifiedPiglinRidable = false; -@@ -2160,6 +2304,7 @@ public class PurpurWorldConfig { +@@ -2164,6 +2308,7 @@ public class PurpurWorldConfig { public double zombifiedPiglinJockeyChance = 0.05D; public boolean zombifiedPiglinJockeyTryExistingChickens = true; public boolean zombifiedPiglinCountAsPlayerKillWhenAngry = true; @@ -2335,7 +2335,7 @@ index 24b90abc3171c824008af0a8e49b7963a9636493..409cd7ab15931b378a39993e906a7cc9 private void zombifiedPiglinSettings() { zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable); zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater); -@@ -2175,5 +2320,6 @@ public class PurpurWorldConfig { +@@ -2179,5 +2324,6 @@ public class PurpurWorldConfig { zombifiedPiglinJockeyChance = getDouble("mobs.zombified_piglin.jockey.chance", zombifiedPiglinJockeyChance); zombifiedPiglinJockeyTryExistingChickens = getBoolean("mobs.zombified_piglin.jockey.try-existing-chickens", zombifiedPiglinJockeyTryExistingChickens); zombifiedPiglinCountAsPlayerKillWhenAngry = getBoolean("mobs.zombified_piglin.count-as-player-kill-when-angry", zombifiedPiglinCountAsPlayerKillWhenAngry); diff --git a/patches/server/0118-Config-to-always-tame-in-Creative.patch b/patches/server/0119-Config-to-always-tame-in-Creative.patch similarity index 98% rename from patches/server/0118-Config-to-always-tame-in-Creative.patch rename to patches/server/0119-Config-to-always-tame-in-Creative.patch index 50feaee96..e357da874 100644 --- a/patches/server/0118-Config-to-always-tame-in-Creative.patch +++ b/patches/server/0119-Config-to-always-tame-in-Creative.patch @@ -59,7 +59,7 @@ index 5802d5a43c5f2dc569130cc70c4ba519c471abc0..ca8b7dcd2a93b41dfd22f6f112dcac1b this.navigation.stop(); this.setTarget((LivingEntity) null); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 409cd7ab15931b378a39993e906a7cc92eb1273e..8a236bab86a5d846ffba10e373256da891b1cd62 100644 +index f788114ef17fec22d329029b62d52137cc4d006b..0a55f019ed05d23e9bd2ab0d06a6d76bdac269af 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -117,6 +117,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0119-End-crystal-explosion-options.patch b/patches/server/0120-End-crystal-explosion-options.patch similarity index 98% rename from patches/server/0119-End-crystal-explosion-options.patch rename to patches/server/0120-End-crystal-explosion-options.patch index 63de006d1..b4c1b2883 100644 --- a/patches/server/0119-End-crystal-explosion-options.patch +++ b/patches/server/0120-End-crystal-explosion-options.patch @@ -53,7 +53,7 @@ index 72122333cf0247e4a8511ac633487f170b89586c..02f1d0418395b100cabfad7294466aaa this.remove(Entity.RemovalReason.KILLED, EntityRemoveEvent.Cause.DEATH); // CraftBukkit - add Bukkit remove cause } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 8a236bab86a5d846ffba10e373256da891b1cd62..0ac8a148886dfb39ac540c0b0cb533d2bf88bd16 100644 +index 0a55f019ed05d23e9bd2ab0d06a6d76bdac269af..6a87048aab53067ce8b211f9d48165d79e1cb41a 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -448,6 +448,43 @@ public class PurpurWorldConfig { diff --git a/patches/server/0120-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch b/patches/server/0121-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch similarity index 95% rename from patches/server/0120-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch rename to patches/server/0121-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch index 3c188e3c4..d30898169 100644 --- a/patches/server/0120-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch +++ b/patches/server/0121-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch @@ -29,7 +29,7 @@ index 9f232d8e1dc5adf3cc3adc5af7fd42c5e78ed48d..962ab1025f42734c11e3ce4c792d1795 } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 0ac8a148886dfb39ac540c0b0cb533d2bf88bd16..f9e50c581ebd61b3dc19a73cf9f73a99e9b4f006 100644 +index 6a87048aab53067ce8b211f9d48165d79e1cb41a..34e2383c709c991c0ab9f24a8dd3dfe52ba186fd 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -955,6 +955,7 @@ public class PurpurWorldConfig { @@ -48,7 +48,7 @@ index 0ac8a148886dfb39ac540c0b0cb533d2bf88bd16..f9e50c581ebd61b3dc19a73cf9f73a99 } public boolean endermanRidable = false; -@@ -2160,6 +2162,7 @@ public class PurpurWorldConfig { +@@ -2164,6 +2166,7 @@ public class PurpurWorldConfig { public int witherHealthRegenDelay = 20; public boolean witherBypassMobGriefing = false; public boolean witherTakeDamageFromWater = false; @@ -56,7 +56,7 @@ index 0ac8a148886dfb39ac540c0b0cb533d2bf88bd16..f9e50c581ebd61b3dc19a73cf9f73a99 private void witherSettings() { witherRidable = getBoolean("mobs.wither.ridable", witherRidable); witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater); -@@ -2179,6 +2182,7 @@ public class PurpurWorldConfig { +@@ -2183,6 +2186,7 @@ public class PurpurWorldConfig { witherHealthRegenDelay = getInt("mobs.wither.health-regen-delay", witherHealthRegenDelay); witherBypassMobGriefing = getBoolean("mobs.wither.bypass-mob-griefing", witherBypassMobGriefing); witherTakeDamageFromWater = getBoolean("mobs.wither.takes-damage-from-water", witherTakeDamageFromWater); diff --git a/patches/server/0121-Dont-run-with-scissors.patch b/patches/server/0122-Dont-run-with-scissors.patch similarity index 98% rename from patches/server/0121-Dont-run-with-scissors.patch rename to patches/server/0122-Dont-run-with-scissors.patch index f7a7053d9..13412502e 100644 --- a/patches/server/0121-Dont-run-with-scissors.patch +++ b/patches/server/0122-Dont-run-with-scissors.patch @@ -6,7 +6,7 @@ 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 66fe42636f1b1d9f57121f7a98be4f512cc4f999..df23496844d4b41e79efe23c99a5449ca40a4ccd 100644 +index 010c03f9ec0b5fca563ce62bbb785af9cc28fad2..22979d8531fd9732b1fd5eaf76aec52b22fdf6bb 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1610,6 +1610,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl @@ -149,7 +149,7 @@ index 4e5e04915f912d873eb5c86037e6b78c82c2ca53..a601f18f94e80b16ae22d077a405d685 public static String serverModName = io.papermc.paper.ServerBuildInfo.buildInfo().brandName(); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index f9e50c581ebd61b3dc19a73cf9f73a99e9b4f006..12d70d3a064c3cf031818f25777eb0aaf97b7ea1 100644 +index 34e2383c709c991c0ab9f24a8dd3dfe52ba186fd..f0519a282a461a92aeecf20d2aa403c791b9fb48 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -182,6 +182,10 @@ public class PurpurWorldConfig { diff --git a/patches/server/0122-One-Punch-Man.patch b/patches/server/0123-One-Punch-Man.patch similarity index 94% rename from patches/server/0122-One-Punch-Man.patch rename to patches/server/0123-One-Punch-Man.patch index dcd536be3..3f2199b00 100644 --- a/patches/server/0122-One-Punch-Man.patch +++ b/patches/server/0123-One-Punch-Man.patch @@ -6,7 +6,7 @@ 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 13ada4aa83ddb75d6107d41b4a7d10196d5f01f0..ab9769d9a14d7736f9a9d1c3afbf44dc9339fc3b 100644 +index 897e9da03a4e1cc0cac5da542c9e695f49ae60e4..583e0cfc3478df74188526a10494d81ba4303054 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1428,6 +1428,24 @@ public abstract class LivingEntity extends Entity implements Attackable { @@ -35,7 +35,7 @@ index 13ada4aa83ddb75d6107d41b4a7d10196d5f01f0..ab9769d9a14d7736f9a9d1c3afbf44dc float f1 = amount; boolean flag = amount > 0.0F && this.isDamageSourceBlocked(source); // Copied from below diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 12d70d3a064c3cf031818f25777eb0aaf97b7ea1..0913c3f49fb36dd63c15e3cfb891a60a9495a92a 100644 +index f0519a282a461a92aeecf20d2aa403c791b9fb48..61453cf17d846a1c9cd09b2f10f6c9143d347da7 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -328,6 +328,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0123-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch b/patches/server/0124-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch similarity index 98% rename from patches/server/0123-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch rename to patches/server/0124-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch index dcba99fd5..4e380f126 100644 --- a/patches/server/0123-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch +++ b/patches/server/0124-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch @@ -43,7 +43,7 @@ index 20a91d798d31a71b3c05efa2cc5bda55494e26cc..fc62754f93bd11a10c28b8b7b116e9ff // Paper end - PlayerLaunchProjectileEvent if (user instanceof net.minecraft.server.level.ServerPlayer) { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 0913c3f49fb36dd63c15e3cfb891a60a9495a92a..cab510c8a0cb68b0d741cad6c46505f9916ac835 100644 +index 61453cf17d846a1c9cd09b2f10f6c9143d347da7..5906f75dbb1b7969fd7807feafa9d23e82021c95 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -186,6 +186,10 @@ public class PurpurWorldConfig { diff --git a/patches/server/0124-Config-to-ignore-nearby-mobs-when-sleeping.patch b/patches/server/0125-Config-to-ignore-nearby-mobs-when-sleeping.patch similarity index 96% rename from patches/server/0124-Config-to-ignore-nearby-mobs-when-sleeping.patch rename to patches/server/0125-Config-to-ignore-nearby-mobs-when-sleeping.patch index 2bd405e1b..719eb35a2 100644 --- a/patches/server/0124-Config-to-ignore-nearby-mobs-when-sleeping.patch +++ b/patches/server/0125-Config-to-ignore-nearby-mobs-when-sleeping.patch @@ -18,7 +18,7 @@ index ae8235ed2a817776d052173c94a54ede9d2d275e..b93c42ba349e6315edfb372714287123 } } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index cab510c8a0cb68b0d741cad6c46505f9916ac835..dba6c5ef3138347321ab2a5d2871bcf71fbb1796 100644 +index 5906f75dbb1b7969fd7807feafa9d23e82021c95..7db72a10132ffdd894bac3f2db67c3ca22a835af 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -337,6 +337,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0125-Add-back-player-spawned-endermite-API.patch b/patches/server/0126-Add-back-player-spawned-endermite-API.patch similarity index 100% rename from patches/server/0125-Add-back-player-spawned-endermite-API.patch rename to patches/server/0126-Add-back-player-spawned-endermite-API.patch diff --git a/patches/server/0126-Config-Enderman-aggressiveness-towards-Endermites.patch b/patches/server/0127-Config-Enderman-aggressiveness-towards-Endermites.patch similarity index 97% rename from patches/server/0126-Config-Enderman-aggressiveness-towards-Endermites.patch rename to patches/server/0127-Config-Enderman-aggressiveness-towards-Endermites.patch index 090a1a997..659670ff9 100644 --- a/patches/server/0126-Config-Enderman-aggressiveness-towards-Endermites.patch +++ b/patches/server/0127-Config-Enderman-aggressiveness-towards-Endermites.patch @@ -18,7 +18,7 @@ index 75d462d7f55dedfa62844549fa6690a4a652bd1f..cc9da5134ece550e8a1902e90282090f } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index dba6c5ef3138347321ab2a5d2871bcf71fbb1796..023858324966929b8fb45b046309e403ec937351 100644 +index 7db72a10132ffdd894bac3f2db67c3ca22a835af..c90b57eec4e6a6d1fbe37f291bd8423aa455275e 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1005,6 +1005,8 @@ public class PurpurWorldConfig { diff --git a/patches/server/0127-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch b/patches/server/0128-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch similarity index 96% rename from patches/server/0127-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch rename to patches/server/0128-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch index 45b67369f..02ad2840d 100644 --- a/patches/server/0127-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch +++ b/patches/server/0128-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch @@ -20,7 +20,7 @@ index cc9da5134ece550e8a1902e90282090f05818fd8..f2e21c9d3cefb635c4eb583ac9355b46 } else { Vec3 vec3d = player.getViewVector(1.0F).normalize(); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 023858324966929b8fb45b046309e403ec937351..e9f1fce3c10fc44a4a092f7b32fa5f2ac5dcc3da 100644 +index c90b57eec4e6a6d1fbe37f291bd8423aa455275e..3303e0015b156c54d2a4721bab46564cb31bf6aa 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1007,6 +1007,8 @@ public class PurpurWorldConfig { diff --git a/patches/server/0128-Tick-fluids-config.patch b/patches/server/0129-Tick-fluids-config.patch similarity index 97% rename from patches/server/0128-Tick-fluids-config.patch rename to patches/server/0129-Tick-fluids-config.patch index 4a7d232cb..e58b1fc26 100644 --- a/patches/server/0128-Tick-fluids-config.patch +++ b/patches/server/0129-Tick-fluids-config.patch @@ -36,7 +36,7 @@ index 84623c632d8c2f0fa7ec939c711316d757117d23..1851035b9fdcc076442d0699567a3b02 } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index e9f1fce3c10fc44a4a092f7b32fa5f2ac5dcc3da..9d5852c9c0009db15134af1b40fca619090a6732 100644 +index 3303e0015b156c54d2a4721bab46564cb31bf6aa..b7dd164763232edaeeb12a1f5011daeef3b5cbda 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -127,6 +127,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0129-Config-to-disable-Llama-caravans.patch b/patches/server/0130-Config-to-disable-Llama-caravans.patch similarity index 97% rename from patches/server/0129-Config-to-disable-Llama-caravans.patch rename to patches/server/0130-Config-to-disable-Llama-caravans.patch index ba795d948..b2fd46abf 100644 --- a/patches/server/0129-Config-to-disable-Llama-caravans.patch +++ b/patches/server/0130-Config-to-disable-Llama-caravans.patch @@ -32,7 +32,7 @@ index 96f1eba4a356e131a8f3c689bedc9eb8821e1a72..8edfc34a17d8c05cfa2928738306c1ab this.caravanHead.caravanTail = this; } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 9d5852c9c0009db15134af1b40fca619090a6732..684ea13121c39b3ce2aaa65dd8fc2943a9d1caad 100644 +index b7dd164763232edaeeb12a1f5011daeef3b5cbda..c5e8990b2cd6cda6f5aca39086c096097f111425 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1339,6 +1339,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0130-Config-to-make-Creepers-explode-on-death.patch b/patches/server/0131-Config-to-make-Creepers-explode-on-death.patch similarity index 97% rename from patches/server/0130-Config-to-make-Creepers-explode-on-death.patch rename to patches/server/0131-Config-to-make-Creepers-explode-on-death.patch index 6d9e3c511..38c611ccc 100644 --- a/patches/server/0130-Config-to-make-Creepers-explode-on-death.patch +++ b/patches/server/0131-Config-to-make-Creepers-explode-on-death.patch @@ -50,7 +50,7 @@ index d68897b167918ba1e28b083b665ce70aaec437df..a194cc234e24094da0cbee8c6c4fe123 private void spawnLingeringCloud() { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 684ea13121c39b3ce2aaa65dd8fc2943a9d1caad..a8bea2f329a498911be26197a1d2e2fffb2fbfe9 100644 +index c5e8990b2cd6cda6f5aca39086c096097f111425..66e933fb901e049c3ce54955be0bfbff4d41d1af 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -859,6 +859,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0131-Configurable-ravager-griefable-blocks-list.patch b/patches/server/0132-Configurable-ravager-griefable-blocks-list.patch similarity index 97% rename from patches/server/0131-Configurable-ravager-griefable-blocks-list.patch rename to patches/server/0132-Configurable-ravager-griefable-blocks-list.patch index 5df03938f..4bbdc1ce8 100644 --- a/patches/server/0131-Configurable-ravager-griefable-blocks-list.patch +++ b/patches/server/0132-Configurable-ravager-griefable-blocks-list.patch @@ -31,7 +31,7 @@ index 2af4c365743b2956939335512f74e0a1d84298f7..a69e7e8da81bd13578d230cc1e3f0f90 } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index a8bea2f329a498911be26197a1d2e2fffb2fbfe9..2dad1dbffb7846eb410915096f794ba64234744a 100644 +index 66e933fb901e049c3ce54955be0bfbff4d41d1af..de99247dcb87c0b06c98d63bbc3800a8e37fb45d 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1711,6 +1711,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0132-Sneak-to-bulk-process-composter.patch b/patches/server/0133-Sneak-to-bulk-process-composter.patch similarity index 98% rename from patches/server/0132-Sneak-to-bulk-process-composter.patch rename to patches/server/0133-Sneak-to-bulk-process-composter.patch index ce3ae5d35..b045873d1 100644 --- a/patches/server/0132-Sneak-to-bulk-process-composter.patch +++ b/patches/server/0133-Sneak-to-bulk-process-composter.patch @@ -87,7 +87,7 @@ index d3d12f9114173f4971f95d7ef895a4374705bd3f..f34159f8d6c51af2341bf49db0d6d6f0 protected InteractionResult useWithoutItem(BlockState state, Level world, BlockPos pos, Player player, BlockHitResult hit) { int i = (Integer) state.getValue(ComposterBlock.LEVEL); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 2dad1dbffb7846eb410915096f794ba64234744a..949c3acc1d77492e0f04d03a88d5e93be10ee61e 100644 +index de99247dcb87c0b06c98d63bbc3800a8e37fb45d..c5a249fc181a56db861c9ed416dc6b870c532cf2 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -463,6 +463,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0133-Config-for-skipping-night.patch b/patches/server/0134-Config-for-skipping-night.patch similarity index 96% rename from patches/server/0133-Config-for-skipping-night.patch rename to patches/server/0134-Config-for-skipping-night.patch index 7fb1025a1..56fa2b571 100644 --- a/patches/server/0133-Config-for-skipping-night.patch +++ b/patches/server/0134-Config-for-skipping-night.patch @@ -18,7 +18,7 @@ index ce843a15043fb8bb40d96351ee00f0440d0a53d4..e8e5704937350cc65ae24980c56a3a89 j = this.levelData.getDayTime() + 24000L; TimeSkipEvent event = new TimeSkipEvent(this.getWorld(), TimeSkipEvent.SkipReason.NIGHT_SKIP, (j - j % 24000L) - this.getDayTime()); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 949c3acc1d77492e0f04d03a88d5e93be10ee61e..a983ef20da54ddb7cd9206c923e4ea3d810e5cac 100644 +index c5a249fc181a56db861c9ed416dc6b870c532cf2..9c1dfc4e0c6511f1d374c535e43fdb96d4728b16 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -340,6 +340,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0134-Add-config-for-villager-trading.patch b/patches/server/0135-Add-config-for-villager-trading.patch similarity index 82% rename from patches/server/0134-Add-config-for-villager-trading.patch rename to patches/server/0135-Add-config-for-villager-trading.patch index 42064efb7..a589aba3f 100644 --- a/patches/server/0134-Add-config-for-villager-trading.patch +++ b/patches/server/0135-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 f3e622f1cdbe46ea12a1d5a969b209d1e5dde5a3..b9c464fbba1c18c524b3d1a7855c0392266e0734 100644 +index 7d1dca008bd506a4cbd1b25624f03a1c378e80a0..1e100de8d30777e83907c523ffc1a3a54c670205 100644 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java -@@ -368,6 +368,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler +@@ -373,6 +373,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler } if (level().purpurConfig.villagerRidable && itemstack.isEmpty()) return tryRide(player, hand); // Purpur @@ -17,10 +17,10 @@ index f3e622f1cdbe46ea12a1d5a969b209d1e5dde5a3..b9c464fbba1c18c524b3d1a7855c0392 } diff --git a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java -index 5951e0f583b5ab8a5b13dca6d8fcb537be4be73f..07204c4d56d0a33bd596a255f3281dd6a29233ae 100644 +index 05c63eb6cf8a7067105c58d244c7cc27d6bf1125..7c2d5d28f8c2aba2cd8255a4aef22247fe04d0e0 100644 --- a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java +++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java -@@ -150,8 +150,10 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill +@@ -155,8 +155,10 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill return tryRide(player, hand, InteractionResult.CONSUME); // Purpur } if (level().purpurConfig.wanderingTraderRidable && itemstack.isEmpty()) return tryRide(player, hand); // Purpur @@ -32,10 +32,10 @@ index 5951e0f583b5ab8a5b13dca6d8fcb537be4be73f..07204c4d56d0a33bd596a255f3281dd6 return InteractionResult.sidedSuccess(this.level().isClientSide); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index a983ef20da54ddb7cd9206c923e4ea3d810e5cac..0c027631ece28a48c373ba453b5caa0fc64c6b9b 100644 +index 9c1dfc4e0c6511f1d374c535e43fdb96d4728b16..57a22d68a94b2c55d56e1b3a884571a7f0fd14b9 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -@@ -2130,6 +2130,7 @@ public class PurpurWorldConfig { +@@ -2131,6 +2131,7 @@ public class PurpurWorldConfig { public boolean villagerClericFarmersThrowWarts = true; public boolean villagerBypassMobGriefing = false; public boolean villagerTakeDamageFromWater = false; @@ -43,7 +43,7 @@ index a983ef20da54ddb7cd9206c923e4ea3d810e5cac..0c027631ece28a48c373ba453b5caa0f private void villagerSettings() { villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable); villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater); -@@ -2147,6 +2148,7 @@ public class PurpurWorldConfig { +@@ -2149,6 +2150,7 @@ public class PurpurWorldConfig { villagerClericFarmersThrowWarts = getBoolean("mobs.villager.cleric-wart-farmers-throw-warts-at-villagers", villagerClericFarmersThrowWarts); villagerBypassMobGriefing = getBoolean("mobs.villager.bypass-mob-griefing", villagerBypassMobGriefing); villagerTakeDamageFromWater = getBoolean("mobs.villager.takes-damage-from-water", villagerTakeDamageFromWater); @@ -51,17 +51,17 @@ index a983ef20da54ddb7cd9206c923e4ea3d810e5cac..0c027631ece28a48c373ba453b5caa0f } public boolean vindicatorRidable = false; -@@ -2175,6 +2177,7 @@ public class PurpurWorldConfig { - public double wanderingTraderMaxHealth = 20.0D; +@@ -2178,6 +2180,7 @@ public class PurpurWorldConfig { public boolean wanderingTraderFollowEmeraldBlock = false; + public boolean wanderingTraderCanBeLeashed = false; public boolean wanderingTraderTakeDamageFromWater = false; + public boolean wanderingTraderAllowTrading = true; private void wanderingTraderSettings() { wanderingTraderRidable = getBoolean("mobs.wandering_trader.ridable", wanderingTraderRidable); wanderingTraderRidableInWater = getBoolean("mobs.wandering_trader.ridable-in-water", wanderingTraderRidableInWater); -@@ -2187,6 +2190,7 @@ public class PurpurWorldConfig { - wanderingTraderMaxHealth = getDouble("mobs.wandering_trader.attributes.max_health", wanderingTraderMaxHealth); +@@ -2191,6 +2194,7 @@ public class PurpurWorldConfig { wanderingTraderFollowEmeraldBlock = getBoolean("mobs.wandering_trader.follow-emerald-blocks", wanderingTraderFollowEmeraldBlock); + wanderingTraderCanBeLeashed = getBoolean("mobs.wandering_trader.can-be-leashed", wanderingTraderCanBeLeashed); wanderingTraderTakeDamageFromWater = getBoolean("mobs.wandering_trader.takes-damage-from-water", wanderingTraderTakeDamageFromWater); + wanderingTraderAllowTrading = getBoolean("mobs.wandering_trader.allow-trading", wanderingTraderAllowTrading); } diff --git a/patches/server/0135-Drowning-Settings.patch b/patches/server/0136-Drowning-Settings.patch similarity index 92% rename from patches/server/0135-Drowning-Settings.patch rename to patches/server/0136-Drowning-Settings.patch index b9e2e3655..e96b607c5 100644 --- a/patches/server/0135-Drowning-Settings.patch +++ b/patches/server/0136-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 c9eee2c313f658a027dfab977c6a7cb0992e97a2..f578cae1423e297d2e00c9b869b3fcede2eb209f 100644 +index 10aaa05948839d43933a2de32bfc6fe54f61fbff..a657b37c56bd656e81c71ae47d6cf7625d282117 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -3298,7 +3298,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -3299,7 +3299,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess } public int getMaxAirSupply() { @@ -40,7 +40,7 @@ index 583e0cfc3478df74188526a10494d81ba4303054..d76c5014ad03471874f945f58c8eb7a5 } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 0c027631ece28a48c373ba453b5caa0fc64c6b9b..aff1e4f6ffaafb81ee792fee393e122761e130a3 100644 +index 57a22d68a94b2c55d56e1b3a884571a7f0fd14b9..aded3ca8095e2bdaa7cbcf736c2ab62edfac7f78 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -160,6 +160,15 @@ public class PurpurWorldConfig { diff --git a/patches/server/0136-Break-individual-slabs-when-sneaking.patch b/patches/server/0137-Break-individual-slabs-when-sneaking.patch similarity index 97% rename from patches/server/0136-Break-individual-slabs-when-sneaking.patch rename to patches/server/0137-Break-individual-slabs-when-sneaking.patch index 04ba8cac7..8d2249ee1 100644 --- a/patches/server/0136-Break-individual-slabs-when-sneaking.patch +++ b/patches/server/0137-Break-individual-slabs-when-sneaking.patch @@ -47,7 +47,7 @@ index fa29eb15934b3dad171d27c21d99b2451cfe553b..ba4aa69425d796d306791ea193f9c6b2 + // Purpur end } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index aff1e4f6ffaafb81ee792fee393e122761e130a3..db63a695564c8af10394bf6070ed1d952ab03989 100644 +index aded3ca8095e2bdaa7cbcf736c2ab62edfac7f78..3df3e503fb0dc4084143af2bd9a93170be409a4b 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -584,6 +584,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0137-Config-to-disable-hostile-mob-spawn-on-ice.patch b/patches/server/0138-Config-to-disable-hostile-mob-spawn-on-ice.patch similarity index 96% rename from patches/server/0137-Config-to-disable-hostile-mob-spawn-on-ice.patch rename to patches/server/0138-Config-to-disable-hostile-mob-spawn-on-ice.patch index 97cec8b2d..c71894d74 100644 --- a/patches/server/0137-Config-to-disable-hostile-mob-spawn-on-ice.patch +++ b/patches/server/0138-Config-to-disable-hostile-mob-spawn-on-ice.patch @@ -24,7 +24,7 @@ index 759839e912c54598b257ad738481364940f88a18..e60e6b3e5ae5a468cfe649ed2222412f return false; } else { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index db63a695564c8af10394bf6070ed1d952ab03989..ee1e812fcfc7a2e1efc43bed88290fe3f7074d10 100644 +index 3df3e503fb0dc4084143af2bd9a93170be409a4b..65e75fa986fe041e958281b291d36440efb6f9f9 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -549,6 +549,13 @@ public class PurpurWorldConfig { diff --git a/patches/server/0138-Config-to-show-Armor-Stand-arms-on-spawn.patch b/patches/server/0139-Config-to-show-Armor-Stand-arms-on-spawn.patch similarity index 96% rename from patches/server/0138-Config-to-show-Armor-Stand-arms-on-spawn.patch rename to patches/server/0139-Config-to-show-Armor-Stand-arms-on-spawn.patch index b5f7b22f0..43ec2a7e3 100644 --- a/patches/server/0138-Config-to-show-Armor-Stand-arms-on-spawn.patch +++ b/patches/server/0139-Config-to-show-Armor-Stand-arms-on-spawn.patch @@ -17,7 +17,7 @@ index ea3cad6c9cc561b225cd41f04bd204c99ecd66ec..ad1ec2578fa428baa6b172c44b6c17e5 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 ee1e812fcfc7a2e1efc43bed88290fe3f7074d10..1c23b9aa694bd107344e18ee765d0d651cd22240 100644 +index 65e75fa986fe041e958281b291d36440efb6f9f9..7b2f6a64865168094164eb22938c6c07228dce0e 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -102,6 +102,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0139-Option-to-make-doors-require-redstone.patch b/patches/server/0140-Option-to-make-doors-require-redstone.patch similarity index 95% rename from patches/server/0139-Option-to-make-doors-require-redstone.patch rename to patches/server/0140-Option-to-make-doors-require-redstone.patch index b34335083..e0566899d 100644 --- a/patches/server/0139-Option-to-make-doors-require-redstone.patch +++ b/patches/server/0140-Option-to-make-doors-require-redstone.patch @@ -36,10 +36,10 @@ index 3513b15f6622bfc134ecfcd9129f81a8acc2c601..6e70579a58a1bf906b176b81713e5531 } else { DoorBlock blockdoor = (DoorBlock) iblockdata.getBlock(); diff --git a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java -index 07204c4d56d0a33bd596a255f3281dd6a29233ae..ac95d5acc275d69d2b420173540d7ddb64b6d711 100644 +index 7c2d5d28f8c2aba2cd8255a4aef22247fe04d0e0..6250bc28db4bbac0f101cdc93c90ec4d7ec6b2ba 100644 --- a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java +++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java -@@ -151,8 +151,8 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill +@@ -156,8 +156,8 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill } if (level().purpurConfig.wanderingTraderRidable && itemstack.isEmpty()) return tryRide(player, hand); // Purpur if (this.level().purpurConfig.wanderingTraderAllowTrading) { // Purpur @@ -82,7 +82,7 @@ index 6dd75bc722f9c20b4869e6353115c3b02dd79f99..dfaf82f5b0180cf08c4125347867d37a + // Purpur end } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 1c23b9aa694bd107344e18ee765d0d651cd22240..9be6d30c688e4929e34e9f039b32e3db177f6f57 100644 +index 7b2f6a64865168094164eb22938c6c07228dce0e..c3bd56715c119068e6735abcd60971679c5e0145 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -488,6 +488,16 @@ public class PurpurWorldConfig { diff --git a/patches/server/0140-Config-to-allow-for-unsafe-enchants.patch b/patches/server/0141-Config-to-allow-for-unsafe-enchants.patch similarity index 100% rename from patches/server/0140-Config-to-allow-for-unsafe-enchants.patch rename to patches/server/0141-Config-to-allow-for-unsafe-enchants.patch diff --git a/patches/server/0141-Configurable-sponge-absorption.patch b/patches/server/0142-Configurable-sponge-absorption.patch similarity index 95% rename from patches/server/0141-Configurable-sponge-absorption.patch rename to patches/server/0142-Configurable-sponge-absorption.patch index 3fa231c5f..8019746ef 100644 --- a/patches/server/0141-Configurable-sponge-absorption.patch +++ b/patches/server/0142-Configurable-sponge-absorption.patch @@ -21,7 +21,7 @@ index 902825ec9ea05f4418b45f56a008d73f217bd178..a676ccfa6b02e8986df6f6a2e04cbb06 int i = aenumdirection.length; diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 9be6d30c688e4929e34e9f039b32e3db177f6f57..43e26db7e22115c6814c5e6e01a96b4d08ad8bd7 100644 +index c3bd56715c119068e6735abcd60971679c5e0145..6f4865bb24761cdc5732253ab6b32606fa8fd681 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -613,6 +613,13 @@ public class PurpurWorldConfig { diff --git a/patches/server/0142-Projectile-offset-config.patch b/patches/server/0143-Projectile-offset-config.patch similarity index 99% rename from patches/server/0142-Projectile-offset-config.patch rename to patches/server/0143-Projectile-offset-config.patch index 69a688aa1..b2d09f66c 100644 --- a/patches/server/0142-Projectile-offset-config.patch +++ b/patches/server/0143-Projectile-offset-config.patch @@ -96,7 +96,7 @@ index 4934bae61114b49a9f8d0ed044fbb881210df32a..1be074074283f12543ac771ac9201580 entitythrowntrident.pickup = AbstractArrow.Pickup.CREATIVE_ONLY; } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 43e26db7e22115c6814c5e6e01a96b4d08ad8bd7..ebc3615b395e9f9ff9a6dd5ac65eec6b530edad4 100644 +index 6f4865bb24761cdc5732253ab6b32606fa8fd681..8ccc5c29e72b2f03449c82f9aeed0a3bb451e836 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -438,6 +438,23 @@ public class PurpurWorldConfig { diff --git a/patches/server/0143-Config-for-powered-rail-activation-distance.patch b/patches/server/0144-Config-for-powered-rail-activation-distance.patch similarity index 94% rename from patches/server/0143-Config-for-powered-rail-activation-distance.patch rename to patches/server/0144-Config-for-powered-rail-activation-distance.patch index b570b48c8..d272aedf5 100644 --- a/patches/server/0143-Config-for-powered-rail-activation-distance.patch +++ b/patches/server/0144-Config-for-powered-rail-activation-distance.patch @@ -18,7 +18,7 @@ index 9603d8c84ff483030dc08e82d3579b89e5c1f6e9..8fc65c32a3c6e6842a76b36f45e1b1c2 } else { int j = pos.getX(); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index ebc3615b395e9f9ff9a6dd5ac65eec6b530edad4..948fcb804e6ca46f2af1de41472c70c88711c47f 100644 +index 8ccc5c29e72b2f03449c82f9aeed0a3bb451e836..a6c2d158490a7972d821cda0516eb9659ccd621a 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -599,6 +599,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0144-Piglin-portal-spawn-modifier.patch b/patches/server/0145-Piglin-portal-spawn-modifier.patch similarity index 96% rename from patches/server/0144-Piglin-portal-spawn-modifier.patch rename to patches/server/0145-Piglin-portal-spawn-modifier.patch index e86e05542..903649084 100644 --- a/patches/server/0144-Piglin-portal-spawn-modifier.patch +++ b/patches/server/0145-Piglin-portal-spawn-modifier.patch @@ -31,7 +31,7 @@ index caa22afb0781671b901c23ebcc89e5bb0d2bd615..259f7e162968714e2959b199c7b1ab84 pos = pos.below(); } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 948fcb804e6ca46f2af1de41472c70c88711c47f..fdd84855671d21a4ecc5743b5ae72a645fc46443 100644 +index a6c2d158490a7972d821cda0516eb9659ccd621a..b15c74a0c1c4ce623cdc4eb15300db6b8cc24714 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1655,6 +1655,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0145-Config-to-change-max-number-of-bees.patch b/patches/server/0146-Config-to-change-max-number-of-bees.patch similarity index 100% rename from patches/server/0145-Config-to-change-max-number-of-bees.patch rename to patches/server/0146-Config-to-change-max-number-of-bees.patch diff --git a/patches/server/0146-Config-for-wither-explosion-radius.patch b/patches/server/0147-Config-for-wither-explosion-radius.patch similarity index 92% rename from patches/server/0146-Config-for-wither-explosion-radius.patch rename to patches/server/0147-Config-for-wither-explosion-radius.patch index 7d5e82613..a3ca91603 100644 --- a/patches/server/0146-Config-for-wither-explosion-radius.patch +++ b/patches/server/0147-Config-for-wither-explosion-radius.patch @@ -18,10 +18,10 @@ index e472df057d087fe46bd40b798c050ed6e38a283c..999453409c19abf7f5b5c2dc39969985 if (!event.isCancelled()) { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index fdd84855671d21a4ecc5743b5ae72a645fc46443..b4bffe75d0462c44eada1a1412afea69732fdf6e 100644 +index b15c74a0c1c4ce623cdc4eb15300db6b8cc24714..b405cdee56f4cbacca3be2e0810799f8e7620724 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -@@ -2294,6 +2294,7 @@ public class PurpurWorldConfig { +@@ -2298,6 +2298,7 @@ public class PurpurWorldConfig { public boolean witherBypassMobGriefing = false; public boolean witherTakeDamageFromWater = false; public boolean witherCanRideVehicles = false; @@ -29,7 +29,7 @@ index fdd84855671d21a4ecc5743b5ae72a645fc46443..b4bffe75d0462c44eada1a1412afea69 private void witherSettings() { witherRidable = getBoolean("mobs.wither.ridable", witherRidable); witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater); -@@ -2314,6 +2315,7 @@ public class PurpurWorldConfig { +@@ -2318,6 +2319,7 @@ public class PurpurWorldConfig { witherBypassMobGriefing = getBoolean("mobs.wither.bypass-mob-griefing", witherBypassMobGriefing); witherTakeDamageFromWater = getBoolean("mobs.wither.takes-damage-from-water", witherTakeDamageFromWater); witherCanRideVehicles = getBoolean("mobs.wither.can-ride-vehicles", witherCanRideVehicles); diff --git a/patches/server/0147-Gamemode-extra-permissions.patch b/patches/server/0148-Gamemode-extra-permissions.patch similarity index 98% rename from patches/server/0147-Gamemode-extra-permissions.patch rename to patches/server/0148-Gamemode-extra-permissions.patch index 6a9514a62..fe0293f51 100644 --- a/patches/server/0147-Gamemode-extra-permissions.patch +++ b/patches/server/0148-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 c98247a6ccc015f1da2c11995fb392b24197e888..dea4dd6f0fbb1fc79132c249b9f72edba1366efd 100644 +index b51850c0368b0fa2c9eb4ca44b9c931eb46478fc..684536f600cca94ea346129a139ec4aac4d9f979 100644 --- a/src/main/java/net/minecraft/commands/CommandSourceStack.java +++ b/src/main/java/net/minecraft/commands/CommandSourceStack.java @@ -209,6 +209,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 f578cae1423e297d2e00c9b869b3fcede2eb209f..1c99a0c4a335db2cb444793b6aba43ab600597d2 100644 +index a657b37c56bd656e81c71ae47d6cf7625d282117..fcb3c6230b299a60ec96f3b77b757cf342e0715a 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -534,6 +534,21 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0162-Config-MobEffect-by-world.patch b/patches/server/0163-Config-MobEffect-by-world.patch similarity index 98% rename from patches/server/0162-Config-MobEffect-by-world.patch rename to patches/server/0163-Config-MobEffect-by-world.patch index 6e25cdb73..d9cb38e96 100644 --- a/patches/server/0162-Config-MobEffect-by-world.patch +++ b/patches/server/0163-Config-MobEffect-by-world.patch @@ -72,7 +72,7 @@ index f43bf280999ff3860cc702def50cc62b131eb1bd..66d9e99a351f5fc6cf58be3bee4397d9 } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index c7cbb28870e3640f88c5b2b33f89212580f1c652..58a92d771b8ea5562c10d2149e694a3e84aae6b1 100644 +index ba5bbb8a95bb7bb0f26693a34d1fd9c6eb0fd809..c329e73351d34abbd49586d0c8161edbdb419315 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -316,6 +316,21 @@ public class PurpurWorldConfig { diff --git a/patches/server/0163-Beacon-Activation-Range-Configurable.patch b/patches/server/0164-Beacon-Activation-Range-Configurable.patch similarity index 96% rename from patches/server/0163-Beacon-Activation-Range-Configurable.patch rename to patches/server/0164-Beacon-Activation-Range-Configurable.patch index 374f9849d..8d2b06ae1 100644 --- a/patches/server/0163-Beacon-Activation-Range-Configurable.patch +++ b/patches/server/0164-Beacon-Activation-Range-Configurable.patch @@ -26,7 +26,7 @@ index 814e70f558d7a6186233da0ff86c94c95d390e09..d1fb77d83d48183a9a37dbeec7bb0fda } else { return effectRange; diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 58a92d771b8ea5562c10d2149e694a3e84aae6b1..8e30b0bec3ffb54328110cdc726234a48f28f175 100644 +index c329e73351d34abbd49586d0c8161edbdb419315..b43cda3ec12d2d11a83c18cf0c2db527ef0cbf94 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -488,6 +488,17 @@ public class PurpurWorldConfig { diff --git a/patches/server/0164-Make-lightning-rod-range-configurable.patch b/patches/server/0165-Make-lightning-rod-range-configurable.patch similarity index 100% rename from patches/server/0164-Make-lightning-rod-range-configurable.patch rename to patches/server/0165-Make-lightning-rod-range-configurable.patch diff --git a/patches/server/0165-Burp-delay-burp-after-eating-food-fills-hunger-bar-c.patch b/patches/server/0166-Burp-delay-burp-after-eating-food-fills-hunger-bar-c.patch similarity index 97% rename from patches/server/0165-Burp-delay-burp-after-eating-food-fills-hunger-bar-c.patch rename to patches/server/0166-Burp-delay-burp-after-eating-food-fills-hunger-bar-c.patch index 72eb16dc2..ac28fc89d 100644 --- a/patches/server/0165-Burp-delay-burp-after-eating-food-fills-hunger-bar-c.patch +++ b/patches/server/0166-Burp-delay-burp-after-eating-food-fills-hunger-bar-c.patch @@ -54,7 +54,7 @@ index bd3f78e6453cfe18aa3da38176b04d734d83bb4b..515dd3b769917c4aa60ce180ef24f38c public void eat(FoodProperties foodComponent) { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 8e30b0bec3ffb54328110cdc726234a48f28f175..c4ce94b55e561cd99b680afd753393fc6bda8348 100644 +index b43cda3ec12d2d11a83c18cf0c2db527ef0cbf94..e3aacb497a05de0acd6a95395a9cdf4c99762bb5 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -372,6 +372,8 @@ public class PurpurWorldConfig { diff --git a/patches/server/0166-Allow-player-join-full-server-by-permission.patch b/patches/server/0167-Allow-player-join-full-server-by-permission.patch similarity index 93% rename from patches/server/0166-Allow-player-join-full-server-by-permission.patch rename to patches/server/0167-Allow-player-join-full-server-by-permission.patch index 7f9f0f072..a0433e26d 100644 --- a/patches/server/0166-Allow-player-join-full-server-by-permission.patch +++ b/patches/server/0167-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 b6289dbad3d2a840dfef9505127a343f032f1da5..4c639d3ea0ed99592fcd04381a314ead19ed4ab4 100644 +index a8f8b3da5d1fe661f4c6a2487e81dd6b01653960..f4f965a51628a096f6697f4008ec9dba04d30fd2 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -747,7 +747,7 @@ public abstract class PlayerList { diff --git a/patches/server/0167-Shulker-spawn-from-bullet-options.patch b/patches/server/0168-Shulker-spawn-from-bullet-options.patch similarity index 98% rename from patches/server/0167-Shulker-spawn-from-bullet-options.patch rename to patches/server/0168-Shulker-spawn-from-bullet-options.patch index f46624754..39fcbfe1d 100644 --- a/patches/server/0167-Shulker-spawn-from-bullet-options.patch +++ b/patches/server/0168-Shulker-spawn-from-bullet-options.patch @@ -68,7 +68,7 @@ index 0d04a0107bd1a8a2b9aeb4be55025cd554e8fb79..a050d76233e179a1456b83ccc02bb9a5 + // Purpur end } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index c4ce94b55e561cd99b680afd753393fc6bda8348..7029a053ac83ee579cb570ccc215aec07e22b25b 100644 +index e3aacb497a05de0acd6a95395a9cdf4c99762bb5..c4c200fb05b9a1533f923dd32de7b82a11ab2c38 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1915,6 +1915,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0168-Eating-glow-berries-adds-glow-effect.patch b/patches/server/0169-Eating-glow-berries-adds-glow-effect.patch similarity index 97% rename from patches/server/0168-Eating-glow-berries-adds-glow-effect.patch rename to patches/server/0169-Eating-glow-berries-adds-glow-effect.patch index 94fd9b788..abe91b85d 100644 --- a/patches/server/0168-Eating-glow-berries-adds-glow-effect.patch +++ b/patches/server/0169-Eating-glow-berries-adds-glow-effect.patch @@ -18,7 +18,7 @@ index 4eef61323ba54f513e6f251ef7c804b2c91ff477..6b2235281dca67a80cb651e9f8e9bf25 public static final Item CAMPFIRE = registerBlock(Blocks.CAMPFIRE, settings -> settings.component(DataComponents.CONTAINER, ItemContainerContents.EMPTY)); public static final Item SOUL_CAMPFIRE = registerBlock( diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 7029a053ac83ee579cb570ccc215aec07e22b25b..e9fd469cad81b04a74dfa03ec9f5cca7b78ddd5c 100644 +index c4c200fb05b9a1533f923dd32de7b82a11ab2c38..a0206de2a6391cfe9d8c81ca43f9c042e7c7277c 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -205,6 +205,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0169-Option-to-make-drowned-break-doors.patch b/patches/server/0170-Option-to-make-drowned-break-doors.patch similarity index 96% rename from patches/server/0169-Option-to-make-drowned-break-doors.patch rename to patches/server/0170-Option-to-make-drowned-break-doors.patch index dbfd7e1f4..bdc8c5bc7 100644 --- a/patches/server/0169-Option-to-make-drowned-break-doors.patch +++ b/patches/server/0170-Option-to-make-drowned-break-doors.patch @@ -26,7 +26,7 @@ index f037d50f26f7532f11a71790448de7a71644b6ca..b3a79dc4357ad4392101353fbc99aac1 @Override diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index e9fd469cad81b04a74dfa03ec9f5cca7b78ddd5c..3eb73f0817ccdfdfc88ff819b5338e0fc8391f92 100644 +index a0206de2a6391cfe9d8c81ca43f9c042e7c7277c..c92c061b373e6e814afe7bac7df05144c5059980 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1061,6 +1061,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0170-Configurable-hunger-starvation-damage.patch b/patches/server/0171-Configurable-hunger-starvation-damage.patch similarity index 92% rename from patches/server/0170-Configurable-hunger-starvation-damage.patch rename to patches/server/0171-Configurable-hunger-starvation-damage.patch index e0754387f..2860c9858 100644 --- a/patches/server/0170-Configurable-hunger-starvation-damage.patch +++ b/patches/server/0171-Configurable-hunger-starvation-damage.patch @@ -18,10 +18,10 @@ index 515dd3b769917c4aa60ce180ef24f38ca12e6848..c7ad716f607afe382436d088a2b2e622 this.tickTimer = 0; diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 3eb73f0817ccdfdfc88ff819b5338e0fc8391f92..7eac431d91eea903106f39c4d6210b5dde01b9a8 100644 +index c92c061b373e6e814afe7bac7df05144c5059980..d3ba35bc966b445e37221b136341b8e0406464ff 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -@@ -2570,4 +2570,9 @@ public class PurpurWorldConfig { +@@ -2574,4 +2574,9 @@ public class PurpurWorldConfig { zombifiedPiglinCountAsPlayerKillWhenAngry = getBoolean("mobs.zombified_piglin.count-as-player-kill-when-angry", zombifiedPiglinCountAsPlayerKillWhenAngry); zombifiedPiglinTakeDamageFromWater = getBoolean("mobs.zombified_piglin.takes-damage-from-water", zombifiedPiglinTakeDamageFromWater); } diff --git a/patches/server/0171-Enhance-SysoutCatcher.patch b/patches/server/0172-Enhance-SysoutCatcher.patch similarity index 100% rename from patches/server/0171-Enhance-SysoutCatcher.patch rename to patches/server/0172-Enhance-SysoutCatcher.patch diff --git a/patches/server/0172-Add-uptime-command.patch b/patches/server/0173-Add-uptime-command.patch similarity index 97% rename from patches/server/0172-Add-uptime-command.patch rename to patches/server/0173-Add-uptime-command.patch index 90e2cba24..7687bfbfa 100644 --- a/patches/server/0172-Add-uptime-command.patch +++ b/patches/server/0173-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 023f936a71c657c152fc38c262d59bb3cd5292d6..a9180b1ce021f6d4d60e43bc04e863be99daf9d3 100644 +index 37d2e9a7b9a5e9b71a49bdb5d421d5d201c609c5..938f0cc6631e5fdf687f43c1adc850d778227e98 100644 --- a/src/main/java/net/minecraft/commands/Commands.java +++ b/src/main/java/net/minecraft/commands/Commands.java @@ -253,6 +253,7 @@ public class Commands { @@ -17,7 +17,7 @@ index 023f936a71c657c152fc38c262d59bb3cd5292d6..a9180b1ce021f6d4d60e43bc04e863be } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 2c64b5f4a357974554c7f33ccc212cfde197f208..fa6bf262da81837c7ff7b115a0a7b4a7f266037a 100644 +index d8194ec9b676582fe5684d1330674ef847a04682..02bec087837783892db667883db89263bae1ca76 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -304,6 +304,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop transaction = new java.util.ArrayList(); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 1fd6461bce10673f618f20ec10511cfe30e3eb87..8632ef169eab32caca3a6d89011c37e81345b7d0 100644 +index 4298925b5c84eee506ccdb8e84bc14b9d6cfff2c..0efa97d026673aae4fc60f719e18a0ce342a6cab 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1598,6 +1598,19 @@ public final class CraftServer implements Server { diff --git a/patches/server/0194-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch b/patches/server/0195-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch similarity index 97% rename from patches/server/0194-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch rename to patches/server/0195-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch index ff892e634..44547e8d7 100644 --- a/patches/server/0194-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch +++ b/patches/server/0195-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch @@ -25,7 +25,7 @@ index 74200fab686750cd53fc30edd050189cb11fe857..9e3dc4bf5ad390e6e49a5193c7788d0c // 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 718820118e590034a68a10bda7d680a24f2d83b7..29930a89ec305901e6520ccea63940e4d3a9da49 100644 +index b5eed802c2537996e4eb33d7a56b1598a8053395..69d53bd673acc598daa8287e90401160eb97a3b1 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -137,6 +137,8 @@ public class PurpurWorldConfig { diff --git a/patches/server/0195-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch b/patches/server/0196-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch similarity index 97% rename from patches/server/0195-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch rename to patches/server/0196-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch index cd8d14525..e5a20f30c 100644 --- a/patches/server/0195-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch +++ b/patches/server/0196-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch @@ -50,7 +50,7 @@ index 223259e7a09ada681b6181c898f6857888594f85..7d58a95f7ae8983b466b275f4f82597d .sound(SoundType.FLOWERING_AZALEA) .noOcclusion() diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 29930a89ec305901e6520ccea63940e4d3a9da49..ccf1ba95e0dc595276d2b69d7ead7249966b92da 100644 +index 69d53bd673acc598daa8287e90401160eb97a3b1..27a565460a365889021f50566050ffc11770da00 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -787,6 +787,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0196-Shift-right-click-to-use-exp-for-mending.patch b/patches/server/0197-Shift-right-click-to-use-exp-for-mending.patch similarity index 97% rename from patches/server/0196-Shift-right-click-to-use-exp-for-mending.patch rename to patches/server/0197-Shift-right-click-to-use-exp-for-mending.patch index e402febc7..8c8b25ec1 100644 --- a/patches/server/0196-Shift-right-click-to-use-exp-for-mending.patch +++ b/patches/server/0197-Shift-right-click-to-use-exp-for-mending.patch @@ -48,7 +48,7 @@ index 22979d8531fd9732b1fd5eaf76aec52b22fdf6bb..d0672ed5abf3488fc3ec6ea8b153e2d2 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 ccf1ba95e0dc595276d2b69d7ead7249966b92da..e224eb3e438e7099d37519ccf3640c351df83ba7 100644 +index 27a565460a365889021f50566050ffc11770da00..c4cd180fc707e6cda168c21217e8459f003c7493 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -394,6 +394,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0197-Dolphins-naturally-aggressive-to-players-chance.patch b/patches/server/0198-Dolphins-naturally-aggressive-to-players-chance.patch similarity index 98% rename from patches/server/0197-Dolphins-naturally-aggressive-to-players-chance.patch rename to patches/server/0198-Dolphins-naturally-aggressive-to-players-chance.patch index f9088b792..f05c2bd8e 100644 --- a/patches/server/0197-Dolphins-naturally-aggressive-to-players-chance.patch +++ b/patches/server/0198-Dolphins-naturally-aggressive-to-players-chance.patch @@ -48,7 +48,7 @@ index 439fa9a5070889a4dee48786509940c4d56b6806..f2e1954a1e80862ec3818af448cf4096 public static AttributeSupplier.Builder createAttributes() { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index e224eb3e438e7099d37519ccf3640c351df83ba7..99501a23ac62215baa452354c77c6c4631458595 100644 +index c4cd180fc707e6cda168c21217e8459f003c7493..a7cd2c19cf2e3192f415b24465f53ae881ca16ed 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1338,6 +1338,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0198-Cows-naturally-aggressive-to-players-chance.patch b/patches/server/0199-Cows-naturally-aggressive-to-players-chance.patch similarity index 98% rename from patches/server/0198-Cows-naturally-aggressive-to-players-chance.patch rename to patches/server/0199-Cows-naturally-aggressive-to-players-chance.patch index 315926bfc..77e3857e8 100644 --- a/patches/server/0198-Cows-naturally-aggressive-to-players-chance.patch +++ b/patches/server/0199-Cows-naturally-aggressive-to-players-chance.patch @@ -61,7 +61,7 @@ index c519883f4ed3772378b5563401b8c557dc315ace..78f00014c034949b6559ca948b1b78fa @Override diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 99501a23ac62215baa452354c77c6c4631458595..df9aac76b92b41a0c8f5d87f86e9fbffc3e46d50 100644 +index a7cd2c19cf2e3192f415b24465f53ae881ca16ed..7672746ac6d2e9a3c555d201a94e21af3143e7f9 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1287,7 +1287,14 @@ public class PurpurWorldConfig { diff --git a/patches/server/0199-Option-for-beds-to-explode-on-villager-sleep.patch b/patches/server/0200-Option-for-beds-to-explode-on-villager-sleep.patch similarity index 90% rename from patches/server/0199-Option-for-beds-to-explode-on-villager-sleep.patch rename to patches/server/0200-Option-for-beds-to-explode-on-villager-sleep.patch index 6610e9d37..c71f01551 100644 --- a/patches/server/0199-Option-for-beds-to-explode-on-villager-sleep.patch +++ b/patches/server/0200-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 b9c464fbba1c18c524b3d1a7855c0392266e0734..2128eee536352e380fa2f0ea2c752dc64292f6bf 100644 +index 1e100de8d30777e83907c523ffc1a3a54c670205..a9f6016b76dce5ca63b3a1093241c9e6e19ad07c 100644 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java -@@ -1099,6 +1099,12 @@ public class Villager extends AbstractVillager implements ReputationEventHandler +@@ -1104,6 +1104,12 @@ public class Villager extends AbstractVillager implements ReputationEventHandler @Override public void startSleeping(BlockPos pos) { @@ -22,7 +22,7 @@ index b9c464fbba1c18c524b3d1a7855c0392266e0734..2128eee536352e380fa2f0ea2c752dc6 this.brain.setMemory(MemoryModuleType.LAST_SLEPT, this.level().getGameTime()); // CraftBukkit - decompile error this.brain.eraseMemory(MemoryModuleType.WALK_TARGET); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index df9aac76b92b41a0c8f5d87f86e9fbffc3e46d50..b9f054715d7a84f7938e83bc16bb5d6f684a6083 100644 +index 7672746ac6d2e9a3c555d201a94e21af3143e7f9..946bc819945cfd431da1eb26ac79902110975e3e 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -806,6 +806,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0200-Halloween-options-and-optimizations.patch b/patches/server/0201-Halloween-options-and-optimizations.patch similarity index 98% rename from patches/server/0200-Halloween-options-and-optimizations.patch rename to patches/server/0201-Halloween-options-and-optimizations.patch index aa77fe58a..ae7e2c536 100644 --- a/patches/server/0200-Halloween-options-and-optimizations.patch +++ b/patches/server/0201-Halloween-options-and-optimizations.patch @@ -60,7 +60,7 @@ index c8a664447f19e437eb7c615563add92715be9650..fc6914d459b1985a2cba0f963a7d79eb this.armorDropChances[EquipmentSlot.HEAD.getIndex()] = 0.0F; } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index b9f054715d7a84f7938e83bc16bb5d6f684a6083..0f9b5dbff992006ce8bc6cdd2c07668f1a4fa1f6 100644 +index 946bc819945cfd431da1eb26ac79902110975e3e..76ef38725abcfe5632a42a7fdb949f75819a1b86 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1680,6 +1680,13 @@ public class PurpurWorldConfig { diff --git a/patches/server/0201-Config-for-grindstones.patch b/patches/server/0202-Config-for-grindstones.patch similarity index 100% rename from patches/server/0201-Config-for-grindstones.patch rename to patches/server/0202-Config-for-grindstones.patch diff --git a/patches/server/0202-UPnP-Port-Forwarding.patch b/patches/server/0203-UPnP-Port-Forwarding.patch similarity index 100% rename from patches/server/0202-UPnP-Port-Forwarding.patch rename to patches/server/0203-UPnP-Port-Forwarding.patch diff --git a/patches/server/0203-Campfire-option-for-lit-when-placed.patch b/patches/server/0204-Campfire-option-for-lit-when-placed.patch similarity index 96% rename from patches/server/0203-Campfire-option-for-lit-when-placed.patch rename to patches/server/0204-Campfire-option-for-lit-when-placed.patch index dd64ec499..193aab286 100644 --- a/patches/server/0203-Campfire-option-for-lit-when-placed.patch +++ b/patches/server/0204-Campfire-option-for-lit-when-placed.patch @@ -18,7 +18,7 @@ index 7f6058f4def83867971121751acd51c398583651..5a49daf7b6bf9e0ec3d50494287a620d @Override diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 0f9b5dbff992006ce8bc6cdd2c07668f1a4fa1f6..c19eef807105479a98a549c197054b8d31923428 100644 +index 76ef38725abcfe5632a42a7fdb949f75819a1b86..ba8b86180491cf1c8f1c1fbe79ee1a68846a0a13 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -849,6 +849,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0204-options-to-extinguish-fire-blocks-with-snowballs.patch b/patches/server/0205-options-to-extinguish-fire-blocks-with-snowballs.patch similarity index 98% rename from patches/server/0204-options-to-extinguish-fire-blocks-with-snowballs.patch rename to patches/server/0205-options-to-extinguish-fire-blocks-with-snowballs.patch index e2abe756b..d633117a4 100644 --- a/patches/server/0204-options-to-extinguish-fire-blocks-with-snowballs.patch +++ b/patches/server/0205-options-to-extinguish-fire-blocks-with-snowballs.patch @@ -46,7 +46,7 @@ index f59a2903bfb8ae591a638ea5bb387caaa93ce664..1b9d0e28e518c501b4b93ae385ddd64a protected void onHit(HitResult hitResult) { super.onHit(hitResult); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index c19eef807105479a98a549c197054b8d31923428..fef6e398874977f8502aa3f7c0a2db57def2796d 100644 +index ba8b86180491cf1c8f1c1fbe79ee1a68846a0a13..56dd211d25bf81965736ecbf830a622847989133 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -216,6 +216,9 @@ public class PurpurWorldConfig { diff --git a/patches/server/0205-Add-option-to-disable-zombie-villagers-cure.patch b/patches/server/0206-Add-option-to-disable-zombie-villagers-cure.patch similarity index 92% rename from patches/server/0205-Add-option-to-disable-zombie-villagers-cure.patch rename to patches/server/0206-Add-option-to-disable-zombie-villagers-cure.patch index b07932549..a48f141f8 100644 --- a/patches/server/0205-Add-option-to-disable-zombie-villagers-cure.patch +++ b/patches/server/0206-Add-option-to-disable-zombie-villagers-cure.patch @@ -18,10 +18,10 @@ index 9bb75b49ea2d0bd8aafbe537b65f86eb04f6cfe2..612907fe87e46b5b13ed80635f203fa9 if (!this.level().isClientSide) { this.startConverting(player.getUUID(), this.random.nextInt(level().purpurConfig.zombieVillagerCuringTimeMax - level().purpurConfig.zombieVillagerCuringTimeMin + 1) + level().purpurConfig.zombieVillagerCuringTimeMin); // Purpur diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index fef6e398874977f8502aa3f7c0a2db57def2796d..0b14c7d2aaa4dcc42a4c2207ce323e6d29475288 100644 +index 56dd211d25bf81965736ecbf830a622847989133..ae7437ccc0489c05afc363f14b8fb4c46dd1e6fd 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -@@ -2895,6 +2895,7 @@ public class PurpurWorldConfig { +@@ -2899,6 +2899,7 @@ public class PurpurWorldConfig { public boolean zombieVillagerTakeDamageFromWater = false; public int zombieVillagerCuringTimeMin = 3600; public int zombieVillagerCuringTimeMax = 6000; @@ -29,7 +29,7 @@ index fef6e398874977f8502aa3f7c0a2db57def2796d..0b14c7d2aaa4dcc42a4c2207ce323e6d private void zombieVillagerSettings() { zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable); zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater); -@@ -2912,6 +2913,7 @@ public class PurpurWorldConfig { +@@ -2916,6 +2917,7 @@ public class PurpurWorldConfig { zombieVillagerTakeDamageFromWater = getBoolean("mobs.zombie_villager.takes-damage-from-water", zombieVillagerTakeDamageFromWater); zombieVillagerCuringTimeMin = getInt("mobs.zombie_villager.curing_time.min", zombieVillagerCuringTimeMin); zombieVillagerCuringTimeMax = getInt("mobs.zombie_villager.curing_time.max", zombieVillagerCuringTimeMax); diff --git a/patches/server/0206-Persistent-BlockEntity-Lore-and-DisplayName.patch b/patches/server/0207-Persistent-BlockEntity-Lore-and-DisplayName.patch similarity index 99% rename from patches/server/0206-Persistent-BlockEntity-Lore-and-DisplayName.patch rename to patches/server/0207-Persistent-BlockEntity-Lore-and-DisplayName.patch index 79cd60f42..90112cb8a 100644 --- a/patches/server/0206-Persistent-BlockEntity-Lore-and-DisplayName.patch +++ b/patches/server/0207-Persistent-BlockEntity-Lore-and-DisplayName.patch @@ -135,7 +135,7 @@ index c0563260277f9f4bd9ff08993b2efb4bca9a0c60..cd0e43f4c53a746dd6183a8406269f9b + // Purpur end } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 0b14c7d2aaa4dcc42a4c2207ce323e6d29475288..7fc42ce536d08e870addbea61d8ce933ef4f9fc2 100644 +index ae7437ccc0489c05afc363f14b8fb4c46dd1e6fd..598ff5c02504793b377bbce12d1219c3b900a1bd 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -128,6 +128,8 @@ public class PurpurWorldConfig { diff --git a/patches/server/0207-Signs-allow-color-codes.patch b/patches/server/0208-Signs-allow-color-codes.patch similarity index 98% rename from patches/server/0207-Signs-allow-color-codes.patch rename to patches/server/0208-Signs-allow-color-codes.patch index 075745bee..be0815d13 100644 --- a/patches/server/0207-Signs-allow-color-codes.patch +++ b/patches/server/0208-Signs-allow-color-codes.patch @@ -84,7 +84,7 @@ index a28be7a332659be655f419d969e0c64e659b6c21..8cd812a25b1cc05ea14675658bf9c150 public ClientboundBlockEntityDataPacket getUpdatePacket() { return ClientboundBlockEntityDataPacket.create(this); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 7fc42ce536d08e870addbea61d8ce933ef4f9fc2..2c7ff15022e75fc14f9087282b17a6abc0e3690c 100644 +index 598ff5c02504793b377bbce12d1219c3b900a1bd..2fb97fde913074fed029d26c800f12b3113901bb 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1022,6 +1022,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0208-Kelp-cave-weeping-and-twisting-vines-configurable-ma.patch b/patches/server/0209-Kelp-cave-weeping-and-twisting-vines-configurable-ma.patch similarity index 100% rename from patches/server/0208-Kelp-cave-weeping-and-twisting-vines-configurable-ma.patch rename to patches/server/0209-Kelp-cave-weeping-and-twisting-vines-configurable-ma.patch diff --git a/patches/server/0209-Mobs-always-drop-experience.patch b/patches/server/0210-Mobs-always-drop-experience.patch similarity index 98% rename from patches/server/0209-Mobs-always-drop-experience.patch rename to patches/server/0210-Mobs-always-drop-experience.patch index e4770edfd..bdc248f4c 100644 --- a/patches/server/0209-Mobs-always-drop-experience.patch +++ b/patches/server/0210-Mobs-always-drop-experience.patch @@ -1125,10 +1125,10 @@ index 6c7e0f177382cb6329002dcde270f6ce51f08f9f..71d2501e88a99819ef305fa8715418aa return Monster.createMonsterAttributes().add(Attributes.MAX_HEALTH, 50.0).add(Attributes.MOVEMENT_SPEED, 0.35F).add(Attributes.ATTACK_DAMAGE, 7.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 c40070cf6654ebd7efb83c108efd29a5670ac234..d78e6b3dd97973589c1d1c666164960d28c26ec8 100644 +index a9f6016b76dce5ca63b3a1093241c9e6e19ad07c..a324f1c33e327675fed853a49957399e162c4c8a 100644 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java -@@ -189,6 +189,11 @@ public class Villager extends AbstractVillager implements ReputationEventHandler +@@ -194,6 +194,11 @@ public class Villager extends AbstractVillager implements ReputationEventHandler return this.level().purpurConfig.villagerTakeDamageFromWater; } @@ -1141,10 +1141,10 @@ index c40070cf6654ebd7efb83c108efd29a5670ac234..d78e6b3dd97973589c1d1c666164960d public Brain getBrain() { return (Brain) super.getBrain(); // CraftBukkit - decompile error diff --git a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java -index ac95d5acc275d69d2b420173540d7ddb64b6d711..1313844a719befa96d4d8ab23505e89e8c4df2fd 100644 +index 6250bc28db4bbac0f101cdc93c90ec4d7ec6b2ba..d342752271c76b447bb8cde50d57407259b93c43 100644 --- a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java +++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java -@@ -98,6 +98,11 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill +@@ -103,6 +103,11 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill return this.level().purpurConfig.wanderingTraderTakeDamageFromWater; } @@ -1157,7 +1157,7 @@ index ac95d5acc275d69d2b420173540d7ddb64b6d711..1313844a719befa96d4d8ab23505e89e protected void registerGoals() { this.goalSelector.addGoal(0, new FloatGoal(this)); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 2c7ff15022e75fc14f9087282b17a6abc0e3690c..85923289e2e66f4d33e77089f06f5b3985a83d6e 100644 +index 2fb97fde913074fed029d26c800f12b3113901bb..b4d681c2286d40e0544ab0ab88353f0afde82335 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1102,12 +1102,14 @@ public class PurpurWorldConfig { @@ -2112,7 +2112,7 @@ index 2c7ff15022e75fc14f9087282b17a6abc0e3690c..85923289e2e66f4d33e77089f06f5b39 } public boolean villagerRidable = false; -@@ -2647,6 +2767,7 @@ public class PurpurWorldConfig { +@@ -2648,6 +2768,7 @@ public class PurpurWorldConfig { public boolean villagerBypassMobGriefing = false; public boolean villagerTakeDamageFromWater = false; public boolean villagerAllowTrading = true; @@ -2120,7 +2120,7 @@ index 2c7ff15022e75fc14f9087282b17a6abc0e3690c..85923289e2e66f4d33e77089f06f5b39 private void villagerSettings() { villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable); villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater); -@@ -2665,6 +2786,7 @@ public class PurpurWorldConfig { +@@ -2667,6 +2788,7 @@ public class PurpurWorldConfig { villagerBypassMobGriefing = getBoolean("mobs.villager.bypass-mob-griefing", villagerBypassMobGriefing); villagerTakeDamageFromWater = getBoolean("mobs.villager.takes-damage-from-water", villagerTakeDamageFromWater); villagerAllowTrading = getBoolean("mobs.villager.allow-trading", villagerAllowTrading); @@ -2128,7 +2128,7 @@ index 2c7ff15022e75fc14f9087282b17a6abc0e3690c..85923289e2e66f4d33e77089f06f5b39 } public boolean vindicatorRidable = false; -@@ -2673,6 +2795,7 @@ public class PurpurWorldConfig { +@@ -2675,6 +2797,7 @@ public class PurpurWorldConfig { public double vindicatorMaxHealth = 24.0D; public double vindicatorJohnnySpawnChance = 0D; public boolean vindicatorTakeDamageFromWater = false; @@ -2136,7 +2136,7 @@ index 2c7ff15022e75fc14f9087282b17a6abc0e3690c..85923289e2e66f4d33e77089f06f5b39 private void vindicatorSettings() { vindicatorRidable = getBoolean("mobs.vindicator.ridable", vindicatorRidable); vindicatorRidableInWater = getBoolean("mobs.vindicator.ridable-in-water", vindicatorRidableInWater); -@@ -2685,6 +2808,7 @@ public class PurpurWorldConfig { +@@ -2687,6 +2810,7 @@ public class PurpurWorldConfig { vindicatorMaxHealth = getDouble("mobs.vindicator.attributes.max_health", vindicatorMaxHealth); vindicatorJohnnySpawnChance = getDouble("mobs.vindicator.johnny.spawn-chance", vindicatorJohnnySpawnChance); vindicatorTakeDamageFromWater = getBoolean("mobs.vindicator.takes-damage-from-water", vindicatorTakeDamageFromWater); @@ -2144,23 +2144,23 @@ index 2c7ff15022e75fc14f9087282b17a6abc0e3690c..85923289e2e66f4d33e77089f06f5b39 } public boolean wanderingTraderRidable = false; -@@ -2694,6 +2818,7 @@ public class PurpurWorldConfig { - public boolean wanderingTraderFollowEmeraldBlock = false; +@@ -2697,6 +2821,7 @@ public class PurpurWorldConfig { + public boolean wanderingTraderCanBeLeashed = false; public boolean wanderingTraderTakeDamageFromWater = false; public boolean wanderingTraderAllowTrading = true; + public boolean wanderingTraderAlwaysDropExp = false; private void wanderingTraderSettings() { wanderingTraderRidable = getBoolean("mobs.wandering_trader.ridable", wanderingTraderRidable); wanderingTraderRidableInWater = getBoolean("mobs.wandering_trader.ridable-in-water", wanderingTraderRidableInWater); -@@ -2707,6 +2832,7 @@ public class PurpurWorldConfig { - wanderingTraderFollowEmeraldBlock = getBoolean("mobs.wandering_trader.follow-emerald-blocks", wanderingTraderFollowEmeraldBlock); +@@ -2711,6 +2836,7 @@ public class PurpurWorldConfig { + wanderingTraderCanBeLeashed = getBoolean("mobs.wandering_trader.can-be-leashed", wanderingTraderCanBeLeashed); wanderingTraderTakeDamageFromWater = getBoolean("mobs.wandering_trader.takes-damage-from-water", wanderingTraderTakeDamageFromWater); wanderingTraderAllowTrading = getBoolean("mobs.wandering_trader.allow-trading", wanderingTraderAllowTrading); + wanderingTraderAlwaysDropExp = getBoolean("mobs.wandering_trader.always-drop-exp", wanderingTraderAlwaysDropExp); } public boolean wardenRidable = false; -@@ -2723,6 +2849,7 @@ public class PurpurWorldConfig { +@@ -2727,6 +2853,7 @@ public class PurpurWorldConfig { public boolean witchControllable = true; public double witchMaxHealth = 26.0D; public boolean witchTakeDamageFromWater = false; @@ -2168,7 +2168,7 @@ index 2c7ff15022e75fc14f9087282b17a6abc0e3690c..85923289e2e66f4d33e77089f06f5b39 private void witchSettings() { witchRidable = getBoolean("mobs.witch.ridable", witchRidable); witchRidableInWater = getBoolean("mobs.witch.ridable-in-water", witchRidableInWater); -@@ -2734,6 +2861,7 @@ public class PurpurWorldConfig { +@@ -2738,6 +2865,7 @@ public class PurpurWorldConfig { } witchMaxHealth = getDouble("mobs.witch.attributes.max_health", witchMaxHealth); witchTakeDamageFromWater = getBoolean("mobs.witch.takes-damage-from-water", witchTakeDamageFromWater); @@ -2176,7 +2176,7 @@ index 2c7ff15022e75fc14f9087282b17a6abc0e3690c..85923289e2e66f4d33e77089f06f5b39 } public boolean witherRidable = false; -@@ -2748,6 +2876,7 @@ public class PurpurWorldConfig { +@@ -2752,6 +2880,7 @@ public class PurpurWorldConfig { public boolean witherCanRideVehicles = false; public float witherExplosionRadius = 1.0F; public boolean witherPlaySpawnSound = true; @@ -2184,7 +2184,7 @@ index 2c7ff15022e75fc14f9087282b17a6abc0e3690c..85923289e2e66f4d33e77089f06f5b39 private void witherSettings() { witherRidable = getBoolean("mobs.wither.ridable", witherRidable); witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater); -@@ -2770,6 +2899,7 @@ public class PurpurWorldConfig { +@@ -2774,6 +2903,7 @@ public class PurpurWorldConfig { witherCanRideVehicles = getBoolean("mobs.wither.can-ride-vehicles", witherCanRideVehicles); witherExplosionRadius = (float) getDouble("mobs.wither.explosion-radius", witherExplosionRadius); witherPlaySpawnSound = getBoolean("mobs.wither.play-spawn-sound", witherPlaySpawnSound); @@ -2192,7 +2192,7 @@ index 2c7ff15022e75fc14f9087282b17a6abc0e3690c..85923289e2e66f4d33e77089f06f5b39 } public boolean witherSkeletonRidable = false; -@@ -2777,6 +2907,7 @@ public class PurpurWorldConfig { +@@ -2781,6 +2911,7 @@ public class PurpurWorldConfig { public boolean witherSkeletonControllable = true; public double witherSkeletonMaxHealth = 20.0D; public boolean witherSkeletonTakeDamageFromWater = false; @@ -2200,7 +2200,7 @@ index 2c7ff15022e75fc14f9087282b17a6abc0e3690c..85923289e2e66f4d33e77089f06f5b39 private void witherSkeletonSettings() { witherSkeletonRidable = getBoolean("mobs.wither_skeleton.ridable", witherSkeletonRidable); witherSkeletonRidableInWater = getBoolean("mobs.wither_skeleton.ridable-in-water", witherSkeletonRidableInWater); -@@ -2788,6 +2919,7 @@ public class PurpurWorldConfig { +@@ -2792,6 +2923,7 @@ public class PurpurWorldConfig { } witherSkeletonMaxHealth = getDouble("mobs.wither_skeleton.attributes.max_health", witherSkeletonMaxHealth); witherSkeletonTakeDamageFromWater = getBoolean("mobs.wither_skeleton.takes-damage-from-water", witherSkeletonTakeDamageFromWater); @@ -2208,7 +2208,7 @@ index 2c7ff15022e75fc14f9087282b17a6abc0e3690c..85923289e2e66f4d33e77089f06f5b39 } public boolean wolfRidable = false; -@@ -2799,6 +2931,7 @@ public class PurpurWorldConfig { +@@ -2803,6 +2935,7 @@ public class PurpurWorldConfig { public double wolfNaturalRabid = 0.0D; public int wolfBreedingTicks = 6000; public boolean wolfTakeDamageFromWater = false; @@ -2216,7 +2216,7 @@ index 2c7ff15022e75fc14f9087282b17a6abc0e3690c..85923289e2e66f4d33e77089f06f5b39 private void wolfSettings() { wolfRidable = getBoolean("mobs.wolf.ridable", wolfRidable); wolfRidableInWater = getBoolean("mobs.wolf.ridable-in-water", wolfRidableInWater); -@@ -2818,6 +2951,7 @@ public class PurpurWorldConfig { +@@ -2822,6 +2955,7 @@ public class PurpurWorldConfig { wolfNaturalRabid = getDouble("mobs.wolf.spawn-rabid-chance", wolfNaturalRabid); wolfBreedingTicks = getInt("mobs.wolf.breeding-delay-ticks", wolfBreedingTicks); wolfTakeDamageFromWater = getBoolean("mobs.wolf.takes-damage-from-water", wolfTakeDamageFromWater); @@ -2224,7 +2224,7 @@ index 2c7ff15022e75fc14f9087282b17a6abc0e3690c..85923289e2e66f4d33e77089f06f5b39 } public boolean zoglinRidable = false; -@@ -2825,6 +2959,7 @@ public class PurpurWorldConfig { +@@ -2829,6 +2963,7 @@ public class PurpurWorldConfig { public boolean zoglinControllable = true; public double zoglinMaxHealth = 40.0D; public boolean zoglinTakeDamageFromWater = false; @@ -2232,7 +2232,7 @@ index 2c7ff15022e75fc14f9087282b17a6abc0e3690c..85923289e2e66f4d33e77089f06f5b39 private void zoglinSettings() { zoglinRidable = getBoolean("mobs.zoglin.ridable", zoglinRidable); zoglinRidableInWater = getBoolean("mobs.zoglin.ridable-in-water", zoglinRidableInWater); -@@ -2836,6 +2971,7 @@ public class PurpurWorldConfig { +@@ -2840,6 +2975,7 @@ public class PurpurWorldConfig { } zoglinMaxHealth = getDouble("mobs.zoglin.attributes.max_health", zoglinMaxHealth); zoglinTakeDamageFromWater = getBoolean("mobs.zoglin.takes-damage-from-water", zoglinTakeDamageFromWater); @@ -2240,7 +2240,7 @@ index 2c7ff15022e75fc14f9087282b17a6abc0e3690c..85923289e2e66f4d33e77089f06f5b39 } public boolean zombieRidable = false; -@@ -2849,6 +2985,7 @@ public class PurpurWorldConfig { +@@ -2853,6 +2989,7 @@ public class PurpurWorldConfig { public boolean zombieAggressiveTowardsVillagerWhenLagging = true; public boolean zombieBypassMobGriefing = false; public boolean zombieTakeDamageFromWater = false; @@ -2248,7 +2248,7 @@ index 2c7ff15022e75fc14f9087282b17a6abc0e3690c..85923289e2e66f4d33e77089f06f5b39 private void zombieSettings() { zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable); zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater); -@@ -2866,6 +3003,7 @@ public class PurpurWorldConfig { +@@ -2870,6 +3007,7 @@ public class PurpurWorldConfig { zombieAggressiveTowardsVillagerWhenLagging = getBoolean("mobs.zombie.aggressive-towards-villager-when-lagging", zombieAggressiveTowardsVillagerWhenLagging); zombieBypassMobGriefing = getBoolean("mobs.zombie.bypass-mob-griefing", zombieBypassMobGriefing); zombieTakeDamageFromWater = getBoolean("mobs.zombie.takes-damage-from-water", zombieTakeDamageFromWater); @@ -2256,7 +2256,7 @@ index 2c7ff15022e75fc14f9087282b17a6abc0e3690c..85923289e2e66f4d33e77089f06f5b39 } public boolean zombieHorseRidable = false; -@@ -2879,6 +3017,7 @@ public class PurpurWorldConfig { +@@ -2883,6 +3021,7 @@ public class PurpurWorldConfig { public double zombieHorseMovementSpeedMax = 0.2D; public double zombieHorseSpawnChance = 0.0D; public boolean zombieHorseTakeDamageFromWater = false; @@ -2264,7 +2264,7 @@ index 2c7ff15022e75fc14f9087282b17a6abc0e3690c..85923289e2e66f4d33e77089f06f5b39 private void zombieHorseSettings() { zombieHorseRidable = getBoolean("mobs.zombie_horse.ridable", zombieHorseRidable); zombieHorseRidableInWater = getBoolean("mobs.zombie_horse.ridable-in-water", zombieHorseRidableInWater); -@@ -2897,6 +3036,7 @@ public class PurpurWorldConfig { +@@ -2901,6 +3040,7 @@ public class PurpurWorldConfig { zombieHorseMovementSpeedMax = getDouble("mobs.zombie_horse.attributes.movement_speed.max", zombieHorseMovementSpeedMax); zombieHorseSpawnChance = getDouble("mobs.zombie_horse.spawn-chance", zombieHorseSpawnChance); zombieHorseTakeDamageFromWater = getBoolean("mobs.zombie_horse.takes-damage-from-water", zombieHorseTakeDamageFromWater); @@ -2272,7 +2272,7 @@ index 2c7ff15022e75fc14f9087282b17a6abc0e3690c..85923289e2e66f4d33e77089f06f5b39 } public boolean zombieVillagerRidable = false; -@@ -2911,6 +3051,7 @@ public class PurpurWorldConfig { +@@ -2915,6 +3055,7 @@ public class PurpurWorldConfig { public int zombieVillagerCuringTimeMin = 3600; public int zombieVillagerCuringTimeMax = 6000; public boolean zombieVillagerCureEnabled = true; @@ -2280,7 +2280,7 @@ index 2c7ff15022e75fc14f9087282b17a6abc0e3690c..85923289e2e66f4d33e77089f06f5b39 private void zombieVillagerSettings() { zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable); zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater); -@@ -2929,6 +3070,7 @@ public class PurpurWorldConfig { +@@ -2933,6 +3074,7 @@ public class PurpurWorldConfig { zombieVillagerCuringTimeMin = getInt("mobs.zombie_villager.curing_time.min", zombieVillagerCuringTimeMin); zombieVillagerCuringTimeMax = getInt("mobs.zombie_villager.curing_time.max", zombieVillagerCuringTimeMax); zombieVillagerCureEnabled = getBoolean("mobs.zombie_villager.cure.enabled", zombieVillagerCureEnabled); @@ -2288,7 +2288,7 @@ index 2c7ff15022e75fc14f9087282b17a6abc0e3690c..85923289e2e66f4d33e77089f06f5b39 } public boolean zombifiedPiglinRidable = false; -@@ -2941,6 +3083,7 @@ public class PurpurWorldConfig { +@@ -2945,6 +3087,7 @@ public class PurpurWorldConfig { public boolean zombifiedPiglinJockeyTryExistingChickens = true; public boolean zombifiedPiglinCountAsPlayerKillWhenAngry = true; public boolean zombifiedPiglinTakeDamageFromWater = false; @@ -2296,7 +2296,7 @@ index 2c7ff15022e75fc14f9087282b17a6abc0e3690c..85923289e2e66f4d33e77089f06f5b39 private void zombifiedPiglinSettings() { zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable); zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater); -@@ -2957,6 +3100,7 @@ public class PurpurWorldConfig { +@@ -2961,6 +3104,7 @@ public class PurpurWorldConfig { zombifiedPiglinJockeyTryExistingChickens = getBoolean("mobs.zombified_piglin.jockey.try-existing-chickens", zombifiedPiglinJockeyTryExistingChickens); zombifiedPiglinCountAsPlayerKillWhenAngry = getBoolean("mobs.zombified_piglin.count-as-player-kill-when-angry", zombifiedPiglinCountAsPlayerKillWhenAngry); zombifiedPiglinTakeDamageFromWater = getBoolean("mobs.zombified_piglin.takes-damage-from-water", zombifiedPiglinTakeDamageFromWater); diff --git a/patches/server/0210-Grindstone-API.patch b/patches/server/0211-Grindstone-API.patch similarity index 100% rename from patches/server/0210-Grindstone-API.patch rename to patches/server/0211-Grindstone-API.patch diff --git a/patches/server/0211-Ability-for-hoe-to-replant-crops-and-nether-warts.patch b/patches/server/0212-Ability-for-hoe-to-replant-crops-and-nether-warts.patch similarity index 98% rename from patches/server/0211-Ability-for-hoe-to-replant-crops-and-nether-warts.patch rename to patches/server/0212-Ability-for-hoe-to-replant-crops-and-nether-warts.patch index 3a98dcd60..2d44b7e37 100644 --- a/patches/server/0211-Ability-for-hoe-to-replant-crops-and-nether-warts.patch +++ b/patches/server/0212-Ability-for-hoe-to-replant-crops-and-nether-warts.patch @@ -74,7 +74,7 @@ index acbd60a2f162fe0e254e36d0e8e7face3fc8a7b3..da1c7999ca64199387054de46489d3ff + // Purpur end } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 85923289e2e66f4d33e77089f06f5b3985a83d6e..954165c4d12f9cae85fa47e480cd0aa242539bce 100644 +index b4d681c2286d40e0544ab0ab88353f0afde82335..2139381370bebdd89d7eb3acfb17640ab66c2390 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -529,6 +529,8 @@ public class PurpurWorldConfig { diff --git a/patches/server/0212-Turtle-eggs-random-tick-crack-chance.patch b/patches/server/0213-Turtle-eggs-random-tick-crack-chance.patch similarity index 95% rename from patches/server/0212-Turtle-eggs-random-tick-crack-chance.patch rename to patches/server/0213-Turtle-eggs-random-tick-crack-chance.patch index ea5ffaf92..83159ad4c 100644 --- a/patches/server/0212-Turtle-eggs-random-tick-crack-chance.patch +++ b/patches/server/0213-Turtle-eggs-random-tick-crack-chance.patch @@ -18,7 +18,7 @@ index 0c732cfbd9ce50198a3f85ae8ef2263d7ae0bc1a..2f0e8aeb9c45853fca12ddd78a7d5181 @Override diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 954165c4d12f9cae85fa47e480cd0aa242539bce..fac30513243d39ca36a96fb01c98958d6f059688 100644 +index 2139381370bebdd89d7eb3acfb17640ab66c2390..c34a2bfe808b6d29a06f73f85559b1eab5d35713 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1056,11 +1056,13 @@ public class PurpurWorldConfig { diff --git a/patches/server/0213-Mob-head-visibility-percent.patch b/patches/server/0214-Mob-head-visibility-percent.patch similarity index 95% rename from patches/server/0213-Mob-head-visibility-percent.patch rename to patches/server/0214-Mob-head-visibility-percent.patch index 95078967b..1efe98683 100644 --- a/patches/server/0213-Mob-head-visibility-percent.patch +++ b/patches/server/0214-Mob-head-visibility-percent.patch @@ -5,7 +5,7 @@ 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 b08851827656f644a560b084aed10087665153db..d543a75d27d343edca9930c9a4599cbd4a9de045 100644 +index bc31065aed8d09b5242310de52f895a0173c0534..aa8997468c50810c3c9713c98a7786f2f0ab7a72 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1046,9 +1046,20 @@ public abstract class LivingEntity extends Entity implements Attackable { @@ -32,7 +32,7 @@ index b08851827656f644a560b084aed10087665153db..d543a75d27d343edca9930c9a4599cbd // Purpur start if (entity instanceof LivingEntity entityliving) { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index fac30513243d39ca36a96fb01c98958d6f059688..238323047a08b4553129714ba34df44b6a8b27b2 100644 +index c34a2bfe808b6d29a06f73f85559b1eab5d35713..1150467f1342943d1876f4b32e9180a9287b1939 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1374,6 +1374,7 @@ public class PurpurWorldConfig { @@ -83,7 +83,7 @@ index fac30513243d39ca36a96fb01c98958d6f059688..238323047a08b4553129714ba34df44b } public boolean skeletonHorseRidable = false; -@@ -2992,6 +2998,7 @@ public class PurpurWorldConfig { +@@ -2996,6 +3002,7 @@ public class PurpurWorldConfig { public boolean zombieBypassMobGriefing = false; public boolean zombieTakeDamageFromWater = false; public boolean zombieAlwaysDropExp = false; @@ -91,7 +91,7 @@ index fac30513243d39ca36a96fb01c98958d6f059688..238323047a08b4553129714ba34df44b private void zombieSettings() { zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable); zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater); -@@ -3010,6 +3017,7 @@ public class PurpurWorldConfig { +@@ -3014,6 +3021,7 @@ public class PurpurWorldConfig { zombieBypassMobGriefing = getBoolean("mobs.zombie.bypass-mob-griefing", zombieBypassMobGriefing); zombieTakeDamageFromWater = getBoolean("mobs.zombie.takes-damage-from-water", zombieTakeDamageFromWater); zombieAlwaysDropExp = getBoolean("mobs.zombie.always-drop-exp", zombieAlwaysDropExp); diff --git a/patches/server/0214-Configurable-valid-characters-for-usernames.patch b/patches/server/0215-Configurable-valid-characters-for-usernames.patch similarity index 100% rename from patches/server/0214-Configurable-valid-characters-for-usernames.patch rename to patches/server/0215-Configurable-valid-characters-for-usernames.patch diff --git a/patches/server/0215-Shears-can-have-looting-enchantment.patch b/patches/server/0216-Shears-can-have-looting-enchantment.patch similarity index 100% rename from patches/server/0215-Shears-can-have-looting-enchantment.patch rename to patches/server/0216-Shears-can-have-looting-enchantment.patch diff --git a/patches/server/0216-Stop-bees-from-dying-after-stinging.patch b/patches/server/0217-Stop-bees-from-dying-after-stinging.patch similarity index 95% rename from patches/server/0216-Stop-bees-from-dying-after-stinging.patch rename to patches/server/0217-Stop-bees-from-dying-after-stinging.patch index 5e7558996..871f6c7af 100644 --- a/patches/server/0216-Stop-bees-from-dying-after-stinging.patch +++ b/patches/server/0217-Stop-bees-from-dying-after-stinging.patch @@ -17,7 +17,7 @@ index ca56f5781c1c02e40179a4dd359c5d167d3160dc..0dfdecff129a6b34833eb3fb7d7d967b ++this.timeSinceSting; if (this.timeSinceSting % 5 == 0 && this.random.nextInt(Mth.clamp(1200 - this.timeSinceSting, 1, 1200)) == 0) { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 238323047a08b4553129714ba34df44b6a8b27b2..940eccf00d46d24be22554ae3113e294a4085575 100644 +index 1150467f1342943d1876f4b32e9180a9287b1939..03c9afdb80835c2d688378c4eae109e74c154df9 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1164,6 +1164,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0217-Give-bee-counts-in-beehives-to-Purpur-clients.patch b/patches/server/0218-Give-bee-counts-in-beehives-to-Purpur-clients.patch similarity index 100% rename from patches/server/0217-Give-bee-counts-in-beehives-to-Purpur-clients.patch rename to patches/server/0218-Give-bee-counts-in-beehives-to-Purpur-clients.patch diff --git a/patches/server/0218-Configurable-farmland-trample-height.patch b/patches/server/0219-Configurable-farmland-trample-height.patch similarity index 97% rename from patches/server/0218-Configurable-farmland-trample-height.patch rename to patches/server/0219-Configurable-farmland-trample-height.patch index bfbd58091..3669f04f5 100644 --- a/patches/server/0218-Configurable-farmland-trample-height.patch +++ b/patches/server/0219-Configurable-farmland-trample-height.patch @@ -35,7 +35,7 @@ index 12a0c69f8fec30fad64cbb00af2ca1bbf0ea5153..d0ec0722496ed931b48c4e7076fddbb1 org.bukkit.event.Cancellable cancellable; if (entity instanceof Player) { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 940eccf00d46d24be22554ae3113e294a4085575..201a7d2493bf015eee0cbada679e855f8900257f 100644 +index 03c9afdb80835c2d688378c4eae109e74c154df9..4e6a71b9cb412af14e8e06aadd9ec5b391f35506 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -949,6 +949,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0219-Configurable-player-pickup-exp-delay.patch b/patches/server/0220-Configurable-player-pickup-exp-delay.patch similarity index 95% rename from patches/server/0219-Configurable-player-pickup-exp-delay.patch rename to patches/server/0220-Configurable-player-pickup-exp-delay.patch index c9f0e510e..34622f276 100644 --- a/patches/server/0219-Configurable-player-pickup-exp-delay.patch +++ b/patches/server/0220-Configurable-player-pickup-exp-delay.patch @@ -22,7 +22,7 @@ index 6598a737db11fb0c7e7a95b9bbfaabd75895cbdd..ad69ef7fb8e68027c6f41618ee258565 int i = this.repairPlayerItems(entityplayer, this.value); 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 5a9abf3cb9448f922c7d87a48fa50337e35c2c34..2a4083103e3b1370ca1d4c90112c216bde918ce4 100644 +index c610479c5c8d3e0aa5d70106eab8d8b1ccc80c7f..d51e062ca2c432cf2976d5b2e03dcdcf8c40e348 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -635,7 +635,7 @@ public abstract class Player extends LivingEntity { @@ -35,7 +35,7 @@ index 5a9abf3cb9448f922c7d87a48fa50337e35c2c34..2a4083103e3b1370ca1d4c90112c216b } else if (!entity.isRemoved()) { this.touch(entity); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 201a7d2493bf015eee0cbada679e855f8900257f..7df658e724e9cbb5ae635e794ba598e78163eae5 100644 +index 4e6a71b9cb412af14e8e06aadd9ec5b391f35506..089aa74d21d5d82705f26130d43da5b75aee5ebf 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -411,6 +411,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0220-Allow-void-trading.patch b/patches/server/0221-Allow-void-trading.patch similarity index 96% rename from patches/server/0220-Allow-void-trading.patch rename to patches/server/0221-Allow-void-trading.patch index 2d7839869..f197d0888 100644 --- a/patches/server/0220-Allow-void-trading.patch +++ b/patches/server/0221-Allow-void-trading.patch @@ -18,7 +18,7 @@ index 9e3dc4bf5ad390e6e49a5193c7788d0c0c536f0f..49f77274309befcdef1548e875480b9f } // Paper end - Fix merchant inventory not closing on entity removal diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 7df658e724e9cbb5ae635e794ba598e78163eae5..32daa92d03d1ab8caef45454c6627d0b22870625 100644 +index 089aa74d21d5d82705f26130d43da5b75aee5ebf..edd7c35c36e6a5bf84330d7592455bc1c14f805a 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -412,6 +412,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0221-Configurable-phantom-size.patch b/patches/server/0222-Configurable-phantom-size.patch similarity index 96% rename from patches/server/0221-Configurable-phantom-size.patch rename to patches/server/0222-Configurable-phantom-size.patch index b4a282625..c24afe0e9 100644 --- a/patches/server/0221-Configurable-phantom-size.patch +++ b/patches/server/0222-Configurable-phantom-size.patch @@ -22,7 +22,7 @@ index 98b4eecf1685dcf43880b983493597bd22de4877..260c5d22ee10582974a5006cfeefa067 } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 32daa92d03d1ab8caef45454c6627d0b22870625..9507b6f8975777375d9260bca7a23f9916b5ec5f 100644 +index edd7c35c36e6a5bf84330d7592455bc1c14f805a..2ba3116dc1cb1aa3d1d49f909dd335f0cb8ce192 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -2117,6 +2117,8 @@ public class PurpurWorldConfig { diff --git a/patches/server/0222-Max-joins-per-second.patch b/patches/server/0223-Max-joins-per-second.patch similarity index 100% rename from patches/server/0222-Max-joins-per-second.patch rename to patches/server/0223-Max-joins-per-second.patch diff --git a/patches/server/0223-Configurable-minimum-demand-for-trades.patch b/patches/server/0224-Configurable-minimum-demand-for-trades.patch similarity index 89% rename from patches/server/0223-Configurable-minimum-demand-for-trades.patch rename to patches/server/0224-Configurable-minimum-demand-for-trades.patch index b86284e1b..f41335c0f 100644 --- a/patches/server/0223-Configurable-minimum-demand-for-trades.patch +++ b/patches/server/0224-Configurable-minimum-demand-for-trades.patch @@ -9,10 +9,10 @@ This patch adds a config option to allow the minimum demand to instead be configurable. 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 cb0d4574f638968169dd926dccb1b4f0470ca127..de09bae637ea8637d13b55cd406d5dd2de72b00d 100644 +index a324f1c33e327675fed853a49957399e162c4c8a..92c0ee9cca064637c98d7d30699114b995f2fe92 100644 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java -@@ -543,7 +543,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler +@@ -548,7 +548,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler while (iterator.hasNext()) { MerchantOffer merchantrecipe = (MerchantOffer) iterator.next(); @@ -40,10 +40,10 @@ index 0efc8d997b34302c3e0a5d7ec73a11a940dbeefe..af157881d440b34cfe79fbc9b03cc9ef public ItemStack assemble() { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 9507b6f8975777375d9260bca7a23f9916b5ec5f..20c17408972b37cc5504661b8ff43a0f971fd45f 100644 +index 2ba3116dc1cb1aa3d1d49f909dd335f0cb8ce192..7523dca94c2c3025a283bb0977831f86f4930162 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -@@ -2797,6 +2797,7 @@ public class PurpurWorldConfig { +@@ -2798,6 +2798,7 @@ public class PurpurWorldConfig { public boolean villagerTakeDamageFromWater = false; public boolean villagerAllowTrading = true; public boolean villagerAlwaysDropExp = false; @@ -51,7 +51,7 @@ index 9507b6f8975777375d9260bca7a23f9916b5ec5f..20c17408972b37cc5504661b8ff43a0f private void villagerSettings() { villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable); villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater); -@@ -2816,6 +2817,7 @@ public class PurpurWorldConfig { +@@ -2818,6 +2819,7 @@ public class PurpurWorldConfig { villagerTakeDamageFromWater = getBoolean("mobs.villager.takes-damage-from-water", villagerTakeDamageFromWater); villagerAllowTrading = getBoolean("mobs.villager.allow-trading", villagerAllowTrading); villagerAlwaysDropExp = getBoolean("mobs.villager.always-drop-exp", villagerAlwaysDropExp); diff --git a/patches/server/0224-Lobotomize-stuck-villagers.patch b/patches/server/0225-Lobotomize-stuck-villagers.patch similarity index 94% rename from patches/server/0224-Lobotomize-stuck-villagers.patch rename to patches/server/0225-Lobotomize-stuck-villagers.patch index 59d71b925..7ffc5730b 100644 --- a/patches/server/0224-Lobotomize-stuck-villagers.patch +++ b/patches/server/0225-Lobotomize-stuck-villagers.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Lobotomize stuck villagers 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 de09bae637ea8637d13b55cd406d5dd2de72b00d..92b2dfd2d4013ab6ae1114ab319c7bdaf674afe1 100644 +index 92c0ee9cca064637c98d7d30699114b995f2fe92..1f1d6fcdf89051761715f2422efe74e432a8d27a 100644 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java @@ -142,6 +142,8 @@ public class Villager extends AbstractVillager implements ReputationEventHandler @@ -17,7 +17,7 @@ index de09bae637ea8637d13b55cd406d5dd2de72b00d..92b2dfd2d4013ab6ae1114ab319c7bda public Villager(EntityType entityType, Level world) { this(entityType, world, VillagerType.PLAINS); -@@ -194,6 +196,48 @@ public class Villager extends AbstractVillager implements ReputationEventHandler +@@ -199,6 +201,48 @@ public class Villager extends AbstractVillager implements ReputationEventHandler return this.level().purpurConfig.villagerAlwaysDropExp; } @@ -66,7 +66,7 @@ index de09bae637ea8637d13b55cd406d5dd2de72b00d..92b2dfd2d4013ab6ae1114ab319c7bda @Override public Brain getBrain() { return (Brain) super.getBrain(); // CraftBukkit - decompile error -@@ -290,10 +334,19 @@ public class Villager extends AbstractVillager implements ReputationEventHandler +@@ -295,10 +339,19 @@ public class Villager extends AbstractVillager implements ReputationEventHandler // Paper start this.customServerAiStep(false); } @@ -104,10 +104,10 @@ index 6c15d40979fd3e3d246a447c432b321fbf29ada3..6ace76a829c88e2e747dbbcce0a6582c + // Purpur end } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 20c17408972b37cc5504661b8ff43a0f971fd45f..cc1a55ed607cac6d47ab92dbd93c06c791c8e9ce 100644 +index 7523dca94c2c3025a283bb0977831f86f4930162..b2d1effcefaab8b88d35515b45d4050b6cfe3367 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -@@ -2798,6 +2798,9 @@ public class PurpurWorldConfig { +@@ -2799,6 +2799,9 @@ public class PurpurWorldConfig { public boolean villagerAllowTrading = true; public boolean villagerAlwaysDropExp = false; public int villagerMinimumDemand = 0; @@ -117,7 +117,7 @@ index 20c17408972b37cc5504661b8ff43a0f971fd45f..cc1a55ed607cac6d47ab92dbd93c06c7 private void villagerSettings() { villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable); villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater); -@@ -2818,6 +2821,18 @@ public class PurpurWorldConfig { +@@ -2820,6 +2823,18 @@ public class PurpurWorldConfig { villagerAllowTrading = getBoolean("mobs.villager.allow-trading", villagerAllowTrading); villagerAlwaysDropExp = getBoolean("mobs.villager.always-drop-exp", villagerAlwaysDropExp); villagerMinimumDemand = getInt("mobs.villager.minimum-demand", villagerMinimumDemand); diff --git a/patches/server/0225-Option-for-villager-display-trade-item.patch b/patches/server/0226-Option-for-villager-display-trade-item.patch similarity index 92% rename from patches/server/0225-Option-for-villager-display-trade-item.patch rename to patches/server/0226-Option-for-villager-display-trade-item.patch index dec8d3661..b6a86df39 100644 --- a/patches/server/0225-Option-for-villager-display-trade-item.patch +++ b/patches/server/0226-Option-for-villager-display-trade-item.patch @@ -17,10 +17,10 @@ index 18dad0825616c4167a0a7555689ee64910a87e09..6945992491027d43eca4f1ca697ad45c && this.lookTime > 0 && entity.getBrain().getMemory(MemoryModuleType.INTERACTION_TARGET).isPresent(); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index cc1a55ed607cac6d47ab92dbd93c06c791c8e9ce..df93ee542044d824b6a747a08c3002b6eea30830 100644 +index b2d1effcefaab8b88d35515b45d4050b6cfe3367..cc80fcfad2d88725fa0ea30137ca3ef3ffea6794 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -@@ -2801,6 +2801,7 @@ public class PurpurWorldConfig { +@@ -2802,6 +2802,7 @@ public class PurpurWorldConfig { public boolean villagerLobotomizeEnabled = false; public int villagerLobotomizeCheckInterval = 100; public boolean villagerLobotomizeWaitUntilTradeLocked = false; @@ -28,7 +28,7 @@ index cc1a55ed607cac6d47ab92dbd93c06c791c8e9ce..df93ee542044d824b6a747a08c3002b6 private void villagerSettings() { villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable); villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater); -@@ -2833,6 +2834,7 @@ public class PurpurWorldConfig { +@@ -2835,6 +2836,7 @@ public class PurpurWorldConfig { villagerLobotomizeEnabled = getBoolean("mobs.villager.lobotomize.enabled", villagerLobotomizeEnabled); villagerLobotomizeCheckInterval = getInt("mobs.villager.lobotomize.check-interval", villagerLobotomizeCheckInterval); villagerLobotomizeWaitUntilTradeLocked = getBoolean("mobs.villager.lobotomize.wait-until-trade-locked", villagerLobotomizeWaitUntilTradeLocked); diff --git a/patches/server/0226-MC-238526-Fix-spawner-not-spawning-water-animals-cor.patch b/patches/server/0227-MC-238526-Fix-spawner-not-spawning-water-animals-cor.patch similarity index 95% rename from patches/server/0226-MC-238526-Fix-spawner-not-spawning-water-animals-cor.patch rename to patches/server/0227-MC-238526-Fix-spawner-not-spawning-water-animals-cor.patch index a335135b0..65285cceb 100644 --- a/patches/server/0226-MC-238526-Fix-spawner-not-spawning-water-animals-cor.patch +++ b/patches/server/0227-MC-238526-Fix-spawner-not-spawning-water-animals-cor.patch @@ -17,7 +17,7 @@ index c9cabb061ebc9172647304431cc3fb2593dd47ba..565408c03849fb3011fb708478a99ec6 } } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index df93ee542044d824b6a747a08c3002b6eea30830..33dda8cc9738cde199e98cbaf643d65eabe016be 100644 +index cc80fcfad2d88725fa0ea30137ca3ef3ffea6794..5f42ddd0451b05dc3ea16027ca4f0f2f8ce41d22 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1043,8 +1043,10 @@ public class PurpurWorldConfig { diff --git a/patches/server/0227-Config-for-mob-last-hurt-by-player-time.patch b/patches/server/0228-Config-for-mob-last-hurt-by-player-time.patch similarity index 95% rename from patches/server/0227-Config-for-mob-last-hurt-by-player-time.patch rename to patches/server/0228-Config-for-mob-last-hurt-by-player-time.patch index ceb0223a9..0a3d44d99 100644 --- a/patches/server/0227-Config-for-mob-last-hurt-by-player-time.patch +++ b/patches/server/0228-Config-for-mob-last-hurt-by-player-time.patch @@ -5,7 +5,7 @@ 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 d543a75d27d343edca9930c9a4599cbd4a9de045..b3320e206e07a7b895fe28bcc4cc501c104bedd5 100644 +index aa8997468c50810c3c9713c98a7786f2f0ab7a72..0c89b32f868bfdeb995c9652f15de7b1816e7bfe 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1550,13 +1550,13 @@ public abstract class LivingEntity extends Entity implements Attackable { @@ -38,7 +38,7 @@ index 88be8ebe619f2e42bdffab534da4f269b802cf41..ed594f9446646e30de3d4e8afa22f672 // Paper end diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 33dda8cc9738cde199e98cbaf643d65eabe016be..f11014cfd9383cba0aeeb38df7d49731c2fc2456 100644 +index 5f42ddd0451b05dc3ea16027ca4f0f2f8ce41d22..8652b208e9669f12df942dd38c1e9a56b0b5cc7b 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -141,6 +141,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0228-Anvil-repair-damage-options.patch b/patches/server/0229-Anvil-repair-damage-options.patch similarity index 98% rename from patches/server/0228-Anvil-repair-damage-options.patch rename to patches/server/0229-Anvil-repair-damage-options.patch index 229174e98..b0eb2a7d1 100644 --- a/patches/server/0228-Anvil-repair-damage-options.patch +++ b/patches/server/0229-Anvil-repair-damage-options.patch @@ -63,7 +63,7 @@ index 923357251ad950ec4f893e8771fcfa99de8a60c5..78a341ac80806f86f2ca0bd895fb091a protected InteractionResult useWithoutItem(BlockState state, Level world, BlockPos pos, Player player, BlockHitResult hit) { if (world.isClientSide) { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index f11014cfd9383cba0aeeb38df7d49731c2fc2456..697aa18d5b02935c0d479a0609aac094831dec7c 100644 +index 8652b208e9669f12df942dd38c1e9a56b0b5cc7b..7135cf523ac1a6a1ee40c15ef3666f0a578d2917 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -810,9 +810,13 @@ public class PurpurWorldConfig { diff --git a/patches/server/0229-Option-to-disable-turtle-egg-trampling-with-feather-.patch b/patches/server/0230-Option-to-disable-turtle-egg-trampling-with-feather-.patch similarity index 96% rename from patches/server/0229-Option-to-disable-turtle-egg-trampling-with-feather-.patch rename to patches/server/0230-Option-to-disable-turtle-egg-trampling-with-feather-.patch index 200e26dd7..b57f343a4 100644 --- a/patches/server/0229-Option-to-disable-turtle-egg-trampling-with-feather-.patch +++ b/patches/server/0230-Option-to-disable-turtle-egg-trampling-with-feather-.patch @@ -24,7 +24,7 @@ index 2f0e8aeb9c45853fca12ddd78a7d51813a600e67..08ba90f760abb9fb62311dddd7b5bdbd return world.purpurConfig.turtleEggsBypassMobGriefing || world.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING); // Purpur end diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 697aa18d5b02935c0d479a0609aac094831dec7c..dae16114d51e21455442ef590d331ca25ec6329f 100644 +index 7135cf523ac1a6a1ee40c15ef3666f0a578d2917..da4e59b1dba444e9775d5c7137ab9004b4436ead 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1071,12 +1071,14 @@ public class PurpurWorldConfig { diff --git a/patches/server/0230-Add-toggle-for-enchant-level-clamping.patch b/patches/server/0231-Add-toggle-for-enchant-level-clamping.patch similarity index 100% rename from patches/server/0230-Add-toggle-for-enchant-level-clamping.patch rename to patches/server/0231-Add-toggle-for-enchant-level-clamping.patch diff --git a/patches/server/0231-Skip-junit-tests-for-purpur-commands.patch b/patches/server/0232-Skip-junit-tests-for-purpur-commands.patch similarity index 100% rename from patches/server/0231-Skip-junit-tests-for-purpur-commands.patch rename to patches/server/0232-Skip-junit-tests-for-purpur-commands.patch diff --git a/patches/server/0232-Implement-configurable-search-radius-for-villagers-t.patch b/patches/server/0233-Implement-configurable-search-radius-for-villagers-t.patch similarity index 87% rename from patches/server/0232-Implement-configurable-search-radius-for-villagers-t.patch rename to patches/server/0233-Implement-configurable-search-radius-for-villagers-t.patch index 105d572a4..b906ea881 100644 --- a/patches/server/0232-Implement-configurable-search-radius-for-villagers-t.patch +++ b/patches/server/0233-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 1c5538fa16acefb0e539ec2d36465d04d2967534..8fc03757339ebb8bcc976719c27872c59177b627 100644 +index 1f1d6fcdf89051761715f2422efe74e432a8d27a..2b55f05b727f862ea79ab2c200a756f663b43823 100644 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java -@@ -1093,6 +1093,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler +@@ -1098,6 +1098,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler } public void spawnGolemIfNeeded(ServerLevel world, long time, int requiredCount) { @@ -18,10 +18,10 @@ index 1c5538fa16acefb0e539ec2d36465d04d2967534..8fc03757339ebb8bcc976719c27872c5 AABB axisalignedbb = this.getBoundingBox().inflate(10.0D, 10.0D, 10.0D); List list = world.getEntitiesOfClass(Villager.class, axisalignedbb); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index dae16114d51e21455442ef590d331ca25ec6329f..5a44626d821dcc6565fc7d2260eb2ca6c0c8067c 100644 +index da4e59b1dba444e9775d5c7137ab9004b4436ead..f355d246573987c5661bdbdbdc17bd181c1e90c1 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -@@ -2812,6 +2812,8 @@ public class PurpurWorldConfig { +@@ -2813,6 +2813,8 @@ public class PurpurWorldConfig { public int villagerLobotomizeCheckInterval = 100; public boolean villagerLobotomizeWaitUntilTradeLocked = false; public boolean villagerDisplayTradeItem = true; @@ -30,7 +30,7 @@ index dae16114d51e21455442ef590d331ca25ec6329f..5a44626d821dcc6565fc7d2260eb2ca6 private void villagerSettings() { villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable); villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater); -@@ -2845,6 +2847,8 @@ public class PurpurWorldConfig { +@@ -2847,6 +2849,8 @@ public class PurpurWorldConfig { villagerLobotomizeCheckInterval = getInt("mobs.villager.lobotomize.check-interval", villagerLobotomizeCheckInterval); villagerLobotomizeWaitUntilTradeLocked = getBoolean("mobs.villager.lobotomize.wait-until-trade-locked", villagerLobotomizeWaitUntilTradeLocked); villagerDisplayTradeItem = getBoolean("mobs.villager.display-trade-item", villagerDisplayTradeItem); diff --git a/patches/server/0233-Stonecutter-damage.patch b/patches/server/0234-Stonecutter-damage.patch similarity index 98% rename from patches/server/0233-Stonecutter-damage.patch rename to patches/server/0234-Stonecutter-damage.patch index 8307858eb..d336a608b 100644 --- a/patches/server/0233-Stonecutter-damage.patch +++ b/patches/server/0234-Stonecutter-damage.patch @@ -143,7 +143,7 @@ index 08b10246b4cb7374a230bea470d737670dae5edd..8aa2354bee8de0193863628c2d928699 public static boolean advancementOnlyBroadcastToAffectedPlayer = false; diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 5a44626d821dcc6565fc7d2260eb2ca6c0c8067c..b32a0729304e17b8f2c71a7b8945c77698f5ae7d 100644 +index f355d246573987c5661bdbdbdc17bd181c1e90c1..bfebaa7d5da00901ff8275f59e1b74cf6ce2fe1b 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1066,6 +1066,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0234-Configurable-damage-settings-for-magma-blocks.patch b/patches/server/0235-Configurable-damage-settings-for-magma-blocks.patch similarity index 95% rename from patches/server/0234-Configurable-damage-settings-for-magma-blocks.patch rename to patches/server/0235-Configurable-damage-settings-for-magma-blocks.patch index 9d9279639..97b9fd9b6 100644 --- a/patches/server/0234-Configurable-damage-settings-for-magma-blocks.patch +++ b/patches/server/0235-Configurable-damage-settings-for-magma-blocks.patch @@ -18,7 +18,7 @@ index 02d59789c09f58045fea302ea6f2ee3856114de3..8072713da7ed8b7a44b63c241050c3a9 } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index b32a0729304e17b8f2c71a7b8945c77698f5ae7d..98267802c118bb7b01323cb5b45fae1112574f56 100644 +index bfebaa7d5da00901ff8275f59e1b74cf6ce2fe1b..3c018ef5790af52e0829c3e58374ca005e7d2472 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1007,6 +1007,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0235-Add-config-for-snow-on-blue-ice.patch b/patches/server/0236-Add-config-for-snow-on-blue-ice.patch similarity index 95% rename from patches/server/0235-Add-config-for-snow-on-blue-ice.patch rename to patches/server/0236-Add-config-for-snow-on-blue-ice.patch index 81b3d0218..a85744a33 100644 --- a/patches/server/0235-Add-config-for-snow-on-blue-ice.patch +++ b/patches/server/0236-Add-config-for-snow-on-blue-ice.patch @@ -22,7 +22,7 @@ index 93e8e5107ac047c1f2579b4fe6b0a202edb695f6..f82d275aac7bf3949d3dcc412c7e39e1 } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 7bf622044a28fa311bf5280ebb9496cc2c2edc18..0fe2b9ca4f8a558233a8284b3cbfa80be5e6df7f 100644 +index 3c018ef5790af52e0829c3e58374ca005e7d2472..6c9a5a8711ab248a3712aa4164c8fb40d2ca799e 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -988,9 +988,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0236-Skeletons-eat-wither-roses.patch b/patches/server/0237-Skeletons-eat-wither-roses.patch similarity index 98% rename from patches/server/0236-Skeletons-eat-wither-roses.patch rename to patches/server/0237-Skeletons-eat-wither-roses.patch index 6cf720d33..8eb223fc9 100644 --- a/patches/server/0236-Skeletons-eat-wither-roses.patch +++ b/patches/server/0237-Skeletons-eat-wither-roses.patch @@ -94,7 +94,7 @@ index 3f81faffc1a54ab1148c410ef80964d9876e4b77..dfa8bd613c7575338c6bb76234b7cb4a + // Purpur end } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 11536cfb4f55cef1e81a12236fb175f86481c731..c9eedca5f131b5c74bace8919d029104194defb6 100644 +index 6c9a5a8711ab248a3712aa4164c8fb40d2ca799e..b3fb8c5bec1f8cb20111ccc0167c3989c0e8e019 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -2494,6 +2494,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0237-Enchantment-Table-Persists-Lapis.patch b/patches/server/0238-Enchantment-Table-Persists-Lapis.patch similarity index 98% rename from patches/server/0237-Enchantment-Table-Persists-Lapis.patch rename to patches/server/0238-Enchantment-Table-Persists-Lapis.patch index 5a8ace36e..f325583b5 100644 --- a/patches/server/0237-Enchantment-Table-Persists-Lapis.patch +++ b/patches/server/0238-Enchantment-Table-Persists-Lapis.patch @@ -137,7 +137,7 @@ index d47bc2f54c4722a0b8c419b99ee57eb3cb25d750..fdeabdcc781b605d6f3ee18528fd380f + // Purpur } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index c9eedca5f131b5c74bace8919d029104194defb6..8a15744a6fb79be45ca703793ce106eaf2bbc506 100644 +index b3fb8c5bec1f8cb20111ccc0167c3989c0e8e019..c93f8ad8d55cd9b60d0847bb877665623daf0776 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1531,6 +1531,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0238-Spark-Profiler.patch b/patches/server/0239-Spark-Profiler.patch similarity index 100% rename from patches/server/0238-Spark-Profiler.patch rename to patches/server/0239-Spark-Profiler.patch diff --git a/patches/server/0239-Option-to-disable-kick-for-out-of-order-chat.patch b/patches/server/0240-Option-to-disable-kick-for-out-of-order-chat.patch similarity index 95% rename from patches/server/0239-Option-to-disable-kick-for-out-of-order-chat.patch rename to patches/server/0240-Option-to-disable-kick-for-out-of-order-chat.patch index b4185da70..19836d665 100644 --- a/patches/server/0239-Option-to-disable-kick-for-out-of-order-chat.patch +++ b/patches/server/0240-Option-to-disable-kick-for-out-of-order-chat.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Option to disable kick for out of order chat diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 6ba7813b48fe0db81cb895937837bd463f458d62..c1f345fed7c5f95a87e3cc74e8ec200fcc49e777 100644 +index d0672ed5abf3488fc3ec6ea8b153e2d22ff3e9ab..86ee80021010b5cbae088aff73eb53d0195b4443 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1662,7 +1662,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0240-Config-for-sculk-shrieker-can_summon-state.patch b/patches/server/0241-Config-for-sculk-shrieker-can_summon-state.patch similarity index 95% rename from patches/server/0240-Config-for-sculk-shrieker-can_summon-state.patch rename to patches/server/0241-Config-for-sculk-shrieker-can_summon-state.patch index 9e09cabb7..170f77233 100644 --- a/patches/server/0240-Config-for-sculk-shrieker-can_summon-state.patch +++ b/patches/server/0241-Config-for-sculk-shrieker-can_summon-state.patch @@ -18,7 +18,7 @@ index b6b367492ebe2af3e63381bef935c6077f6ddb27..09f34c30d9a03751ed826b26375ac5ae @Override diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 8a15744a6fb79be45ca703793ce106eaf2bbc506..6306d49a7c3749c358e734133061c0bd6d902218 100644 +index c93f8ad8d55cd9b60d0847bb877665623daf0776..359e3c0f7aede6b75084be15b5e1d29356e36c6e 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1045,6 +1045,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0241-Config-to-not-let-coral-die.patch b/patches/server/0242-Config-to-not-let-coral-die.patch similarity index 96% rename from patches/server/0241-Config-to-not-let-coral-die.patch rename to patches/server/0242-Config-to-not-let-coral-die.patch index 48716dc20..e1c3a2538 100644 --- a/patches/server/0241-Config-to-not-let-coral-die.patch +++ b/patches/server/0242-Config-to-not-let-coral-die.patch @@ -29,7 +29,7 @@ index 81fe0dea8e6e23c4a78f07fc2f9c0d68cd683f11..bff97b7d3909f2ec9e58a341b901b374 int i = aenumdirection.length; diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 6441a55bda07bacd23918a7cb74cacbfe45688ae..55d6232d50dd48080aec705512c791c86dae8c93 100644 +index 359e3c0f7aede6b75084be15b5e1d29356e36c6e..fb28dbdd5d6428e5860344f92fe700583187c1e8 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -894,6 +894,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0242-Add-local-difficulty-api.patch b/patches/server/0243-Add-local-difficulty-api.patch similarity index 100% rename from patches/server/0242-Add-local-difficulty-api.patch rename to patches/server/0243-Add-local-difficulty-api.patch diff --git a/patches/server/0243-Add-toggle-for-RNG-manipulation.patch b/patches/server/0244-Add-toggle-for-RNG-manipulation.patch similarity index 94% rename from patches/server/0243-Add-toggle-for-RNG-manipulation.patch rename to patches/server/0244-Add-toggle-for-RNG-manipulation.patch index 33ee2058d..c9aa936d4 100644 --- a/patches/server/0243-Add-toggle-for-RNG-manipulation.patch +++ b/patches/server/0244-Add-toggle-for-RNG-manipulation.patch @@ -7,7 +7,7 @@ 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 1c99a0c4a335db2cb444793b6aba43ab600597d2..8fddc8f7c0bdd91b0a1ce72c9bfccfc254c76bb7 100644 +index fcb3c6230b299a60ec96f3b77b757cf342e0715a..5750384557c84b4bb25b2b10f78b8170ce562e69 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -558,7 +558,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess @@ -33,7 +33,7 @@ index b9c8fe36c6a6256097ea69383bef678bbfb6c45b..8ec27ee82cd6f31bee722852c5fc6e7c } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 55d6232d50dd48080aec705512c791c86dae8c93..bd48c162844d3aaa194476eb6b6c2647ec2a7316 100644 +index fb28dbdd5d6428e5860344f92fe700583187c1e8..e1bfad94970dd468bedf216e395e047407270d85 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -208,9 +208,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0244-Remove-Timings.patch b/patches/server/0245-Remove-Timings.patch similarity index 100% rename from patches/server/0244-Remove-Timings.patch rename to patches/server/0245-Remove-Timings.patch diff --git a/patches/server/0245-Remove-Mojang-Profiler.patch b/patches/server/0246-Remove-Mojang-Profiler.patch similarity index 99% rename from patches/server/0245-Remove-Mojang-Profiler.patch rename to patches/server/0246-Remove-Mojang-Profiler.patch index d0f446377..1a35ed595 100644 --- a/patches/server/0245-Remove-Mojang-Profiler.patch +++ b/patches/server/0246-Remove-Mojang-Profiler.patch @@ -1061,7 +1061,7 @@ index a715ecf4a8ac91d3e5e5c6269d89e54b2c1cd279..223c3665126c576eddb1a8f7c9f5bc60 }; } diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 8fddc8f7c0bdd91b0a1ce72c9bfccfc254c76bb7..452ca1aeb5b57b8e0e4a1ef369c9b521c485d803 100644 +index 5750384557c84b4bb25b2b10f78b8170ce562e69..e1a1247c430b58c65dcb83edef42004ac51c8a5e 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -827,7 +827,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess @@ -1129,7 +1129,7 @@ index 8fddc8f7c0bdd91b0a1ce72c9bfccfc254c76bb7..452ca1aeb5b57b8e0e4a1ef369c9b521 } } } -@@ -3107,7 +3107,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -3108,7 +3108,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess this.processPortalCooldown(); if (this.portalProcess != null) { if (this.portalProcess.processPortalTeleportation(worldserver, this, this.canUsePortal(false))) { @@ -1138,7 +1138,7 @@ index 8fddc8f7c0bdd91b0a1ce72c9bfccfc254c76bb7..452ca1aeb5b57b8e0e4a1ef369c9b521 // Paper start - Add EntityPortalReadyEvent ServerLevel changedTarget = worldserver.getServer().getLevel(worldserver.getTypeKey() == net.minecraft.world.level.dimension.LevelStem.NETHER ? Level.OVERWORLD : Level.NETHER); if (this.portalProcess.isSamePortal(((net.minecraft.world.level.block.NetherPortalBlock) net.minecraft.world.level.block.Blocks.NETHER_PORTAL))) { -@@ -3130,7 +3130,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -3131,7 +3131,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess } } @@ -1147,7 +1147,7 @@ index 8fddc8f7c0bdd91b0a1ce72c9bfccfc254c76bb7..452ca1aeb5b57b8e0e4a1ef369c9b521 } else if (this.portalProcess.hasExpired()) { this.portalProcess = null; } -@@ -3631,7 +3631,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -3632,7 +3632,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess } } @@ -1156,7 +1156,7 @@ index 8fddc8f7c0bdd91b0a1ce72c9bfccfc254c76bb7..452ca1aeb5b57b8e0e4a1ef369c9b521 Entity entity2 = worldserver1.dimension() == worldserver.dimension() ? this : this.getType().create(worldserver1); if (entity2 != null) { -@@ -3667,7 +3667,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -3668,7 +3668,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess teleportTarget.postDimensionTransition().onTransition(entity2); } @@ -1745,10 +1745,10 @@ index ba560ab0340c06614547dcddbdcbd1bbda44bb79..6ee394c1616db9b0203b3e52e39234d0 if ((this.tickCount + this.getId()) % 120 == 0) { Warden.applyDarknessAround(worldserver, this.position(), this, 20); 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 bebbbdfe2b1056cc643a108afbfb46aace94598a..8431c19a974f8e846dce3258481dd6489dfb3206 100644 +index 2b55f05b727f862ea79ab2c200a756f663b43823..ef6d82593d18533ad6b67bc0ae304d98270fbfd8 100644 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java -@@ -336,7 +336,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler +@@ -341,7 +341,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler } protected void customServerAiStep(boolean inactive) { // Purpur - not final // Paper end @@ -1757,7 +1757,7 @@ index bebbbdfe2b1056cc643a108afbfb46aace94598a..8431c19a974f8e846dce3258481dd648 // Purpur start if (this.level().purpurConfig.villagerLobotomizeEnabled) { // treat as inactive if lobotomized -@@ -352,7 +352,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler +@@ -357,7 +357,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler this.getBrain().tick((ServerLevel) this.level(), this); // Paper } // Purpur end*/ // Purpur - TODO: Pufferfish diff --git a/patches/server/0246-Add-more-logger-output-for-invalid-movement-kicks.patch b/patches/server/0247-Add-more-logger-output-for-invalid-movement-kicks.patch similarity index 100% rename from patches/server/0246-Add-more-logger-output-for-invalid-movement-kicks.patch rename to patches/server/0247-Add-more-logger-output-for-invalid-movement-kicks.patch diff --git a/patches/server/0247-Add-Bee-API.patch b/patches/server/0248-Add-Bee-API.patch similarity index 100% rename from patches/server/0247-Add-Bee-API.patch rename to patches/server/0248-Add-Bee-API.patch diff --git a/patches/server/0248-Debug-Marker-API.patch b/patches/server/0249-Debug-Marker-API.patch similarity index 100% rename from patches/server/0248-Debug-Marker-API.patch rename to patches/server/0249-Debug-Marker-API.patch diff --git a/patches/server/0249-mob-spawning-option-to-ignore-creative-players.patch b/patches/server/0250-mob-spawning-option-to-ignore-creative-players.patch similarity index 96% rename from patches/server/0249-mob-spawning-option-to-ignore-creative-players.patch rename to patches/server/0250-mob-spawning-option-to-ignore-creative-players.patch index 8c7f055f1..aeca821fb 100644 --- a/patches/server/0249-mob-spawning-option-to-ignore-creative-players.patch +++ b/patches/server/0250-mob-spawning-option-to-ignore-creative-players.patch @@ -18,7 +18,7 @@ index 35e94c06361795d032f995e8282f8b35c075dae7..0f90a6803851eba51e164772c984b1cd 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 a0b85893498cef8f33a3a5c7bdf75fa34faac0f9..f256365039f8669552feb895c6f7f85f05de7235 100644 +index e1bfad94970dd468bedf216e395e047407270d85..ce21d84647af2f233f547edc162eaf7f96a0f94e 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -370,6 +370,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0250-Add-skeleton-bow-accuracy-option.patch b/patches/server/0251-Add-skeleton-bow-accuracy-option.patch similarity index 97% rename from patches/server/0250-Add-skeleton-bow-accuracy-option.patch rename to patches/server/0251-Add-skeleton-bow-accuracy-option.patch index bad094cfc..f22bb0640 100644 --- a/patches/server/0250-Add-skeleton-bow-accuracy-option.patch +++ b/patches/server/0251-Add-skeleton-bow-accuracy-option.patch @@ -18,7 +18,7 @@ index 63cbec52bc4637a0b787cbc22041188691527def..45b09f79a0ae8b7ebdd015d6edfa1fe0 org.bukkit.event.entity.EntityShootBowEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityShootBowEvent(this, this.getMainHandItem(), entityarrow.getPickupItem(), entityarrow, net.minecraft.world.InteractionHand.MAIN_HAND, 0.8F, true); // Paper if (event.isCancelled()) { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index f256365039f8669552feb895c6f7f85f05de7235..aa98a89984182ead3dca5c517c87864c7cdde0bf 100644 +index ce21d84647af2f233f547edc162eaf7f96a0f94e..3b89cdfec198407508cc40383c6459bf6504c583 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -2514,6 +2514,8 @@ public class PurpurWorldConfig { diff --git a/patches/server/0251-Add-death-screen-API.patch b/patches/server/0252-Add-death-screen-API.patch similarity index 100% rename from patches/server/0251-Add-death-screen-API.patch rename to patches/server/0252-Add-death-screen-API.patch diff --git a/patches/server/0252-Implement-ram-and-rambar-commands.patch b/patches/server/0253-Implement-ram-and-rambar-commands.patch similarity index 100% rename from patches/server/0252-Implement-ram-and-rambar-commands.patch rename to patches/server/0253-Implement-ram-and-rambar-commands.patch diff --git a/patches/server/0253-Configurable-block-blast-resistance.patch b/patches/server/0254-Configurable-block-blast-resistance.patch similarity index 100% rename from patches/server/0253-Configurable-block-blast-resistance.patch rename to patches/server/0254-Configurable-block-blast-resistance.patch diff --git a/patches/server/0254-Configurable-block-fall-damage-modifiers.patch b/patches/server/0255-Configurable-block-fall-damage-modifiers.patch similarity index 100% rename from patches/server/0254-Configurable-block-fall-damage-modifiers.patch rename to patches/server/0255-Configurable-block-fall-damage-modifiers.patch diff --git a/patches/server/0255-Language-API.patch b/patches/server/0256-Language-API.patch similarity index 100% rename from patches/server/0255-Language-API.patch rename to patches/server/0256-Language-API.patch diff --git a/patches/server/0256-Milk-Keeps-Beneficial-Effects.patch b/patches/server/0257-Milk-Keeps-Beneficial-Effects.patch similarity index 94% rename from patches/server/0256-Milk-Keeps-Beneficial-Effects.patch rename to patches/server/0257-Milk-Keeps-Beneficial-Effects.patch index 0ccdd7780..e9c7945ac 100644 --- a/patches/server/0256-Milk-Keeps-Beneficial-Effects.patch +++ b/patches/server/0257-Milk-Keeps-Beneficial-Effects.patch @@ -17,10 +17,10 @@ index 3f0d3229ec4727c0d176a2e603c3f9e933f3395e..bfa8ad069e7632863fffe20442c56d21 if (event.isCancelled()) { continue; diff --git a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java -index 1313844a719befa96d4d8ab23505e89e8c4df2fd..0da4dbd11d2b5368e10291ca0389f08714e0c2af 100644 +index d342752271c76b447bb8cde50d57407259b93c43..360514d5afcafcf6dd83335938bfa09bb02e41d0 100644 --- a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java +++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java -@@ -110,7 +110,7 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill +@@ -115,7 +115,7 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill return this.canDrinkPotion && this.level().isNight() && !entityvillagertrader.isInvisible(); // Paper - Add more WanderingTrader API })); this.goalSelector.addGoal(0, new UseItemGoal<>(this, new ItemStack(Items.MILK_BUCKET), SoundEvents.WANDERING_TRADER_REAPPEARED, (entityvillagertrader) -> { @@ -30,7 +30,7 @@ index 1313844a719befa96d4d8ab23505e89e8c4df2fd..0da4dbd11d2b5368e10291ca0389f087 this.goalSelector.addGoal(1, new TradeWithPlayerGoal(this)); this.goalSelector.addGoal(1, new AvoidEntityGoal<>(this, Zombie.class, 8.0F, 0.5D, 0.5D)); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index aa98a89984182ead3dca5c517c87864c7cdde0bf..e76fe82819cf0193f124b080c10f11c0596516d0 100644 +index 3b89cdfec198407508cc40383c6459bf6504c583..8410476f5f19a75e13b6f84a7dfa1e2ffc4eaebc 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -126,6 +126,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0257-MC-121706-Fix-mobs-not-looking-up-and-down-when-stra.patch b/patches/server/0258-MC-121706-Fix-mobs-not-looking-up-and-down-when-stra.patch similarity index 100% rename from patches/server/0257-MC-121706-Fix-mobs-not-looking-up-and-down-when-stra.patch rename to patches/server/0258-MC-121706-Fix-mobs-not-looking-up-and-down-when-stra.patch diff --git a/patches/server/0258-Add-log-suppression-for-LibraryLoader.patch b/patches/server/0259-Add-log-suppression-for-LibraryLoader.patch similarity index 100% rename from patches/server/0258-Add-log-suppression-for-LibraryLoader.patch rename to patches/server/0259-Add-log-suppression-for-LibraryLoader.patch diff --git a/patches/server/0259-Add-option-to-allow-creeper-to-encircle-target-when-.patch b/patches/server/0260-Add-option-to-allow-creeper-to-encircle-target-when-.patch similarity index 96% rename from patches/server/0259-Add-option-to-allow-creeper-to-encircle-target-when-.patch rename to patches/server/0260-Add-option-to-allow-creeper-to-encircle-target-when-.patch index 97fbec11b..0cf4c986e 100644 --- a/patches/server/0259-Add-option-to-allow-creeper-to-encircle-target-when-.patch +++ b/patches/server/0260-Add-option-to-allow-creeper-to-encircle-target-when-.patch @@ -24,7 +24,7 @@ index 137ec75ee803789deb7b1ca93dd9369c9af362b9..ca95d25af3e9a0536868b0c7fd8e7d2f } } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index e76fe82819cf0193f124b080c10f11c0596516d0..e44dcc89cb6286125400f6e83a672bcd66654704 100644 +index 8410476f5f19a75e13b6f84a7dfa1e2ffc4eaebc..76159e674c9649bb58e6b3a5f79957a25221723e 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1421,6 +1421,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0260-Fire-Immunity-API.patch b/patches/server/0261-Fire-Immunity-API.patch similarity index 97% rename from patches/server/0260-Fire-Immunity-API.patch rename to patches/server/0261-Fire-Immunity-API.patch index c0934be08..e9d1c6b75 100644 --- a/patches/server/0260-Fire-Immunity-API.patch +++ b/patches/server/0261-Fire-Immunity-API.patch @@ -5,7 +5,7 @@ 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 452ca1aeb5b57b8e0e4a1ef369c9b521c485d803..5577499417c5ef138a3943fcdb0a93365df6713b 100644 +index e1a1247c430b58c65dcb83edef42004ac51c8a5e..b7f27d4a5d7db3cf7594151d33b561eadf479932 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -430,6 +430,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0261-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch b/patches/server/0262-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch similarity index 93% rename from patches/server/0261-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch rename to patches/server/0262-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch index dc7aaae19..abf12ce01 100644 --- a/patches/server/0261-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch +++ b/patches/server/0262-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch @@ -5,7 +5,7 @@ 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 5577499417c5ef138a3943fcdb0a93365df6713b..9bad2e02588160ff2644e343a65ecf2ddb593acf 100644 +index b7f27d4a5d7db3cf7594151d33b561eadf479932..f5b988d1d467ea6ab25380181b35c30ccc634171 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -906,6 +906,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess @@ -17,7 +17,7 @@ index 5577499417c5ef138a3943fcdb0a93365df6713b..9bad2e02588160ff2644e343a65ecf2d } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index e44dcc89cb6286125400f6e83a672bcd66654704..d3a01c7445e693989f72e1215a2b72d06713cd1d 100644 +index 76159e674c9649bb58e6b3a5f79957a25221723e..570f23df640b15c0fca34ca6b14d4b7808bb5fc1 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -410,6 +410,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0262-Added-got-ram-event.patch b/patches/server/0263-Added-got-ram-event.patch similarity index 100% rename from patches/server/0262-Added-got-ram-event.patch rename to patches/server/0263-Added-got-ram-event.patch diff --git a/patches/server/0263-Log-skipped-entity-s-position.patch b/patches/server/0264-Log-skipped-entity-s-position.patch similarity index 100% rename from patches/server/0263-Log-skipped-entity-s-position.patch rename to patches/server/0264-Log-skipped-entity-s-position.patch diff --git a/patches/server/0264-End-Crystal-Cramming.patch b/patches/server/0265-End-Crystal-Cramming.patch similarity index 96% rename from patches/server/0264-End-Crystal-Cramming.patch rename to patches/server/0265-End-Crystal-Cramming.patch index 5e74f06ac..9caac71e4 100644 --- a/patches/server/0264-End-Crystal-Cramming.patch +++ b/patches/server/0265-End-Crystal-Cramming.patch @@ -17,7 +17,7 @@ index 02f1d0418395b100cabfad7294466aaad34ac7c6..c0275197cc9aab2a49d88476e072a94f // Purpur start diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index d3a01c7445e693989f72e1215a2b72d06713cd1d..4ad829aa273c5c15efd8cc2d358042f749d611ad 100644 +index 570f23df640b15c0fca34ca6b14d4b7808bb5fc1..5f57a3aeb9deaecfa82e0560b8bafa621d517a7c 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -937,6 +937,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0265-Option-to-allow-beacon-effects-when-covered-by-tinte.patch b/patches/server/0266-Option-to-allow-beacon-effects-when-covered-by-tinte.patch similarity index 97% rename from patches/server/0265-Option-to-allow-beacon-effects-when-covered-by-tinte.patch rename to patches/server/0266-Option-to-allow-beacon-effects-when-covered-by-tinte.patch index b41d672a9..85f5b5724 100644 --- a/patches/server/0265-Option-to-allow-beacon-effects-when-covered-by-tinte.patch +++ b/patches/server/0266-Option-to-allow-beacon-effects-when-covered-by-tinte.patch @@ -36,7 +36,7 @@ index d1fb77d83d48183a9a37dbeec7bb0fda623d7e9b..df02a78855f1d0c32d1f744c20803fc9 BeaconBlockEntity.playSound(world, pos, SoundEvents.BEACON_AMBIENT); } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 4ad829aa273c5c15efd8cc2d358042f749d611ad..b54e12dbac09b8347a45a912d9f21ac146b87a9b 100644 +index 5f57a3aeb9deaecfa82e0560b8bafa621d517a7c..75b24b5b588dde997504931952ac740d54997146 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -836,11 +836,13 @@ public class PurpurWorldConfig { diff --git a/patches/server/0266-Add-attribute-clamping-and-armor-limit-config.patch b/patches/server/0267-Add-attribute-clamping-and-armor-limit-config.patch similarity index 100% rename from patches/server/0266-Add-attribute-clamping-and-armor-limit-config.patch rename to patches/server/0267-Add-attribute-clamping-and-armor-limit-config.patch diff --git a/patches/server/0267-Config-to-remove-explosion-radius-clamp.patch b/patches/server/0268-Config-to-remove-explosion-radius-clamp.patch similarity index 95% rename from patches/server/0267-Config-to-remove-explosion-radius-clamp.patch rename to patches/server/0268-Config-to-remove-explosion-radius-clamp.patch index f1139e359..bd07b60b8 100644 --- a/patches/server/0267-Config-to-remove-explosion-radius-clamp.patch +++ b/patches/server/0268-Config-to-remove-explosion-radius-clamp.patch @@ -27,7 +27,7 @@ index 3ee7bf7e10f8120258baaae8f77cdcbb6a781f78..754373da9a5246c11f3c33a8907d387e } // CraftBukkit end diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index b54e12dbac09b8347a45a912d9f21ac146b87a9b..bdfeefa959a66ebb21f0882c7035e77f234c0b60 100644 +index 75b24b5b588dde997504931952ac740d54997146..d02ebd5dddecfbd2c6adfc026715d1d2c72a1505 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -217,6 +217,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0268-bonemealable-sugarcane-cactus-and-netherwart.patch b/patches/server/0269-bonemealable-sugarcane-cactus-and-netherwart.patch similarity index 98% rename from patches/server/0268-bonemealable-sugarcane-cactus-and-netherwart.patch rename to patches/server/0269-bonemealable-sugarcane-cactus-and-netherwart.patch index e76bfa9b8..8e9284454 100644 --- a/patches/server/0268-bonemealable-sugarcane-cactus-and-netherwart.patch +++ b/patches/server/0269-bonemealable-sugarcane-cactus-and-netherwart.patch @@ -137,7 +137,7 @@ index c48c622e92cedeaa46b929c7adfedec98dd5a3fb..6449b5c424443b5f0ee7e3fce8034494 + // Purpur end } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index bdfeefa959a66ebb21f0882c7035e77f234c0b60..8f7fe53477f2abe680cbe7417956021097a22935 100644 +index d02ebd5dddecfbd2c6adfc026715d1d2c72a1505..224d8f502a8b70d84e5faec5ed7440cc47a3f6e1 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -890,8 +890,20 @@ public class PurpurWorldConfig { diff --git a/patches/server/0269-Add-PreExplodeEvents.patch b/patches/server/0270-Add-PreExplodeEvents.patch similarity index 100% rename from patches/server/0269-Add-PreExplodeEvents.patch rename to patches/server/0270-Add-PreExplodeEvents.patch diff --git a/patches/server/0270-Improve-output-of-plugins-command.patch b/patches/server/0271-Improve-output-of-plugins-command.patch similarity index 100% rename from patches/server/0270-Improve-output-of-plugins-command.patch rename to patches/server/0271-Improve-output-of-plugins-command.patch diff --git a/patches/server/0271-Make-GUI-Great-Again.patch b/patches/server/0272-Make-GUI-Great-Again.patch similarity index 100% rename from patches/server/0271-Make-GUI-Great-Again.patch rename to patches/server/0272-Make-GUI-Great-Again.patch diff --git a/patches/server/0272-Stored-Bee-API.patch b/patches/server/0273-Stored-Bee-API.patch similarity index 100% rename from patches/server/0272-Stored-Bee-API.patch rename to patches/server/0273-Stored-Bee-API.patch diff --git a/patches/server/0273-Shears-can-defuse-TNT.patch b/patches/server/0274-Shears-can-defuse-TNT.patch similarity index 96% rename from patches/server/0273-Shears-can-defuse-TNT.patch rename to patches/server/0274-Shears-can-defuse-TNT.patch index 03f7413cd..e2bcbb39e 100644 --- a/patches/server/0273-Shears-can-defuse-TNT.patch +++ b/patches/server/0274-Shears-can-defuse-TNT.patch @@ -42,10 +42,10 @@ index 42bd2d9a1528b6210e4dfb56233062fd97c9743b..2a4425d04917b32c7ae5af3e7422c0ba + // Purpur end - Shears can defuse TNT } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 8f7fe53477f2abe680cbe7417956021097a22935..0c4fe3ff28782047db138ecf9b7016dca28b93a2 100644 +index 224d8f502a8b70d84e5faec5ed7440cc47a3f6e1..554fa62b150ca009bbc97db109134973856e832b 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -@@ -3279,4 +3279,11 @@ public class PurpurWorldConfig { +@@ -3283,4 +3283,11 @@ public class PurpurWorldConfig { cauldronDripstoneWaterFillChance = (float) getDouble("blocks.cauldron.fill-chances.dripstone-water", cauldronDripstoneWaterFillChance); cauldronDripstoneLavaFillChance = (float) getDouble("blocks.cauldron.fill-chances.dripstone-lava", cauldronDripstoneLavaFillChance); } diff --git a/patches/server/0274-Explorer-Map-API.patch b/patches/server/0275-Explorer-Map-API.patch similarity index 100% rename from patches/server/0274-Explorer-Map-API.patch rename to patches/server/0275-Explorer-Map-API.patch diff --git a/patches/server/0275-Option-Ocelot-Spawn-Under-Sea-Level.patch b/patches/server/0276-Option-Ocelot-Spawn-Under-Sea-Level.patch similarity index 95% rename from patches/server/0275-Option-Ocelot-Spawn-Under-Sea-Level.patch rename to patches/server/0276-Option-Ocelot-Spawn-Under-Sea-Level.patch index 864eaef9f..e00ebebfc 100644 --- a/patches/server/0275-Option-Ocelot-Spawn-Under-Sea-Level.patch +++ b/patches/server/0276-Option-Ocelot-Spawn-Under-Sea-Level.patch @@ -18,7 +18,7 @@ index e09ca4aa99f2e58f97159a40e33ed863fa2ae7df..6e866ec44a83ec9064ac3228bd96eb25 } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 0c4fe3ff28782047db138ecf9b7016dca28b93a2..668ab3cca7bf07738cd85d6186fa26fdb2474541 100644 +index 554fa62b150ca009bbc97db109134973856e832b..a34066d50d7670e41c1ea8d3606897b6923cb8bf 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -2098,6 +2098,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0276-add-an-option-for-piglins-to-ignore-gold-trimmed-arm.patch b/patches/server/0277-add-an-option-for-piglins-to-ignore-gold-trimmed-arm.patch similarity index 96% rename from patches/server/0276-add-an-option-for-piglins-to-ignore-gold-trimmed-arm.patch rename to patches/server/0277-add-an-option-for-piglins-to-ignore-gold-trimmed-arm.patch index 285eaed84..33c3fb1f1 100644 --- a/patches/server/0276-add-an-option-for-piglins-to-ignore-gold-trimmed-arm.patch +++ b/patches/server/0277-add-an-option-for-piglins-to-ignore-gold-trimmed-arm.patch @@ -29,7 +29,7 @@ index 0192b62fd66621a72fcf2f20896647e5950ba993..d079d5492b6ed709b1e0a7d84fb5f8f6 piglin.getBrain().eraseMemory(MemoryModuleType.WALK_TARGET); piglin.getNavigation().stop(); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 668ab3cca7bf07738cd85d6186fa26fdb2474541..555594d330d5621bf656299aa76f7a85fba46292 100644 +index a34066d50d7670e41c1ea8d3606897b6923cb8bf..0af7ad56478e75d980d1535a8b9e23bd89b0d069 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -2267,6 +2267,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0277-Add-option-for-always-showing-item-in-player-death-m.patch b/patches/server/0278-Add-option-for-always-showing-item-in-player-death-m.patch similarity index 100% rename from patches/server/0277-Add-option-for-always-showing-item-in-player-death-m.patch rename to patches/server/0278-Add-option-for-always-showing-item-in-player-death-m.patch diff --git a/patches/server/0278-place-end-crystal-on-any-block.patch b/patches/server/0279-place-end-crystal-on-any-block.patch similarity index 96% rename from patches/server/0278-place-end-crystal-on-any-block.patch rename to patches/server/0279-place-end-crystal-on-any-block.patch index 399081c84..0e53a5f2d 100644 --- a/patches/server/0278-place-end-crystal-on-any-block.patch +++ b/patches/server/0279-place-end-crystal-on-any-block.patch @@ -18,7 +18,7 @@ index 5f51e64cb0611a4ba6bdcdcacbcba1063a7f3a5c..8fb564f43e2f1194d2ad68d35c4df6b9 } else { BlockPos blockposition1 = blockposition.above(); final BlockPos aboveBlockPosition = blockposition1; // Paper - OBFHELPER diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 555594d330d5621bf656299aa76f7a85fba46292..8e892a7acb8f143ab3ecdf7b6dfee3ac0d86c172 100644 +index 0af7ad56478e75d980d1535a8b9e23bd89b0d069..f9f26230980621439baa8ab536caa54a7d374169 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -957,6 +957,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0279-Add-option-to-disable-the-copper-oxidation-proximity.patch b/patches/server/0280-Add-option-to-disable-the-copper-oxidation-proximity.patch similarity index 96% rename from patches/server/0279-Add-option-to-disable-the-copper-oxidation-proximity.patch rename to patches/server/0280-Add-option-to-disable-the-copper-oxidation-proximity.patch index 849d9258f..11f0053f0 100644 --- a/patches/server/0279-Add-option-to-disable-the-copper-oxidation-proximity.patch +++ b/patches/server/0280-Add-option-to-disable-the-copper-oxidation-proximity.patch @@ -18,7 +18,7 @@ index daae7fd6e0148cfba8e359d990748a0c83a3376e..0e06b1bcd906e92c083dc74d56d6d0a2 return random.nextFloat() < f1 ? this.getNext(state) : Optional.empty(); } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 8e892a7acb8f143ab3ecdf7b6dfee3ac0d86c172..214141c932153d1b5147c94815256246b2615eb9 100644 +index f9f26230980621439baa8ab536caa54a7d374169..ddc47b0d569fccaaccfc900e959cec7b0d420f6d 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -143,6 +143,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0280-register-minecraft-debug-commands.patch b/patches/server/0281-register-minecraft-debug-commands.patch similarity index 100% rename from patches/server/0280-register-minecraft-debug-commands.patch rename to patches/server/0281-register-minecraft-debug-commands.patch diff --git a/patches/server/0281-Configurable-villager-search-radius.patch b/patches/server/0282-Configurable-villager-search-radius.patch similarity index 94% rename from patches/server/0281-Configurable-villager-search-radius.patch rename to patches/server/0282-Configurable-villager-search-radius.patch index f131141a4..fbb77a012 100644 --- a/patches/server/0281-Configurable-villager-search-radius.patch +++ b/patches/server/0282-Configurable-villager-search-radius.patch @@ -31,10 +31,10 @@ index d5a549f08b98c80a5cf0eef02cb8a389c32dfecb..222c87e80cb089867ce9a7d2dceebe21 .collect(Collectors.toSet()); Path path = AcquirePoi.findPathToPois(entity, set); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 214141c932153d1b5147c94815256246b2615eb9..cfe83c107f84ae55b119ea817a281b23a7dd797f 100644 +index ddc47b0d569fccaaccfc900e959cec7b0d420f6d..a1899ddff9ae27d3568a3232b1090610feb0581b 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -@@ -2896,6 +2896,8 @@ public class PurpurWorldConfig { +@@ -2897,6 +2897,8 @@ public class PurpurWorldConfig { public boolean villagerDisplayTradeItem = true; public int villagerSpawnIronGolemRadius = 0; public int villagerSpawnIronGolemLimit = 0; @@ -43,7 +43,7 @@ index 214141c932153d1b5147c94815256246b2615eb9..cfe83c107f84ae55b119ea817a281b23 private void villagerSettings() { villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable); villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater); -@@ -2931,6 +2933,8 @@ public class PurpurWorldConfig { +@@ -2933,6 +2935,8 @@ public class PurpurWorldConfig { villagerDisplayTradeItem = getBoolean("mobs.villager.display-trade-item", villagerDisplayTradeItem); villagerSpawnIronGolemRadius = getInt("mobs.villager.spawn-iron-golem.radius", villagerSpawnIronGolemRadius); villagerSpawnIronGolemLimit = getInt("mobs.villager.spawn-iron-golem.limit", villagerSpawnIronGolemLimit); diff --git a/patches/server/0282-option-to-make-ravagers-afraid-of-rabbits.patch b/patches/server/0283-option-to-make-ravagers-afraid-of-rabbits.patch similarity index 96% rename from patches/server/0282-option-to-make-ravagers-afraid-of-rabbits.patch rename to patches/server/0283-option-to-make-ravagers-afraid-of-rabbits.patch index b5211909c..9584f8b03 100644 --- a/patches/server/0282-option-to-make-ravagers-afraid-of-rabbits.patch +++ b/patches/server/0283-option-to-make-ravagers-afraid-of-rabbits.patch @@ -18,7 +18,7 @@ index 714a37974e3256913c15193f2bd292fe45072c7f..0c494a8c71e316307af2c0e256ccfd23 this.goalSelector.addGoal(5, new WaterAvoidingRandomStrollGoal(this, 0.4D)); this.goalSelector.addGoal(6, new LookAtPlayerGoal(this, Player.class, 6.0F)); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index cfe83c107f84ae55b119ea817a281b23a7dd797f..8a044e52d63363a8c38dbe23f1c80c85c1bbf72a 100644 +index a1899ddff9ae27d3568a3232b1090610feb0581b..45235d50180680a299d3af75fcb1a07fafbd9f00 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -2413,6 +2413,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0283-config-for-startup-commands.patch b/patches/server/0284-config-for-startup-commands.patch similarity index 100% rename from patches/server/0283-config-for-startup-commands.patch rename to patches/server/0284-config-for-startup-commands.patch diff --git a/patches/server/0284-Config-to-reverse-bubble-column-flow.patch b/patches/server/0285-Config-to-reverse-bubble-column-flow.patch similarity index 100% rename from patches/server/0284-Config-to-reverse-bubble-column-flow.patch rename to patches/server/0285-Config-to-reverse-bubble-column-flow.patch diff --git a/patches/server/0285-Adopt-MaterialRerouting.patch b/patches/server/0286-Adopt-MaterialRerouting.patch similarity index 100% rename from patches/server/0285-Adopt-MaterialRerouting.patch rename to patches/server/0286-Adopt-MaterialRerouting.patch