From 96ebdc846176f460f9e7a439f2fd4f3f97a33422 Mon Sep 17 00:00:00 2001 From: granny Date: Sat, 15 Jul 2023 21:20:59 -0700 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@de3f149 Fix possible NPE on painting creation (#9391) PaperMC/Paper@fe780d0 Add back accidentally dropped Wandering Trader patch (#9492) PaperMC/Paper@b533905 fix 2 vanilla issues (#8940) --- gradle.properties | 2 +- patches/server/0008-Ridables.patch | 18 +++++----- ...iefing-bypass-to-everything-affected.patch | 8 ++--- ...h => 0243-Configurable-phantom-size.patch} | 0 ...ont-eat-blocks-in-non-ticking-chunks.patch | 36 ------------------- ...> 0244-Configurable-food-attributes.patch} | 0 ....patch => 0245-Max-joins-per-second.patch} | 0 ...figurable-minimum-demand-for-trades.patch} | 0 ... => 0247-Lobotomize-stuck-villagers.patch} | 0 ...ion-for-villager-display-trade-item.patch} | 0 ...wner-not-spawning-water-animals-cor.patch} | 0 ...ig-for-mob-last-hurt-by-player-time.patch} | 0 ...=> 0251-Anvil-repair-damage-options.patch} | 0 ...-turtle-egg-trampling-with-feather-.patch} | 0 ...d-toggle-for-enchant-level-clamping.patch} | 0 ...kip-junit-tests-for-purpur-commands.patch} | 2 +- ...rable-search-radius-for-villagers-t.patch} | 0 ...ge.patch => 0256-Stonecutter-damage.patch} | 0 ...le-damage-settings-for-magma-blocks.patch} | 0 ...258-Add-config-for-snow-on-blue-ice.patch} | 0 ... => 0259-Skeletons-eat-wither-roses.patch} | 0 ...60-Enchantment-Table-Persists-Lapis.patch} | 0 ...ofiler.patch => 0261-Spark-Profiler.patch} | 0 ...-disable-kick-for-out-of-order-chat.patch} | 2 +- ...for-sculk-shrieker-can_summon-state.patch} | 0 ...=> 0264-Config-to-not-let-coral-die.patch} | 0 ...ch => 0265-Add-local-difficulty-api.patch} | 2 +- ...266-Add-toggle-for-RNG-manipulation.patch} | 2 +- ... 0267-Send-client-custom-name-of-BE.patch} | 0 ...Fix-exact-choice-recipe-book-clicks.patch} | 2 +- ...=> 0269-Allow-custom-ChatDecorators.patch} | 0 ...imings.patch => 0270-Remove-Timings.patch} | 2 +- ...atch => 0271-Remove-Mojang-Profiler.patch} | 2 +- ...r-output-for-invalid-movement-kicks.patch} | 2 +- ...d-Bee-API.patch => 0273-Add-Bee-API.patch} | 0 ...-API.patch => 0274-Debug-Marker-API.patch} | 2 +- ...g-option-to-ignore-creative-players.patch} | 0 ...76-Add-skeleton-bow-accuracy-option.patch} | 0 ...atch => 0277-Allay-respect-item-NBT.patch} | 0 ....patch => 0278-Add-death-screen-API.patch} | 2 +- ...-Make-pufferfish-config-relocatable.patch} | 4 +-- ...0-Implement-ram-and-rambar-commands.patch} | 2 +- ...281-Add-item-packet-serialize-event.patch} | 2 +- ...n-to-fix-MC-3304-projectile-looting.patch} | 0 ...Configurable-block-blast-resistance.patch} | 0 patches/server/0283-Fix-MC-123848.patch | 24 ------------- ...gurable-block-fall-damage-modifiers.patch} | 0 ...uage-API.patch => 0285-Language-API.patch} | 0 ... 0286-Milk-Keeps-Beneficial-Effects.patch} | 2 +- ...s-not-looking-up-and-down-when-stra.patch} | 0 ...d-log-suppression-for-LibraryLoader.patch} | 0 ...ow-creeper-to-encircle-target-when-.patch} | 0 ...API.patch => 0290-Fire-Immunity-API.patch} | 2 +- ...eport-to-spawn-on-nether-ceiling-da.patch} | 2 +- ...t.patch => 0292-Added-got-ram-event.patch} | 0 ... 0293-Log-skipped-entity-s-position.patch} | 0 ....patch => 0294-End-Crystal-Cramming.patch} | 2 +- ...eacon-effects-when-covered-by-tinte.patch} | 2 +- ...ute-clamping-and-armor-limit-config.patch} | 0 ...ig-to-remove-explosion-radius-clamp.patch} | 0 ...ble-sugarcane-cactus-and-netherwart.patch} | 0 ....patch => 0299-Add-PreExplodeEvents.patch} | 0 ...0-Improve-output-of-plugins-command.patch} | 0 ...atch => 0301-Add-mending-multiplier.patch} | 0 ....patch => 0302-Make-GUI-Great-Again.patch} | 0 ...ee-API.patch => 0303-Stored-Bee-API.patch} | 0 ...patch => 0304-Shears-can-defuse-TNT.patch} | 0 ...-API.patch => 0305-Explorer-Map-API.patch} | 0 68 files changed, 33 insertions(+), 93 deletions(-) rename patches/server/{0244-Configurable-phantom-size.patch => 0243-Configurable-phantom-size.patch} (100%) delete mode 100644 patches/server/0243-Dont-eat-blocks-in-non-ticking-chunks.patch rename patches/server/{0245-Configurable-food-attributes.patch => 0244-Configurable-food-attributes.patch} (100%) rename patches/server/{0246-Max-joins-per-second.patch => 0245-Max-joins-per-second.patch} (100%) rename patches/server/{0247-Configurable-minimum-demand-for-trades.patch => 0246-Configurable-minimum-demand-for-trades.patch} (100%) rename patches/server/{0248-Lobotomize-stuck-villagers.patch => 0247-Lobotomize-stuck-villagers.patch} (100%) rename patches/server/{0249-Option-for-villager-display-trade-item.patch => 0248-Option-for-villager-display-trade-item.patch} (100%) rename patches/server/{0250-MC-238526-Fix-spawner-not-spawning-water-animals-cor.patch => 0249-MC-238526-Fix-spawner-not-spawning-water-animals-cor.patch} (100%) rename patches/server/{0251-Config-for-mob-last-hurt-by-player-time.patch => 0250-Config-for-mob-last-hurt-by-player-time.patch} (100%) rename patches/server/{0252-Anvil-repair-damage-options.patch => 0251-Anvil-repair-damage-options.patch} (100%) rename patches/server/{0253-Option-to-disable-turtle-egg-trampling-with-feather-.patch => 0252-Option-to-disable-turtle-egg-trampling-with-feather-.patch} (100%) rename patches/server/{0254-Add-toggle-for-enchant-level-clamping.patch => 0253-Add-toggle-for-enchant-level-clamping.patch} (100%) rename patches/server/{0255-Skip-junit-tests-for-purpur-commands.patch => 0254-Skip-junit-tests-for-purpur-commands.patch} (95%) rename patches/server/{0256-Implement-configurable-search-radius-for-villagers-t.patch => 0255-Implement-configurable-search-radius-for-villagers-t.patch} (100%) rename patches/server/{0257-Stonecutter-damage.patch => 0256-Stonecutter-damage.patch} (100%) rename patches/server/{0258-Configurable-damage-settings-for-magma-blocks.patch => 0257-Configurable-damage-settings-for-magma-blocks.patch} (100%) rename patches/server/{0259-Add-config-for-snow-on-blue-ice.patch => 0258-Add-config-for-snow-on-blue-ice.patch} (100%) rename patches/server/{0260-Skeletons-eat-wither-roses.patch => 0259-Skeletons-eat-wither-roses.patch} (100%) rename patches/server/{0261-Enchantment-Table-Persists-Lapis.patch => 0260-Enchantment-Table-Persists-Lapis.patch} (100%) rename patches/server/{0262-Spark-Profiler.patch => 0261-Spark-Profiler.patch} (100%) rename patches/server/{0263-Option-to-disable-kick-for-out-of-order-chat.patch => 0262-Option-to-disable-kick-for-out-of-order-chat.patch} (95%) rename patches/server/{0264-Config-for-sculk-shrieker-can_summon-state.patch => 0263-Config-for-sculk-shrieker-can_summon-state.patch} (100%) rename patches/server/{0265-Config-to-not-let-coral-die.patch => 0264-Config-to-not-let-coral-die.patch} (100%) rename patches/server/{0266-Add-local-difficulty-api.patch => 0265-Add-local-difficulty-api.patch} (91%) rename patches/server/{0267-Add-toggle-for-RNG-manipulation.patch => 0266-Add-toggle-for-RNG-manipulation.patch} (96%) rename patches/server/{0268-Send-client-custom-name-of-BE.patch => 0267-Send-client-custom-name-of-BE.patch} (100%) rename patches/server/{0269-PaperPR-7822-Fix-exact-choice-recipe-book-clicks.patch => 0268-PaperPR-7822-Fix-exact-choice-recipe-book-clicks.patch} (98%) rename patches/server/{0270-Allow-custom-ChatDecorators.patch => 0269-Allow-custom-ChatDecorators.patch} (100%) rename patches/server/{0271-Remove-Timings.patch => 0270-Remove-Timings.patch} (99%) rename patches/server/{0272-Remove-Mojang-Profiler.patch => 0271-Remove-Mojang-Profiler.patch} (99%) rename patches/server/{0273-Add-more-logger-output-for-invalid-movement-kicks.patch => 0272-Add-more-logger-output-for-invalid-movement-kicks.patch} (96%) rename patches/server/{0274-Add-Bee-API.patch => 0273-Add-Bee-API.patch} (100%) rename patches/server/{0275-Debug-Marker-API.patch => 0274-Debug-Marker-API.patch} (98%) rename patches/server/{0276-mob-spawning-option-to-ignore-creative-players.patch => 0275-mob-spawning-option-to-ignore-creative-players.patch} (100%) rename patches/server/{0277-Add-skeleton-bow-accuracy-option.patch => 0276-Add-skeleton-bow-accuracy-option.patch} (100%) rename patches/server/{0278-Allay-respect-item-NBT.patch => 0277-Allay-respect-item-NBT.patch} (100%) rename patches/server/{0279-Add-death-screen-API.patch => 0278-Add-death-screen-API.patch} (92%) rename patches/server/{0280-Make-pufferfish-config-relocatable.patch => 0279-Make-pufferfish-config-relocatable.patch} (93%) rename patches/server/{0281-Implement-ram-and-rambar-commands.patch => 0280-Implement-ram-and-rambar-commands.patch} (99%) rename patches/server/{0282-Add-item-packet-serialize-event.patch => 0281-Add-item-packet-serialize-event.patch} (97%) rename patches/server/{0284-Add-an-option-to-fix-MC-3304-projectile-looting.patch => 0282-Add-an-option-to-fix-MC-3304-projectile-looting.patch} (100%) rename patches/server/{0285-Configurable-block-blast-resistance.patch => 0283-Configurable-block-blast-resistance.patch} (100%) delete mode 100644 patches/server/0283-Fix-MC-123848.patch rename patches/server/{0286-Configurable-block-fall-damage-modifiers.patch => 0284-Configurable-block-fall-damage-modifiers.patch} (100%) rename patches/server/{0287-Language-API.patch => 0285-Language-API.patch} (100%) rename patches/server/{0288-Milk-Keeps-Beneficial-Effects.patch => 0286-Milk-Keeps-Beneficial-Effects.patch} (97%) rename patches/server/{0289-MC-121706-Fix-mobs-not-looking-up-and-down-when-stra.patch => 0287-MC-121706-Fix-mobs-not-looking-up-and-down-when-stra.patch} (100%) rename patches/server/{0290-Add-log-suppression-for-LibraryLoader.patch => 0288-Add-log-suppression-for-LibraryLoader.patch} (100%) rename patches/server/{0291-Add-option-to-allow-creeper-to-encircle-target-when-.patch => 0289-Add-option-to-allow-creeper-to-encircle-target-when-.patch} (100%) rename patches/server/{0292-Fire-Immunity-API.patch => 0290-Fire-Immunity-API.patch} (97%) rename patches/server/{0293-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch => 0291-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch} (96%) rename patches/server/{0294-Added-got-ram-event.patch => 0292-Added-got-ram-event.patch} (100%) rename patches/server/{0295-Log-skipped-entity-s-position.patch => 0293-Log-skipped-entity-s-position.patch} (100%) rename patches/server/{0296-End-Crystal-Cramming.patch => 0294-End-Crystal-Cramming.patch} (96%) rename patches/server/{0297-Option-to-allow-beacon-effects-when-covered-by-tinte.patch => 0295-Option-to-allow-beacon-effects-when-covered-by-tinte.patch} (97%) rename patches/server/{0298-Add-attribute-clamping-and-armor-limit-config.patch => 0296-Add-attribute-clamping-and-armor-limit-config.patch} (100%) rename patches/server/{0299-Config-to-remove-explosion-radius-clamp.patch => 0297-Config-to-remove-explosion-radius-clamp.patch} (100%) rename patches/server/{0300-bonemealable-sugarcane-cactus-and-netherwart.patch => 0298-bonemealable-sugarcane-cactus-and-netherwart.patch} (100%) rename patches/server/{0301-Add-PreExplodeEvents.patch => 0299-Add-PreExplodeEvents.patch} (100%) rename patches/server/{0302-Improve-output-of-plugins-command.patch => 0300-Improve-output-of-plugins-command.patch} (100%) rename patches/server/{0303-Add-mending-multiplier.patch => 0301-Add-mending-multiplier.patch} (100%) rename patches/server/{0304-Make-GUI-Great-Again.patch => 0302-Make-GUI-Great-Again.patch} (100%) rename patches/server/{0305-Stored-Bee-API.patch => 0303-Stored-Bee-API.patch} (100%) rename patches/server/{0306-Shears-can-defuse-TNT.patch => 0304-Shears-can-defuse-TNT.patch} (100%) rename patches/server/{0307-Explorer-Map-API.patch => 0305-Explorer-Map-API.patch} (100%) diff --git a/gradle.properties b/gradle.properties index 23b35d3e5..8b98b5fb6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group = org.purpurmc.purpur version = 1.20.1-R0.1-SNAPSHOT mcVersion = 1.20.1 -paperCommit = 22ed60c1013e5d58026a370b98ae84d1647e6350 +paperCommit = b533905cc3b3360e67fa6140575ebbef52314bb8 org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/server/0008-Ridables.patch b/patches/server/0008-Ridables.patch index 3882f6272..a0d553c1b 100644 --- a/patches/server/0008-Ridables.patch +++ b/patches/server/0008-Ridables.patch @@ -79,7 +79,7 @@ index bd6798a03a1349de4b5589b05cef167034250c1e..8c62cc52c2d2aaa1dd1f191114e188c2 if ((entity instanceof Bucketable && entity instanceof LivingEntity && origItem != null && origItem.asItem() == Items.WATER_BUCKET) && (event.isCancelled() || ServerGamePacketListenerImpl.this.player.getInventory().getSelected() == null || ServerGamePacketListenerImpl.this.player.getInventory().getSelected().getItem() != origItem)) { entity.getEntityData().resendPossiblyDesyncedEntity(player); // Paper - The entire mob gets deleted, so resend it. diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index ccfdfb49b0bca84de676f5df4c373096455c9707..bb3edddf4c9b2a04f6b9219be741a523e4192c0c 100644 +index 51002af763641e0193e5c76b85366e8c411f388f..7e0cfc9d2e4607cb4917133682f907c13fbfdd13 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -376,7 +376,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { @@ -1662,7 +1662,7 @@ index a197337f2e09f53cf382022569c8836745d78769..95383e246a8e1b311e4f26a66372966b protected void defineSynchedData() { super.defineSynchedData(); diff --git a/src/main/java/net/minecraft/world/entity/animal/Rabbit.java b/src/main/java/net/minecraft/world/entity/animal/Rabbit.java -index ef0c0714847c37f57ca05aaeb0ce7c217ae7ac0f..df01b1c5a0f0ad34f0a49c2ac1d10d526b73da9b 100644 +index 082351bd5f98d8738334b9164375f63fdc890455..8e747771fe023dfa4cf61e5166d017368ed746b0 100644 --- a/src/main/java/net/minecraft/world/entity/animal/Rabbit.java +++ b/src/main/java/net/minecraft/world/entity/animal/Rabbit.java @@ -86,6 +86,7 @@ public class Rabbit extends Animal implements VariantHolder { @@ -2945,7 +2945,7 @@ index 92666c48620078623a451fbf68f673cb9f81c4b5..5a2eb6775ecb3b01fd136c796258395b this.dragonFight.updateDragon(this); } diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java -index 1ea5b05405f115e5d77ff0b282075628e64fec3d..e1cf87e13f077860e38714a962c549dcb4644e3f 100644 +index 1e07febcf7a3dfb281728cc5e3e4f15dd776d7e0..6c86411658ef0bf64cb8cf4f213112b65f2d1d90 100644 --- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java +++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java @@ -84,16 +84,30 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob @@ -3456,7 +3456,7 @@ index 8f481e11815d7162dd62a2b850b3d2af6d904519..16486ece9fc415d875ff94d9b806b0b5 return Guardian.createAttributes().add(Attributes.MOVEMENT_SPEED, 0.30000001192092896D).add(Attributes.ATTACK_DAMAGE, 8.0D).add(Attributes.MAX_HEALTH, 80.0D); } diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java -index eaf45b502a698e26a703b93e62989a338479496e..d88ad3f0513f9ab2ffc738b6389cf268f085ca6d 100644 +index 410f10ad93935d1c078447a4596023f367a8e9b7..dc359bb3a45a0b648933894e18d4ee6b51e3c7bc 100644 --- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java +++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java @@ -96,9 +96,27 @@ public class EnderMan extends Monster implements NeutralMob { @@ -4097,7 +4097,7 @@ index cec545c3baa6599d47b9cf1a4b97de8771062a22..31d204d8d81ccc30371070af3678d82d this.targetSelector.addGoal(2, new NearestAttackableTargetGoal<>(this, Player.class, true)); this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, AbstractVillager.class, false)); diff --git a/src/main/java/net/minecraft/world/entity/monster/Ravager.java b/src/main/java/net/minecraft/world/entity/monster/Ravager.java -index 842146548fc42c3b67a1196620b096d6c500b88d..3919ed8b4d91b9d58acbdd72740565352e7c52ec 100644 +index e87c6c8ab585d6b0b38bbb8e42c0082e38f03250..8a99c74f1cb6b558421b11e8562ba6082492b2d2 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Ravager.java +++ b/src/main/java/net/minecraft/world/entity/monster/Ravager.java @@ -68,14 +68,39 @@ public class Ravager extends Raider { @@ -4195,7 +4195,7 @@ index d2073de07bdad71b20e05046577b16649123967b..3e5548d0489b13b4a1d5c22c9d3bf19e public ShulkerLookControl(Mob entity) { super(entity); diff --git a/src/main/java/net/minecraft/world/entity/monster/Silverfish.java b/src/main/java/net/minecraft/world/entity/monster/Silverfish.java -index 0b2d9eb8b3ff06cc64aa5bc7a81d79769709ccf0..ebfe46a6063edf1dafef19ba570a1c0942dc87ee 100644 +index 8d1f99f95a08eac98c6a03c6e534fc1997f8fe71..3b782334e9654acb6748c65970bb62626481da69 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Silverfish.java +++ b/src/main/java/net/minecraft/world/entity/monster/Silverfish.java @@ -45,14 +45,33 @@ public class Silverfish extends Monster { @@ -5079,11 +5079,11 @@ index c4ddf2661bca728d504918171295e10e307b18b4..7b58329067d8debeb34abe801d150038 this.startTrading(player); } 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 2e7de2378e01aed514e237029d6d64e78871c9b4..d434b96b878652190fac4e2882b7b7373febbbd5 100644 +index 0002f3a2f2e096d4b2015baf707707f6cc1a9582..7e5650a56d87a48df7ee0a862b22bf015bb48b2a 100644 --- a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java +++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java @@ -66,6 +66,23 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill - this.setDespawnDelay(48000); // CraftBukkit - set default from MobSpawnerTrader + //this.setDespawnDelay(48000); // CraftBukkit - set default from MobSpawnerTrader // Paper - move back to MobSpawnerTrader - Vanilla behavior is that only traders spawned by it have this value set. } + // Purpur - start @@ -5221,7 +5221,7 @@ index fc0dc8e607cc24020106ea1af92b4421a5f9393d..7d744d5b6a9e593e657233b2192f2837 + // Purpur end } diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index a6edbb5cde568d8138af568122d5d11243f3fb07..6ed0735e9b98b80ed45116907e7563f5e8b993d4 100644 +index 9b9a9606e5be94b394606f2306e7b7a5ed781e1d..5b101451e08b6685b192727d488e879c4123e401 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -565,6 +565,15 @@ public class CraftEventFactory { diff --git a/patches/server/0124-Add-mobGriefing-bypass-to-everything-affected.patch b/patches/server/0124-Add-mobGriefing-bypass-to-everything-affected.patch index 11652d07b..bff822b0f 100644 --- a/patches/server/0124-Add-mobGriefing-bypass-to-everything-affected.patch +++ b/patches/server/0124-Add-mobGriefing-bypass-to-everything-affected.patch @@ -44,7 +44,7 @@ index 66a568e6803b91040f3933d4598c52fa518badab..a1acc479c9d6a838e3180da3ac8a3a02 } else if (entity.getVillagerData().getProfession() != VillagerProfession.FARMER && !(world.purpurConfig.villagerClericsFarmWarts && entity.getVillagerData().getProfession() == VillagerProfession.CLERIC)) { // Purpur return false; diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/BreakDoorGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/BreakDoorGoal.java -index 784a894688f98f9d0368a36d456c5c94e1ee3695..c6980e40b5e6093906f88509d5ed05691e478c46 100644 +index a85885ee51df585fa11ae9f8fcd67ff2a71c5a18..d81509e08e70ec5b2f837c9dc66b1254c86854e4 100644 --- a/src/main/java/net/minecraft/world/entity/ai/goal/BreakDoorGoal.java +++ b/src/main/java/net/minecraft/world/entity/ai/goal/BreakDoorGoal.java @@ -32,7 +32,7 @@ public class BreakDoorGoal extends DoorInteractGoal { @@ -57,10 +57,10 @@ index 784a894688f98f9d0368a36d456c5c94e1ee3695..c6980e40b5e6093906f88509d5ed0569 @Override diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/EatBlockGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/EatBlockGoal.java -index b0caf52d00d8cd76550ab116291f8e11144a5e59..81d89f0a6fa9779eff5bc7059eae9b0d44db8e61 100644 +index 93bbda61f0eb2dd52573602b1f9cc7b031d1fc5a..63f9e5e2490e5b2fec6f2395077e21e601804ca5 100644 --- a/src/main/java/net/minecraft/world/entity/ai/goal/EatBlockGoal.java +++ b/src/main/java/net/minecraft/world/entity/ai/goal/EatBlockGoal.java -@@ -69,7 +69,7 @@ public class EatBlockGoal extends Goal { +@@ -74,7 +74,7 @@ public class EatBlockGoal extends Goal { final BlockState blockState = this.level.getBlockState(blockposition); // Paper - fix wrong block state if (EatBlockGoal.IS_TALL_GRASS.test(blockState)) { // Paper - fix wrong block state @@ -69,7 +69,7 @@ index b0caf52d00d8cd76550ab116291f8e11144a5e59..81d89f0a6fa9779eff5bc7059eae9b0d this.level.destroyBlock(blockposition, false); } -@@ -78,7 +78,7 @@ public class EatBlockGoal extends Goal { +@@ -83,7 +83,7 @@ public class EatBlockGoal extends Goal { BlockPos blockposition1 = blockposition.below(); if (this.level.getBlockState(blockposition1).is(Blocks.GRASS_BLOCK)) { diff --git a/patches/server/0244-Configurable-phantom-size.patch b/patches/server/0243-Configurable-phantom-size.patch similarity index 100% rename from patches/server/0244-Configurable-phantom-size.patch rename to patches/server/0243-Configurable-phantom-size.patch diff --git a/patches/server/0243-Dont-eat-blocks-in-non-ticking-chunks.patch b/patches/server/0243-Dont-eat-blocks-in-non-ticking-chunks.patch deleted file mode 100644 index 9b928b055..000000000 --- a/patches/server/0243-Dont-eat-blocks-in-non-ticking-chunks.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: BillyGalbreath -Date: Sat, 15 Jan 2022 06:23:04 -0600 -Subject: [PATCH] Dont eat blocks in non ticking chunks - - -diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index d304f01766bba9b3e9fcd30a7ae4730fd7188875..68c9846097ec460ab214fcea85fa7b45d943abb3 100644 ---- a/src/main/java/net/minecraft/server/level/ChunkMap.java -+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java -@@ -1010,7 +1010,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider - return this.anyPlayerCloseEnoughForSpawning(this.getUpdatingChunkIfPresent(chunkcoordintpair.toLong()), chunkcoordintpair, reducedRange); - } - -- final boolean anyPlayerCloseEnoughForSpawning(ChunkHolder playerchunk, ChunkPos chunkcoordintpair, boolean reducedRange) { -+ public final boolean anyPlayerCloseEnoughForSpawning(ChunkHolder playerchunk, ChunkPos chunkcoordintpair, boolean reducedRange) { // Purpur - package -> public - // this function is so hot that removing the map lookup call can have an order of magnitude impact on its performance - // tested and confirmed via System.nanoTime() - com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet playersInRange = reducedRange ? playerchunk.playersInMobSpawnRange : playerchunk.playersInChunkTickRange; -diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/EatBlockGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/EatBlockGoal.java -index 95dc62687d10e5c6f54baadda4a725094c52c07f..84a7fb84ce97f582a898dab4982ff8e317f40e82 100644 ---- a/src/main/java/net/minecraft/world/entity/ai/goal/EatBlockGoal.java -+++ b/src/main/java/net/minecraft/world/entity/ai/goal/EatBlockGoal.java -@@ -31,6 +31,12 @@ public class EatBlockGoal extends Goal { - - @Override - public boolean canUse() { -+ // Purpur start -+ net.minecraft.world.level.chunk.LevelChunk chunk = this.mob.level().getChunkIfLoaded(this.mob.blockPosition()); -+ if (chunk == null || chunk.playerChunk == null || !((net.minecraft.server.level.ServerLevel) this.mob.level()).getChunkSource().chunkMap.anyPlayerCloseEnoughForSpawning(chunk.playerChunk, this.mob.chunkPosition(), false)) { -+ return false; -+ } -+ // Purpur end - if (this.mob.getRandom().nextInt(this.mob.isBaby() ? 50 : 1000) != 0) { - return false; - } else { diff --git a/patches/server/0245-Configurable-food-attributes.patch b/patches/server/0244-Configurable-food-attributes.patch similarity index 100% rename from patches/server/0245-Configurable-food-attributes.patch rename to patches/server/0244-Configurable-food-attributes.patch diff --git a/patches/server/0246-Max-joins-per-second.patch b/patches/server/0245-Max-joins-per-second.patch similarity index 100% rename from patches/server/0246-Max-joins-per-second.patch rename to patches/server/0245-Max-joins-per-second.patch diff --git a/patches/server/0247-Configurable-minimum-demand-for-trades.patch b/patches/server/0246-Configurable-minimum-demand-for-trades.patch similarity index 100% rename from patches/server/0247-Configurable-minimum-demand-for-trades.patch rename to patches/server/0246-Configurable-minimum-demand-for-trades.patch diff --git a/patches/server/0248-Lobotomize-stuck-villagers.patch b/patches/server/0247-Lobotomize-stuck-villagers.patch similarity index 100% rename from patches/server/0248-Lobotomize-stuck-villagers.patch rename to patches/server/0247-Lobotomize-stuck-villagers.patch diff --git a/patches/server/0249-Option-for-villager-display-trade-item.patch b/patches/server/0248-Option-for-villager-display-trade-item.patch similarity index 100% rename from patches/server/0249-Option-for-villager-display-trade-item.patch rename to patches/server/0248-Option-for-villager-display-trade-item.patch diff --git a/patches/server/0250-MC-238526-Fix-spawner-not-spawning-water-animals-cor.patch b/patches/server/0249-MC-238526-Fix-spawner-not-spawning-water-animals-cor.patch similarity index 100% rename from patches/server/0250-MC-238526-Fix-spawner-not-spawning-water-animals-cor.patch rename to patches/server/0249-MC-238526-Fix-spawner-not-spawning-water-animals-cor.patch diff --git a/patches/server/0251-Config-for-mob-last-hurt-by-player-time.patch b/patches/server/0250-Config-for-mob-last-hurt-by-player-time.patch similarity index 100% rename from patches/server/0251-Config-for-mob-last-hurt-by-player-time.patch rename to patches/server/0250-Config-for-mob-last-hurt-by-player-time.patch diff --git a/patches/server/0252-Anvil-repair-damage-options.patch b/patches/server/0251-Anvil-repair-damage-options.patch similarity index 100% rename from patches/server/0252-Anvil-repair-damage-options.patch rename to patches/server/0251-Anvil-repair-damage-options.patch diff --git a/patches/server/0253-Option-to-disable-turtle-egg-trampling-with-feather-.patch b/patches/server/0252-Option-to-disable-turtle-egg-trampling-with-feather-.patch similarity index 100% rename from patches/server/0253-Option-to-disable-turtle-egg-trampling-with-feather-.patch rename to patches/server/0252-Option-to-disable-turtle-egg-trampling-with-feather-.patch diff --git a/patches/server/0254-Add-toggle-for-enchant-level-clamping.patch b/patches/server/0253-Add-toggle-for-enchant-level-clamping.patch similarity index 100% rename from patches/server/0254-Add-toggle-for-enchant-level-clamping.patch rename to patches/server/0253-Add-toggle-for-enchant-level-clamping.patch diff --git a/patches/server/0255-Skip-junit-tests-for-purpur-commands.patch b/patches/server/0254-Skip-junit-tests-for-purpur-commands.patch similarity index 95% rename from patches/server/0255-Skip-junit-tests-for-purpur-commands.patch rename to patches/server/0254-Skip-junit-tests-for-purpur-commands.patch index 0387adf32..039ecea43 100644 --- a/patches/server/0255-Skip-junit-tests-for-purpur-commands.patch +++ b/patches/server/0254-Skip-junit-tests-for-purpur-commands.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Skip junit tests for purpur commands diff --git a/src/test/java/io/papermc/paper/permissions/MinecraftCommandPermissionsTest.java b/src/test/java/io/papermc/paper/permissions/MinecraftCommandPermissionsTest.java -index 8665e2740aedcc2895b0e2c44ebaba53d2a40568..b7e2227116ee0a08826674d8681fdaac97efb0ea 100644 +index 4f43882d930ab8816e75b216d9a61a06b79df265..40fc8b6579cc29e68720a99ac12f8adacc1d95be 100644 --- a/src/test/java/io/papermc/paper/permissions/MinecraftCommandPermissionsTest.java +++ b/src/test/java/io/papermc/paper/permissions/MinecraftCommandPermissionsTest.java @@ -45,6 +45,7 @@ public class MinecraftCommandPermissionsTest extends AbstractTestingBase { diff --git a/patches/server/0256-Implement-configurable-search-radius-for-villagers-t.patch b/patches/server/0255-Implement-configurable-search-radius-for-villagers-t.patch similarity index 100% rename from patches/server/0256-Implement-configurable-search-radius-for-villagers-t.patch rename to patches/server/0255-Implement-configurable-search-radius-for-villagers-t.patch diff --git a/patches/server/0257-Stonecutter-damage.patch b/patches/server/0256-Stonecutter-damage.patch similarity index 100% rename from patches/server/0257-Stonecutter-damage.patch rename to patches/server/0256-Stonecutter-damage.patch diff --git a/patches/server/0258-Configurable-damage-settings-for-magma-blocks.patch b/patches/server/0257-Configurable-damage-settings-for-magma-blocks.patch similarity index 100% rename from patches/server/0258-Configurable-damage-settings-for-magma-blocks.patch rename to patches/server/0257-Configurable-damage-settings-for-magma-blocks.patch diff --git a/patches/server/0259-Add-config-for-snow-on-blue-ice.patch b/patches/server/0258-Add-config-for-snow-on-blue-ice.patch similarity index 100% rename from patches/server/0259-Add-config-for-snow-on-blue-ice.patch rename to patches/server/0258-Add-config-for-snow-on-blue-ice.patch diff --git a/patches/server/0260-Skeletons-eat-wither-roses.patch b/patches/server/0259-Skeletons-eat-wither-roses.patch similarity index 100% rename from patches/server/0260-Skeletons-eat-wither-roses.patch rename to patches/server/0259-Skeletons-eat-wither-roses.patch diff --git a/patches/server/0261-Enchantment-Table-Persists-Lapis.patch b/patches/server/0260-Enchantment-Table-Persists-Lapis.patch similarity index 100% rename from patches/server/0261-Enchantment-Table-Persists-Lapis.patch rename to patches/server/0260-Enchantment-Table-Persists-Lapis.patch diff --git a/patches/server/0262-Spark-Profiler.patch b/patches/server/0261-Spark-Profiler.patch similarity index 100% rename from patches/server/0262-Spark-Profiler.patch rename to patches/server/0261-Spark-Profiler.patch diff --git a/patches/server/0263-Option-to-disable-kick-for-out-of-order-chat.patch b/patches/server/0262-Option-to-disable-kick-for-out-of-order-chat.patch similarity index 95% rename from patches/server/0263-Option-to-disable-kick-for-out-of-order-chat.patch rename to patches/server/0262-Option-to-disable-kick-for-out-of-order-chat.patch index 84ba23e1d..47469bf8c 100644 --- a/patches/server/0263-Option-to-disable-kick-for-out-of-order-chat.patch +++ b/patches/server/0262-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 8fd95b7986a63e4b784c0c361687d05a9f648a13..24c93583ce1c0b58e434345974c9fd025720f75a 100644 +index 3e6b483c0f19aa948a243bb0dcede8f94f38eed4..c1a1ac5c6f368a828e148c79ae52ac3a1ecb3aae 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2455,7 +2455,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0264-Config-for-sculk-shrieker-can_summon-state.patch b/patches/server/0263-Config-for-sculk-shrieker-can_summon-state.patch similarity index 100% rename from patches/server/0264-Config-for-sculk-shrieker-can_summon-state.patch rename to patches/server/0263-Config-for-sculk-shrieker-can_summon-state.patch diff --git a/patches/server/0265-Config-to-not-let-coral-die.patch b/patches/server/0264-Config-to-not-let-coral-die.patch similarity index 100% rename from patches/server/0265-Config-to-not-let-coral-die.patch rename to patches/server/0264-Config-to-not-let-coral-die.patch diff --git a/patches/server/0266-Add-local-difficulty-api.patch b/patches/server/0265-Add-local-difficulty-api.patch similarity index 91% rename from patches/server/0266-Add-local-difficulty-api.patch rename to patches/server/0265-Add-local-difficulty-api.patch index d8ae84c50..1b97a5bd7 100644 --- a/patches/server/0266-Add-local-difficulty-api.patch +++ b/patches/server/0265-Add-local-difficulty-api.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add local difficulty api diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 1a481fb4f4228f0fea8a7dc6132248c98b727c90..a3d28fffdfa4b3a4db3009395eb2842a53949d0d 100644 +index 550dcb7d595221b221e4710890d8a3cad789fc07..4720939d138300ed410871e40d3d2800224a7987 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -2290,6 +2290,12 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0267-Add-toggle-for-RNG-manipulation.patch b/patches/server/0266-Add-toggle-for-RNG-manipulation.patch similarity index 96% rename from patches/server/0267-Add-toggle-for-RNG-manipulation.patch rename to patches/server/0266-Add-toggle-for-RNG-manipulation.patch index 243abecbb..7209ce73f 100644 --- a/patches/server/0267-Add-toggle-for-RNG-manipulation.patch +++ b/patches/server/0266-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 75eb55794b3f025d065a4025bfbf415ac669b967..5cc1a1550807399c2d7329f521dd2a97e0a42d4b 100644 +index 71ed0c280eedd7b5a7aa43406995af487b02cc05..aeacaf0e2567290930d4a0bb364e4e7d316a80d7 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -615,7 +615,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0268-Send-client-custom-name-of-BE.patch b/patches/server/0267-Send-client-custom-name-of-BE.patch similarity index 100% rename from patches/server/0268-Send-client-custom-name-of-BE.patch rename to patches/server/0267-Send-client-custom-name-of-BE.patch diff --git a/patches/server/0269-PaperPR-7822-Fix-exact-choice-recipe-book-clicks.patch b/patches/server/0268-PaperPR-7822-Fix-exact-choice-recipe-book-clicks.patch similarity index 98% rename from patches/server/0269-PaperPR-7822-Fix-exact-choice-recipe-book-clicks.patch rename to patches/server/0268-PaperPR-7822-Fix-exact-choice-recipe-book-clicks.patch index 7560101bc..6e82e4f2d 100644 --- a/patches/server/0269-PaperPR-7822-Fix-exact-choice-recipe-book-clicks.patch +++ b/patches/server/0268-PaperPR-7822-Fix-exact-choice-recipe-book-clicks.patch @@ -85,7 +85,7 @@ index 574ebb3a2fcd0e4e426a8a7ee88d722ed3b9c3f5..862972afa333422592a25b854cec191e } diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java -index 10dbd8a58d20319a671b34d9e4a7ff5d8bce7c62..5e77294baace4c1e7f8f47bdb9ca362324511496 100644 +index 500d5bfb80d39d5030c17bd419ea07dabcf9ff67..9e78c913da090d351d3dbaff3eff7d19fb18c8e4 100644 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java @@ -113,6 +113,7 @@ import org.bukkit.event.world.StructureGrowEvent; diff --git a/patches/server/0270-Allow-custom-ChatDecorators.patch b/patches/server/0269-Allow-custom-ChatDecorators.patch similarity index 100% rename from patches/server/0270-Allow-custom-ChatDecorators.patch rename to patches/server/0269-Allow-custom-ChatDecorators.patch diff --git a/patches/server/0271-Remove-Timings.patch b/patches/server/0270-Remove-Timings.patch similarity index 99% rename from patches/server/0271-Remove-Timings.patch rename to patches/server/0270-Remove-Timings.patch index ce5245876..15362d111 100644 --- a/patches/server/0271-Remove-Timings.patch +++ b/patches/server/0270-Remove-Timings.patch @@ -258,7 +258,7 @@ index af8294476cb0fc322641bbe4168c4b0c020f39fd..fa258f1a15a93db0c3401397433b1849 @Override diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index 68c9846097ec460ab214fcea85fa7b45d943abb3..88a33af77aaca67ca77943612a822b8887e18d21 100644 +index 68ac88b150ae5fa5e18958a5e2a83b00a26258ae..29597c321325e0f451431c2d6ea42d06bc33f28d 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -620,15 +620,15 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider diff --git a/patches/server/0272-Remove-Mojang-Profiler.patch b/patches/server/0271-Remove-Mojang-Profiler.patch similarity index 99% rename from patches/server/0272-Remove-Mojang-Profiler.patch rename to patches/server/0271-Remove-Mojang-Profiler.patch index 6aa8d5342..f1dd2d51b 100644 --- a/patches/server/0272-Remove-Mojang-Profiler.patch +++ b/patches/server/0271-Remove-Mojang-Profiler.patch @@ -389,7 +389,7 @@ index aa3f4ca3be843616d34897e41909255f512f8963..426ac5faa9344472560fb20bdea8bdc3 ++j; diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index 88a33af77aaca67ca77943612a822b8887e18d21..85c28c0fd8bcbcf6ed6e4205fd217f251c55c92b 100644 +index 29597c321325e0f451431c2d6ea42d06bc33f28d..906b5b69eec30146e117b7d791e0376fba3e2cae 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -618,20 +618,20 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider diff --git a/patches/server/0273-Add-more-logger-output-for-invalid-movement-kicks.patch b/patches/server/0272-Add-more-logger-output-for-invalid-movement-kicks.patch similarity index 96% rename from patches/server/0273-Add-more-logger-output-for-invalid-movement-kicks.patch rename to patches/server/0272-Add-more-logger-output-for-invalid-movement-kicks.patch index 7ca924a8a..10a0d8c86 100644 --- a/patches/server/0273-Add-more-logger-output-for-invalid-movement-kicks.patch +++ b/patches/server/0272-Add-more-logger-output-for-invalid-movement-kicks.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add more logger output for invalid movement kicks diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 6ca00bc5da778f3f53f87ec539b8605c4f013e45..924c08489582444ae7b061c52eac91759c8f4484 100644 +index 6d9205e34d237811788d487469e5e60bf977a3e0..c5322ebd837c498056978840274e6a153cf3f56e 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -865,6 +865,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0274-Add-Bee-API.patch b/patches/server/0273-Add-Bee-API.patch similarity index 100% rename from patches/server/0274-Add-Bee-API.patch rename to patches/server/0273-Add-Bee-API.patch diff --git a/patches/server/0275-Debug-Marker-API.patch b/patches/server/0274-Debug-Marker-API.patch similarity index 98% rename from patches/server/0275-Debug-Marker-API.patch rename to patches/server/0274-Debug-Marker-API.patch index 81859ec2d..4508aec2a 100644 --- a/patches/server/0275-Debug-Marker-API.patch +++ b/patches/server/0274-Debug-Marker-API.patch @@ -99,7 +99,7 @@ index 4720939d138300ed410871e40d3d2800224a7987..f30c6e09adb3a6aa485357f859fc2a22 @Override diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index a4fd43722384b9b6dff269ff70ea545715a85ec2..16935f8df9446fbf9cde68dd4c7989d983e4d11d 100644 +index 71f86d2461f9f7f49435615c7fdb1724505e52a5..34adc4a82e44c8ecec7a2f21d1df920c80d6f074 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -3247,5 +3247,48 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0276-mob-spawning-option-to-ignore-creative-players.patch b/patches/server/0275-mob-spawning-option-to-ignore-creative-players.patch similarity index 100% rename from patches/server/0276-mob-spawning-option-to-ignore-creative-players.patch rename to patches/server/0275-mob-spawning-option-to-ignore-creative-players.patch diff --git a/patches/server/0277-Add-skeleton-bow-accuracy-option.patch b/patches/server/0276-Add-skeleton-bow-accuracy-option.patch similarity index 100% rename from patches/server/0277-Add-skeleton-bow-accuracy-option.patch rename to patches/server/0276-Add-skeleton-bow-accuracy-option.patch diff --git a/patches/server/0278-Allay-respect-item-NBT.patch b/patches/server/0277-Allay-respect-item-NBT.patch similarity index 100% rename from patches/server/0278-Allay-respect-item-NBT.patch rename to patches/server/0277-Allay-respect-item-NBT.patch diff --git a/patches/server/0279-Add-death-screen-API.patch b/patches/server/0278-Add-death-screen-API.patch similarity index 92% rename from patches/server/0279-Add-death-screen-API.patch rename to patches/server/0278-Add-death-screen-API.patch index 618d2b43c..814810f7e 100644 --- a/patches/server/0279-Add-death-screen-API.patch +++ b/patches/server/0278-Add-death-screen-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add death screen API diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 16935f8df9446fbf9cde68dd4c7989d983e4d11d..e21cd8c4015cd726bb10d51545d52c3010381848 100644 +index 34adc4a82e44c8ecec7a2f21d1df920c80d6f074..95bc2947ac44fa46f11c528da7f241ba410b7eb6 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -3290,5 +3290,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0280-Make-pufferfish-config-relocatable.patch b/patches/server/0279-Make-pufferfish-config-relocatable.patch similarity index 93% rename from patches/server/0280-Make-pufferfish-config-relocatable.patch rename to patches/server/0279-Make-pufferfish-config-relocatable.patch index 8e16d6d0f..2b053b41e 100644 --- a/patches/server/0280-Make-pufferfish-config-relocatable.patch +++ b/patches/server/0279-Make-pufferfish-config-relocatable.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Make pufferfish config relocatable diff --git a/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java -index 960c0555a001fe63de78d77d5ea47d08a520d029..b4e5fbace85c67e7bd347e6a90514bbc2c132d5e 100644 +index 219fc5bbe7dfade0b3576e6e1e7e60e361fdee0f..3e36958365bc136516bafbaad0c168f7956406f1 100644 --- a/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java +++ b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java @@ -28,6 +28,7 @@ public class PufferfishConfig { @@ -38,7 +38,7 @@ index fa258f1a15a93db0c3401397433b184938412a9b..41db72915baa4c02b11a701dfdde09b6 gg.pufferfish.pufferfish.PufferfishCommand.init(); // Pufferfish diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 20aed44f6d50ff279002259c05c84e7d15904142..5afc4c3f865a21f3a2799f3a1a690f01768d9b4a 100644 +index 6832f7990c4e6777b39dd5de60a207b324baaf00..0bc9b176a3b86a5b4153a2110621534c692d8240 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -179,6 +179,12 @@ public class Main { diff --git a/patches/server/0281-Implement-ram-and-rambar-commands.patch b/patches/server/0280-Implement-ram-and-rambar-commands.patch similarity index 99% rename from patches/server/0281-Implement-ram-and-rambar-commands.patch rename to patches/server/0280-Implement-ram-and-rambar-commands.patch index 56bf8c39b..6003827bf 100644 --- a/patches/server/0281-Implement-ram-and-rambar-commands.patch +++ b/patches/server/0280-Implement-ram-and-rambar-commands.patch @@ -61,7 +61,7 @@ index 3ab54ab8d0a5ccf1abaa53cf3ce5b25febcd184d..c9a8556d0aa832f05068c8e14343450d return this.tpsBar; } diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -index 9e87afb01e569e6d5c2846b931440c4ce395adae..4142820c3053d77d4ae7186fec968d624f893056 100644 +index b6128702e5d1f6633824cd1a2edfc8f9b477e8ea..14d7a9eca55160290644bbf840665a94441ca4b4 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -182,6 +182,8 @@ public class PurpurConfig { diff --git a/patches/server/0282-Add-item-packet-serialize-event.patch b/patches/server/0281-Add-item-packet-serialize-event.patch similarity index 97% rename from patches/server/0282-Add-item-packet-serialize-event.patch rename to patches/server/0281-Add-item-packet-serialize-event.patch index b0f2f5110..f665f56ae 100644 --- a/patches/server/0282-Add-item-packet-serialize-event.patch +++ b/patches/server/0281-Add-item-packet-serialize-event.patch @@ -48,7 +48,7 @@ index 5e4486c4b273b26afb82a97f914358b6a6c18229..6afdf37406d7dae04a7fec94e0c39d51 while (iterator.hasNext()) { ServerLevel worldserver = (ServerLevel) iterator.next(); diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 8aae0eed53b2c4a2f64884876eaf2ad59fc2249b..754063cc43d8adca0f70d76d8a75ec820c62cae6 100644 +index c5322ebd837c498056978840274e6a153cf3f56e..1c2824d48fc516e45a99821ee18e0246d31651a8 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -3458,6 +3458,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0284-Add-an-option-to-fix-MC-3304-projectile-looting.patch b/patches/server/0282-Add-an-option-to-fix-MC-3304-projectile-looting.patch similarity index 100% rename from patches/server/0284-Add-an-option-to-fix-MC-3304-projectile-looting.patch rename to patches/server/0282-Add-an-option-to-fix-MC-3304-projectile-looting.patch diff --git a/patches/server/0285-Configurable-block-blast-resistance.patch b/patches/server/0283-Configurable-block-blast-resistance.patch similarity index 100% rename from patches/server/0285-Configurable-block-blast-resistance.patch rename to patches/server/0283-Configurable-block-blast-resistance.patch diff --git a/patches/server/0283-Fix-MC-123848.patch b/patches/server/0283-Fix-MC-123848.patch deleted file mode 100644 index 7fc2bd212..000000000 --- a/patches/server/0283-Fix-MC-123848.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: BillyGalbreath -Date: Fri, 30 Sep 2022 16:56:07 -0500 -Subject: [PATCH] Fix MC-123848 - - -diff --git a/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java b/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java -index 19fa9b30768e1d3d095b5efdde1399d5ac7df821..d578541f0ecb146899acc09de992d481c14dbf7b 100644 ---- a/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java -+++ b/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java -@@ -293,6 +293,13 @@ public class ItemFrame extends HangingEntity { - } - } - -+ // Purpur start -+ @Nullable -+ public net.minecraft.world.entity.item.ItemEntity spawnAtLocation(ItemStack stack) { -+ return this.spawnAtLocation(stack, getDirection().equals(Direction.DOWN) ? -0.6F : 0.0F); -+ } -+ // Purpur end -+ - private void removeFramedMap(ItemStack itemstack) { - // Paper start - fix MC-252817 (green map markers do not disappear) - this.getFramedMapIdFromItem(itemstack).ifPresent((i) -> { diff --git a/patches/server/0286-Configurable-block-fall-damage-modifiers.patch b/patches/server/0284-Configurable-block-fall-damage-modifiers.patch similarity index 100% rename from patches/server/0286-Configurable-block-fall-damage-modifiers.patch rename to patches/server/0284-Configurable-block-fall-damage-modifiers.patch diff --git a/patches/server/0287-Language-API.patch b/patches/server/0285-Language-API.patch similarity index 100% rename from patches/server/0287-Language-API.patch rename to patches/server/0285-Language-API.patch diff --git a/patches/server/0288-Milk-Keeps-Beneficial-Effects.patch b/patches/server/0286-Milk-Keeps-Beneficial-Effects.patch similarity index 97% rename from patches/server/0288-Milk-Keeps-Beneficial-Effects.patch rename to patches/server/0286-Milk-Keeps-Beneficial-Effects.patch index 6e120cdbd..c9c9d7fd0 100644 --- a/patches/server/0288-Milk-Keeps-Beneficial-Effects.patch +++ b/patches/server/0286-Milk-Keeps-Beneficial-Effects.patch @@ -17,7 +17,7 @@ index 9012b5b918bca409166db9eb29c201a793886dbb..0b08cf7b26731ffd6f3909342f4e3a92 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 7fa248b2d1b73e20085f0d3cdfead38547e4e924..ecfb5d8b47c461ae661149f1c7b9bacee226c311 100644 +index 970b1f6eaeeddf9928ba61239248ecd2234eda9a..0e5fae26bf89749e446050c92dc7c23d788f5edb 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 diff --git a/patches/server/0289-MC-121706-Fix-mobs-not-looking-up-and-down-when-stra.patch b/patches/server/0287-MC-121706-Fix-mobs-not-looking-up-and-down-when-stra.patch similarity index 100% rename from patches/server/0289-MC-121706-Fix-mobs-not-looking-up-and-down-when-stra.patch rename to patches/server/0287-MC-121706-Fix-mobs-not-looking-up-and-down-when-stra.patch diff --git a/patches/server/0290-Add-log-suppression-for-LibraryLoader.patch b/patches/server/0288-Add-log-suppression-for-LibraryLoader.patch similarity index 100% rename from patches/server/0290-Add-log-suppression-for-LibraryLoader.patch rename to patches/server/0288-Add-log-suppression-for-LibraryLoader.patch diff --git a/patches/server/0291-Add-option-to-allow-creeper-to-encircle-target-when-.patch b/patches/server/0289-Add-option-to-allow-creeper-to-encircle-target-when-.patch similarity index 100% rename from patches/server/0291-Add-option-to-allow-creeper-to-encircle-target-when-.patch rename to patches/server/0289-Add-option-to-allow-creeper-to-encircle-target-when-.patch diff --git a/patches/server/0292-Fire-Immunity-API.patch b/patches/server/0290-Fire-Immunity-API.patch similarity index 97% rename from patches/server/0292-Fire-Immunity-API.patch rename to patches/server/0290-Fire-Immunity-API.patch index abc428b83..f0d9bc5b9 100644 --- a/patches/server/0292-Fire-Immunity-API.patch +++ b/patches/server/0290-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 24d87e62d9722a553944b8d9199209c3688ae865..f7561986a7cd2f8b66834b9bb57db12d111b6556 100644 +index 5cded930e23e881b2e02ed2456b1d7147fa63777..a406740705fae2d50eb7ed55cadc4bd1cbe6591c 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -417,6 +417,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0293-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch b/patches/server/0291-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch similarity index 96% rename from patches/server/0293-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch rename to patches/server/0291-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch index 2ac1b3282..3e09b407e 100644 --- a/patches/server/0293-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch +++ b/patches/server/0291-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 f7561986a7cd2f8b66834b9bb57db12d111b6556..32ec30d916380d2f9cfde35a2406cc3bb4da292d 100644 +index a406740705fae2d50eb7ed55cadc4bd1cbe6591c..8fe202c4b49324426568c18baf1461cf4fcd1cbc 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -938,6 +938,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0294-Added-got-ram-event.patch b/patches/server/0292-Added-got-ram-event.patch similarity index 100% rename from patches/server/0294-Added-got-ram-event.patch rename to patches/server/0292-Added-got-ram-event.patch diff --git a/patches/server/0295-Log-skipped-entity-s-position.patch b/patches/server/0293-Log-skipped-entity-s-position.patch similarity index 100% rename from patches/server/0295-Log-skipped-entity-s-position.patch rename to patches/server/0293-Log-skipped-entity-s-position.patch diff --git a/patches/server/0296-End-Crystal-Cramming.patch b/patches/server/0294-End-Crystal-Cramming.patch similarity index 96% rename from patches/server/0296-End-Crystal-Cramming.patch rename to patches/server/0294-End-Crystal-Cramming.patch index 6e96aff19..54809f4e0 100644 --- a/patches/server/0296-End-Crystal-Cramming.patch +++ b/patches/server/0294-End-Crystal-Cramming.patch @@ -5,7 +5,7 @@ Subject: [PATCH] End Crystal Cramming diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java -index ad0bf89f7aa3c71b683f8ade930a7b91df69b058..77ffceba328bb1d87ef755dd82b50d02ee120d4d 100644 +index 564d17bc460e2a04947ff9676fbf4c8b1569659c..440add62fcfa62d483409e1aecfc91591ba476c3 100644 --- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java +++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java @@ -99,6 +99,7 @@ public class EndCrystal extends Entity { diff --git a/patches/server/0297-Option-to-allow-beacon-effects-when-covered-by-tinte.patch b/patches/server/0295-Option-to-allow-beacon-effects-when-covered-by-tinte.patch similarity index 97% rename from patches/server/0297-Option-to-allow-beacon-effects-when-covered-by-tinte.patch rename to patches/server/0295-Option-to-allow-beacon-effects-when-covered-by-tinte.patch index 6d38cf63d..e1502eff5 100644 --- a/patches/server/0297-Option-to-allow-beacon-effects-when-covered-by-tinte.patch +++ b/patches/server/0295-Option-to-allow-beacon-effects-when-covered-by-tinte.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Option to allow beacon effects when covered by tinted glass diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java -index cc03c02f290ee8d58a2fea54b1f977f49a2cec6e..49a2308832b24dc1eb839af786dbec9f046bdab6 100644 +index 12578b377b6e939971fb2dcba08637df60643e37..2e6220c5a6c871401ce9734adfab710dcf86ad44 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java @@ -165,6 +165,7 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider, Name diff --git a/patches/server/0298-Add-attribute-clamping-and-armor-limit-config.patch b/patches/server/0296-Add-attribute-clamping-and-armor-limit-config.patch similarity index 100% rename from patches/server/0298-Add-attribute-clamping-and-armor-limit-config.patch rename to patches/server/0296-Add-attribute-clamping-and-armor-limit-config.patch diff --git a/patches/server/0299-Config-to-remove-explosion-radius-clamp.patch b/patches/server/0297-Config-to-remove-explosion-radius-clamp.patch similarity index 100% rename from patches/server/0299-Config-to-remove-explosion-radius-clamp.patch rename to patches/server/0297-Config-to-remove-explosion-radius-clamp.patch diff --git a/patches/server/0300-bonemealable-sugarcane-cactus-and-netherwart.patch b/patches/server/0298-bonemealable-sugarcane-cactus-and-netherwart.patch similarity index 100% rename from patches/server/0300-bonemealable-sugarcane-cactus-and-netherwart.patch rename to patches/server/0298-bonemealable-sugarcane-cactus-and-netherwart.patch diff --git a/patches/server/0301-Add-PreExplodeEvents.patch b/patches/server/0299-Add-PreExplodeEvents.patch similarity index 100% rename from patches/server/0301-Add-PreExplodeEvents.patch rename to patches/server/0299-Add-PreExplodeEvents.patch diff --git a/patches/server/0302-Improve-output-of-plugins-command.patch b/patches/server/0300-Improve-output-of-plugins-command.patch similarity index 100% rename from patches/server/0302-Improve-output-of-plugins-command.patch rename to patches/server/0300-Improve-output-of-plugins-command.patch diff --git a/patches/server/0303-Add-mending-multiplier.patch b/patches/server/0301-Add-mending-multiplier.patch similarity index 100% rename from patches/server/0303-Add-mending-multiplier.patch rename to patches/server/0301-Add-mending-multiplier.patch diff --git a/patches/server/0304-Make-GUI-Great-Again.patch b/patches/server/0302-Make-GUI-Great-Again.patch similarity index 100% rename from patches/server/0304-Make-GUI-Great-Again.patch rename to patches/server/0302-Make-GUI-Great-Again.patch diff --git a/patches/server/0305-Stored-Bee-API.patch b/patches/server/0303-Stored-Bee-API.patch similarity index 100% rename from patches/server/0305-Stored-Bee-API.patch rename to patches/server/0303-Stored-Bee-API.patch diff --git a/patches/server/0306-Shears-can-defuse-TNT.patch b/patches/server/0304-Shears-can-defuse-TNT.patch similarity index 100% rename from patches/server/0306-Shears-can-defuse-TNT.patch rename to patches/server/0304-Shears-can-defuse-TNT.patch diff --git a/patches/server/0307-Explorer-Map-API.patch b/patches/server/0305-Explorer-Map-API.patch similarity index 100% rename from patches/server/0307-Explorer-Map-API.patch rename to patches/server/0305-Explorer-Map-API.patch