diff --git a/gradle.properties b/gradle.properties index 0d4474f78..22af73ab1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group = org.purpurmc.purpur version = 1.21-R0.1-SNAPSHOT mcVersion = 1.21 -paperCommit = dd11ef84410f92af07f46adce198ef5078cb54b8 +paperCommit = d08e8d1afabcce6a40bab5863f2c297cd7ba8cfa org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/server/0001-Rebrand.patch b/patches/server/0001-Rebrand.patch index 6068c317d..629c8a6fa 100644 --- a/patches/server/0001-Rebrand.patch +++ b/patches/server/0001-Rebrand.patch @@ -241,10 +241,10 @@ index 4e56018b64d11f76c8da43fd8f85c6de72204e36..9607675e6c5bff2183c4420d11fc63ee @Override diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java -index e85b9bb3f9c225d289a4959921970b9963881199..c1e2d3a75b9d4710ab6d8b5c62af4bc136a2b668 100644 +index 2f4d6b56301195f8d39ed50dffe842464065bfe1..30ddb35140ae4a6faba98c191bb8eadbafc35377 100644 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java -@@ -503,7 +503,7 @@ public class CraftScheduler implements BukkitScheduler { +@@ -492,7 +492,7 @@ public class CraftScheduler implements BukkitScheduler { this.parsePending(); } else { // this.debugTail = this.debugTail.setNext(new CraftAsyncDebugger(currentTick + CraftScheduler.RECENT_TICKS, task.getOwner(), task.getTaskClass())); // Paper @@ -254,10 +254,10 @@ index e85b9bb3f9c225d289a4959921970b9963881199..c1e2d3a75b9d4710ab6d8b5c62af4bc1 // (async tasks must live with race-conditions if they attempt to cancel between these few lines of code) } diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index 3137391cadef7c67019561e65fedd0664e689eae..eb5ca67ebfd008a0fcc3ab3fc2452a27d7b0a9f8 100644 +index 28b3ad04e1f4b38ce21084864a59a2cd81b3992c..217f7383f6facb67b10e7725be0f8505e5e21a44 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -@@ -498,7 +498,7 @@ public final class CraftMagicNumbers implements UnsafeValues { +@@ -481,7 +481,7 @@ public final class CraftMagicNumbers implements UnsafeValues { @Override public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() { diff --git a/patches/server/0004-MC-Utils.patch b/patches/server/0004-MC-Utils.patch new file mode 100644 index 000000000..022fd8ea5 --- /dev/null +++ b/patches/server/0004-MC-Utils.patch @@ -0,0 +1,164 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Aikar +Date: Tue, 9 Jun 2020 03:17:25 -0400 +Subject: [PATCH] MC Utils + + +diff --git a/src/main/java/org/purpurmc/purpur/util/MinecraftInternalPlugin.java b/src/main/java/org/purpurmc/purpur/util/MinecraftInternalPlugin.java +new file mode 100644 +index 0000000000000000000000000000000000000000..129acb8ad139decc6b1c023cb10bc32dc91d64d1 +--- /dev/null ++++ b/src/main/java/org/purpurmc/purpur/util/MinecraftInternalPlugin.java +@@ -0,0 +1,152 @@ ++package org.purpurmc.purpur.util; ++ ++import org.bukkit.Server; ++import org.bukkit.command.Command; ++import org.bukkit.command.CommandSender; ++import org.bukkit.configuration.file.FileConfiguration; ++import org.bukkit.generator.BiomeProvider; ++import org.bukkit.generator.ChunkGenerator; ++import org.bukkit.plugin.PluginBase; ++import org.bukkit.plugin.PluginDescriptionFile; ++import org.bukkit.plugin.PluginLoader; ++import org.bukkit.plugin.PluginLogger; ++import org.jetbrains.annotations.NotNull; ++import org.jetbrains.annotations.Nullable; ++ ++import java.io.File; ++import java.io.InputStream; ++import java.util.List; ++ ++public class MinecraftInternalPlugin extends PluginBase { ++ private boolean enabled = true; ++ ++ private final String pluginName; ++ private PluginDescriptionFile pdf; ++ ++ public MinecraftInternalPlugin() { ++ this.pluginName = "Minecraft"; ++ pdf = new PluginDescriptionFile(pluginName, "1.0", "nms"); ++ } ++ ++ public void setEnabled(boolean enabled) { ++ this.enabled = enabled; ++ } ++ ++ @Override ++ public File getDataFolder() { ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ ++ @Override ++ public PluginDescriptionFile getDescription() { ++ return pdf; ++ } ++ // Paper start ++ @Override ++ public io.papermc.paper.plugin.configuration.PluginMeta getPluginMeta() { ++ return pdf; ++ } ++ // Paper end ++ ++ @Override ++ public FileConfiguration getConfig() { ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ ++ @Override ++ public InputStream getResource(String filename) { ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ ++ @Override ++ public void saveConfig() { ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ ++ @Override ++ public void saveDefaultConfig() { ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ ++ @Override ++ public void saveResource(String resourcePath, boolean replace) { ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ ++ @Override ++ public void reloadConfig() { ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ ++ @Override ++ public PluginLogger getLogger() { ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ ++ @Override ++ public PluginLoader getPluginLoader() { ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ ++ @Override ++ public Server getServer() { ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ ++ @Override ++ public boolean isEnabled() { ++ return enabled; ++ } ++ ++ @Override ++ public void onDisable() { ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ ++ @Override ++ public void onLoad() { ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ ++ @Override ++ public void onEnable() { ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ ++ @Override ++ public boolean isNaggable() { ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ ++ @Override ++ public void setNaggable(boolean canNag) { ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ ++ @Override ++ public ChunkGenerator getDefaultWorldGenerator(String worldName, String id) { ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ ++ @Override ++ public @Nullable BiomeProvider getDefaultBiomeProvider(@NotNull String worldName, @Nullable String id) { ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ ++ @Override ++ public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ ++ @Override ++ public List onTabComplete(CommandSender sender, Command command, String alias, String[] args) { ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ ++ // Paper start - lifecycle events ++ @Override ++ public @NotNull io.papermc.paper.plugin.lifecycle.event.LifecycleEventManager getLifecycleManager() { ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ // Paper end - lifecycle events ++} diff --git a/patches/server/0004-Fix-decompile-errors.patch b/patches/server/0005-Fix-decompile-errors.patch similarity index 100% rename from patches/server/0004-Fix-decompile-errors.patch rename to patches/server/0005-Fix-decompile-errors.patch diff --git a/patches/server/0005-Component-related-conveniences.patch b/patches/server/0006-Component-related-conveniences.patch similarity index 98% rename from patches/server/0005-Component-related-conveniences.patch rename to patches/server/0006-Component-related-conveniences.patch index 34dbeb222..25b89b01c 100644 --- a/patches/server/0005-Component-related-conveniences.patch +++ b/patches/server/0006-Component-related-conveniences.patch @@ -36,7 +36,7 @@ index ce09c4900aee5a75c0d13a7bffd97a0711ead774..37adf5d3c6248547d830248714f32dbe public void displayClientMessage(Component message, boolean overlay) { this.sendSystemMessage(message, overlay); diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index dfcaff15a145bf29e8a538d853bb04aec8c36179..939ddeb450e1f4a79fa3da69bcad44859fa826ee 100644 +index 43eeb8ce4bc350c2b524ade11ca25d8d4d21bea5..063ac25725543988332bdaf0c600e1f6c429943e 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -1017,6 +1017,20 @@ public abstract class PlayerList { diff --git a/patches/server/0006-Ridables.patch b/patches/server/0007-Ridables.patch similarity index 99% rename from patches/server/0006-Ridables.patch rename to patches/server/0007-Ridables.patch index d2ead0ac5..6d7ebf3de 100644 --- a/patches/server/0006-Ridables.patch +++ b/patches/server/0007-Ridables.patch @@ -22,10 +22,10 @@ index 2767d6f97e8b314d23a8e62f22dfd396f5660d31..a64e5997b94cc8173f0512d1e282355f super(x, y, z); } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 86f890280bfabac3b14b771ae67d28653ab2e3e8..7d552a3239a62428293a7c00124899f2b25b0b16 100644 +index 57e84cf2219d28c37e4c042371afddf585334954..b39afb48ff53ce70f94316cce3e1ad82327c6eb1 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1779,6 +1779,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop 0; // Paper - Add EntityMoveEvent net.minecraft.world.level.block.entity.HopperBlockEntity.skipHopperEvents = worldserver.paperConfig().hopper.disableMoveEvent || org.bukkit.event.inventory.InventoryMoveItemEvent.getHandlerList().getRegisteredListeners().length == 0; // Paper - Perf: Optimize Hoppers worldserver.updateLagCompensationTick(); // Paper - lag compensation @@ -259,7 +259,7 @@ index fe435d4a387bb28be6831cec0c8bb0a7c8b603a4..a387268659a17a4508359f2a69d50593 // Paper end - Add EntityMoveEvent if (!this.level().isClientSide && this.isSensitiveToWater() && this.isInWaterRainOrBubble()) { diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java -index 7b93c6a04cca2ac31d137f06ef83bb08559b10bf..091d2b1646068657120ee4244d79cbf7867a9cf7 100644 +index bd7c6ce15698aed70376c109ba36f52d6794a2f8..99b227dc5940ddc16d41b2e37c4683268b9e4112 100644 --- a/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java @@ -160,8 +160,8 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab @@ -273,7 +273,7 @@ index 7b93c6a04cca2ac31d137f06ef83bb08559b10bf..091d2b1646068657120ee4244d79cbf7 this.jumpControl = new JumpControl(this); this.bodyRotationControl = this.createBodyControl(); this.navigation = this.createNavigation(world); -@@ -1506,7 +1506,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab +@@ -1504,7 +1504,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab protected void onOffspringSpawnedFromEgg(Player player, Mob child) {} protected InteractionResult mobInteract(Player player, InteractionHand hand) { @@ -282,7 +282,7 @@ index 7b93c6a04cca2ac31d137f06ef83bb08559b10bf..091d2b1646068657120ee4244d79cbf7 } public boolean isWithinRestriction() { -@@ -1804,4 +1804,56 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab +@@ -1802,4 +1802,56 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab return itemmonsteregg == null ? null : new ItemStack(itemmonsteregg); } diff --git a/patches/server/0007-Configurable-entity-base-attributes.patch b/patches/server/0008-Configurable-entity-base-attributes.patch similarity index 100% rename from patches/server/0007-Configurable-entity-base-attributes.patch rename to patches/server/0008-Configurable-entity-base-attributes.patch diff --git a/patches/server/0008-Barrels-and-enderchests-6-rows.patch b/patches/server/0009-Barrels-and-enderchests-6-rows.patch similarity index 99% rename from patches/server/0008-Barrels-and-enderchests-6-rows.patch rename to patches/server/0009-Barrels-and-enderchests-6-rows.patch index 0abb9c8da..84e60ccd3 100644 --- a/patches/server/0008-Barrels-and-enderchests-6-rows.patch +++ b/patches/server/0009-Barrels-and-enderchests-6-rows.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Barrels and enderchests 6 rows diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 939ddeb450e1f4a79fa3da69bcad44859fa826ee..2738c73a5e0747fea711900a20d83b6c9fcfb90d 100644 +index 063ac25725543988332bdaf0c600e1f6c429943e..d52c598573d9ac470a39b5a6c47a2a6be3741a76 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -1142,6 +1142,27 @@ public abstract class PlayerList { diff --git a/patches/server/0009-Llama-API.patch b/patches/server/0010-Llama-API.patch similarity index 100% rename from patches/server/0009-Llama-API.patch rename to patches/server/0010-Llama-API.patch diff --git a/patches/server/0010-AFK-API.patch b/patches/server/0011-AFK-API.patch similarity index 100% rename from patches/server/0010-AFK-API.patch rename to patches/server/0011-AFK-API.patch diff --git a/patches/server/0011-Bring-back-server-name.patch b/patches/server/0012-Bring-back-server-name.patch similarity index 100% rename from patches/server/0011-Bring-back-server-name.patch rename to patches/server/0012-Bring-back-server-name.patch diff --git a/patches/server/0012-Configurable-server-mod-name.patch b/patches/server/0013-Configurable-server-mod-name.patch similarity index 91% rename from patches/server/0012-Configurable-server-mod-name.patch rename to patches/server/0013-Configurable-server-mod-name.patch index 0decdb4e1..feddbea43 100644 --- a/patches/server/0012-Configurable-server-mod-name.patch +++ b/patches/server/0013-Configurable-server-mod-name.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Configurable server mod name diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 7d552a3239a62428293a7c00124899f2b25b0b16..bb573e6aac01410c3e5972705aa260329ebe6ed5 100644 +index b39afb48ff53ce70f94316cce3e1ad82327c6eb1..1f5ecd8f8486463733b0fb8289e3d9254858c873 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1937,7 +1937,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop type, Level world) { -@@ -333,6 +334,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab +@@ -331,6 +332,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab entityliving = null; } } @@ -36,7 +36,7 @@ index 091d2b1646068657120ee4244d79cbf7867a9cf7..149d272775783aab243f0707ee11f702 this.target = entityliving; return true; // CraftBukkit end -@@ -375,8 +377,28 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab +@@ -373,8 +375,28 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab } this.level().getProfiler().pop(); @@ -65,7 +65,7 @@ index 091d2b1646068657120ee4244d79cbf7867a9cf7..149d272775783aab243f0707ee11f702 @Override protected void playHurtSound(DamageSource damageSource) { this.resetAmbientSoundTime(); -@@ -551,6 +573,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab +@@ -549,6 +571,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab } nbt.putBoolean("Bukkit.Aware", this.aware); // CraftBukkit @@ -73,7 +73,7 @@ index 091d2b1646068657120ee4244d79cbf7867a9cf7..149d272775783aab243f0707ee11f702 } @Override -@@ -628,6 +651,11 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab +@@ -626,6 +649,11 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab this.aware = nbt.getBoolean("Bukkit.Aware"); } // CraftBukkit end @@ -85,7 +85,7 @@ index 091d2b1646068657120ee4244d79cbf7867a9cf7..149d272775783aab243f0707ee11f702 } @Override -@@ -1745,6 +1773,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab +@@ -1743,6 +1771,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab this.playAttackSound(); } @@ -94,7 +94,7 @@ index 091d2b1646068657120ee4244d79cbf7867a9cf7..149d272775783aab243f0707ee11f702 } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index e0f1f5d59fd3cd9ebf23365db56cfb43f1d5f427..fd3a0e995deb66afeb2675460e12012b4b5649a6 100644 +index e1c2080ffd8be35c224e0e41a69b6a98c4b932dc..65b5ddde3496d1b04bedd410675a548f662aa073 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -124,6 +124,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0070-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch b/patches/server/0071-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch similarity index 100% rename from patches/server/0070-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch rename to patches/server/0071-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch diff --git a/patches/server/0071-Squid-EAR-immunity.patch b/patches/server/0072-Squid-EAR-immunity.patch similarity index 100% rename from patches/server/0071-Squid-EAR-immunity.patch rename to patches/server/0072-Squid-EAR-immunity.patch diff --git a/patches/server/0072-Phantoms-burn-in-light.patch b/patches/server/0073-Phantoms-burn-in-light.patch similarity index 100% rename from patches/server/0072-Phantoms-burn-in-light.patch rename to patches/server/0073-Phantoms-burn-in-light.patch diff --git a/patches/server/0073-Configurable-villager-breeding.patch b/patches/server/0074-Configurable-villager-breeding.patch similarity index 100% rename from patches/server/0073-Configurable-villager-breeding.patch rename to patches/server/0074-Configurable-villager-breeding.patch diff --git a/patches/server/0074-Redstone-deactivates-spawners.patch b/patches/server/0075-Redstone-deactivates-spawners.patch similarity index 94% rename from patches/server/0074-Redstone-deactivates-spawners.patch rename to patches/server/0075-Redstone-deactivates-spawners.patch index 87784fac7..825da468f 100644 --- a/patches/server/0074-Redstone-deactivates-spawners.patch +++ b/patches/server/0075-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 a1e0ffd2ed576b9f988d64467a210cb869b5bdc7..5053c57bfc39bcc5b383795fe6e85dc9e5d1e421 100644 +index 4172de8958c5216eeca7535de3be97515d32337e..41e07eec0ba1cc2e31b967fdc616e59f7cd76b28 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -351,6 +351,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0075-Totems-work-in-inventory.patch b/patches/server/0076-Totems-work-in-inventory.patch similarity index 96% rename from patches/server/0075-Totems-work-in-inventory.patch rename to patches/server/0076-Totems-work-in-inventory.patch index c23ab1263..867c89e2f 100644 --- a/patches/server/0075-Totems-work-in-inventory.patch +++ b/patches/server/0076-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 24d738cf82dc57819064319ad3a9d892167665cc..25915e9e24fc370dac496b7eae6d2f5ac2a0c4c6 100644 +index 1bb7f2aed9b23d5738140d236c140f9c508bc748..609260d43c42d9978f5e849b4dd7191fd21a6c32 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1667,6 +1667,18 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0076-Add-vindicator-johnny-spawn-chance.patch b/patches/server/0077-Add-vindicator-johnny-spawn-chance.patch similarity index 100% rename from patches/server/0076-Add-vindicator-johnny-spawn-chance.patch rename to patches/server/0077-Add-vindicator-johnny-spawn-chance.patch diff --git a/patches/server/0077-Dispensers-place-anvils-option.patch b/patches/server/0078-Dispensers-place-anvils-option.patch similarity index 92% rename from patches/server/0077-Dispensers-place-anvils-option.patch rename to patches/server/0078-Dispensers-place-anvils-option.patch index ca90cdbd5..997ef980a 100644 --- a/patches/server/0077-Dispensers-place-anvils-option.patch +++ b/patches/server/0078-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 7bf250bba4179a506c0a39b7866a9389552d2905..6548e595ab5c06044be438bc7eac181f413c261a 100644 +index 60d3319016beb4f60cbc26dde165f64cf7577602..bd07743817f2510c179614a6215434e7b333824a 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 7bf250bba4179a506c0a39b7866a9389552d2905..6548e595ab5c06044be438bc7eac181f } } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index a283b0afaccaebb27216c241abff97fcf8998ded..00d34e58bcc03d6d342261a637bc5ef23a4be769 100644 +index cf75f01c719ad6d3bfef73314c31c51c200fc4aa..b11f86ad33df553b598e859e110ab6d6abf1f744 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -314,8 +314,10 @@ public class PurpurWorldConfig { diff --git a/patches/server/0078-Allow-anvil-colors.patch b/patches/server/0079-Allow-anvil-colors.patch similarity index 98% rename from patches/server/0078-Allow-anvil-colors.patch rename to patches/server/0079-Allow-anvil-colors.patch index 9c89cc9fd..e5d50b4b5 100644 --- a/patches/server/0078-Allow-anvil-colors.patch +++ b/patches/server/0079-Allow-anvil-colors.patch @@ -64,7 +64,7 @@ index 99bfa7cdc58c690d6f0c742dafedd40cace3223f..2d300905c05c7c23a4da30b3651b3313 } } 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 00d34e58bcc03d6d342261a637bc5ef23a4be769..bf02442138f8b7773d52ece4369cb888b4d8f073 100644 +index b11f86ad33df553b598e859e110ab6d6abf1f744..91536c5280330a9a2beccf1bee59ad071736b57e 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -292,6 +292,13 @@ public class PurpurWorldConfig { diff --git a/patches/server/0079-Add-option-to-disable-dolphin-treasure-searching.patch b/patches/server/0080-Add-option-to-disable-dolphin-treasure-searching.patch similarity index 100% rename from patches/server/0079-Add-option-to-disable-dolphin-treasure-searching.patch rename to patches/server/0080-Add-option-to-disable-dolphin-treasure-searching.patch diff --git a/patches/server/0080-Short-enderman-height.patch b/patches/server/0081-Short-enderman-height.patch similarity index 100% rename from patches/server/0080-Short-enderman-height.patch rename to patches/server/0081-Short-enderman-height.patch diff --git a/patches/server/0081-Stop-squids-floating-on-top-of-water.patch b/patches/server/0082-Stop-squids-floating-on-top-of-water.patch similarity index 97% rename from patches/server/0081-Stop-squids-floating-on-top-of-water.patch rename to patches/server/0082-Stop-squids-floating-on-top-of-water.patch index 92aa9b5a8..7b842c1ad 100644 --- a/patches/server/0081-Stop-squids-floating-on-top-of-water.patch +++ b/patches/server/0082-Stop-squids-floating-on-top-of-water.patch @@ -5,7 +5,7 @@ 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 817514ca87027e83aa19010acbb877ab36f295ee..38e3c3051b971f7f0350012bb6d46d2e9bc06da2 100644 +index 88fd465aa3e448e36fe519f8f882d2d3225d679f..ffb83e96b070179467ddedbe7d24752752fffbeb 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -4483,6 +4483,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0082-Crying-obsidian-valid-for-portal-frames.patch b/patches/server/0083-Crying-obsidian-valid-for-portal-frames.patch similarity index 100% rename from patches/server/0082-Crying-obsidian-valid-for-portal-frames.patch rename to patches/server/0083-Crying-obsidian-valid-for-portal-frames.patch diff --git a/patches/server/0083-Customizable-wither-health-and-healing.patch b/patches/server/0084-Customizable-wither-health-and-healing.patch similarity index 100% rename from patches/server/0083-Customizable-wither-health-and-healing.patch rename to patches/server/0084-Customizable-wither-health-and-healing.patch diff --git a/patches/server/0084-Allow-toggling-special-MobSpawners-per-world.patch b/patches/server/0085-Allow-toggling-special-MobSpawners-per-world.patch similarity index 100% rename from patches/server/0084-Allow-toggling-special-MobSpawners-per-world.patch rename to patches/server/0085-Allow-toggling-special-MobSpawners-per-world.patch diff --git a/patches/server/0085-Raid-cooldown-setting.patch b/patches/server/0086-Raid-cooldown-setting.patch similarity index 97% rename from patches/server/0085-Raid-cooldown-setting.patch rename to patches/server/0086-Raid-cooldown-setting.patch index dafe49f95..4acab0a44 100644 --- a/patches/server/0085-Raid-cooldown-setting.patch +++ b/patches/server/0086-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 e2ff691f4d237af59710151754601eed24f49598..7ba5886008c55d651aa11c379e1b77e1fc34125c 100644 +index e43e5facf44978994c8a515a20906dc8fbf8b9b8..092b8854470cb034205f2cf708186d559be5d609 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -109,6 +109,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0086-Despawn-rate-config-options-per-projectile-type.patch b/patches/server/0087-Despawn-rate-config-options-per-projectile-type.patch similarity index 96% rename from patches/server/0086-Despawn-rate-config-options-per-projectile-type.patch rename to patches/server/0087-Despawn-rate-config-options-per-projectile-type.patch index fccb7987f..4dc8395c2 100644 --- a/patches/server/0086-Despawn-rate-config-options-per-projectile-type.patch +++ b/patches/server/0087-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 7ba5886008c55d651aa11c379e1b77e1fc34125c..bec89f977d8c40973b4aa1313c4f7f6b5880ac9f 100644 +index 092b8854470cb034205f2cf708186d559be5d609..6cda920dca61ce781ecfb4b49da31e7c297d3b39 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -315,6 +315,40 @@ public class PurpurWorldConfig { diff --git a/patches/server/0087-Add-option-to-disable-zombie-aggressiveness-towards-.patch b/patches/server/0088-Add-option-to-disable-zombie-aggressiveness-towards-.patch similarity index 100% rename from patches/server/0087-Add-option-to-disable-zombie-aggressiveness-towards-.patch rename to patches/server/0088-Add-option-to-disable-zombie-aggressiveness-towards-.patch diff --git a/patches/server/0088-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch b/patches/server/0089-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch similarity index 100% rename from patches/server/0088-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch rename to patches/server/0089-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch diff --git a/patches/server/0089-Flying-squids-Oh-my.patch b/patches/server/0090-Flying-squids-Oh-my.patch similarity index 100% rename from patches/server/0089-Flying-squids-Oh-my.patch rename to patches/server/0090-Flying-squids-Oh-my.patch diff --git a/patches/server/0090-Infinity-bow-settings.patch b/patches/server/0091-Infinity-bow-settings.patch similarity index 100% rename from patches/server/0090-Infinity-bow-settings.patch rename to patches/server/0091-Infinity-bow-settings.patch diff --git a/patches/server/0091-Configurable-daylight-cycle.patch b/patches/server/0092-Configurable-daylight-cycle.patch similarity index 97% rename from patches/server/0091-Configurable-daylight-cycle.patch rename to patches/server/0092-Configurable-daylight-cycle.patch index 7c24abd63..ecdd97cc4 100644 --- a/patches/server/0091-Configurable-daylight-cycle.patch +++ b/patches/server/0092-Configurable-daylight-cycle.patch @@ -18,10 +18,10 @@ index 76ef195a5074006b009acd9cc1744667c6aecbb9..659577549e132754281df76a7a1bfd88 public ClientboundSetTimePacket(long time, long timeOfDay, boolean doDaylightCycle) { this.gameTime = time; diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index d22f6854a9142b682be3b5bb3ff58228f6457664..5b92d2b80bbbff7b1a2c8ba2c59c16ca8396de73 100644 +index a08be48afd408b0976e8813071e0e28433512657..729450af7818fd084d6d224b58f2a3834922245b 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1771,7 +1771,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop 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 8c644fb65c9ca56a5c9a24945f4d43b117cd02f2..b97edda4c703889a90b6a58ecd3d3034854f76ec 100644 +index fde8c013bb398f924d8c6a7fbfabf276f0a96936..95e79149153de9328c40934a064d2a5a2d25e2d4 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -401,6 +401,17 @@ public class PurpurWorldConfig { diff --git a/patches/server/0093-Arrows-should-not-reset-despawn-counter.patch b/patches/server/0094-Arrows-should-not-reset-despawn-counter.patch similarity index 95% rename from patches/server/0093-Arrows-should-not-reset-despawn-counter.patch rename to patches/server/0094-Arrows-should-not-reset-despawn-counter.patch index ac078be78..72dd614bf 100644 --- a/patches/server/0093-Arrows-should-not-reset-despawn-counter.patch +++ b/patches/server/0094-Arrows-should-not-reset-despawn-counter.patch @@ -20,7 +20,7 @@ index ddf47dab1ab92c45e3eea09239d418a9798ed59e..8d8944a0455b3401d84cab636d61447e @Override diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index b97edda4c703889a90b6a58ecd3d3034854f76ec..40a67af5af896e4427f5092998cd07b4b36e6159 100644 +index 95e79149153de9328c40934a064d2a5a2d25e2d4..1bfbc2cba2b81d2e2aef50c32dc1eb590afc5f1e 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -102,6 +102,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0094-Ability-to-re-add-farmland-mechanics-from-Alpha.patch b/patches/server/0095-Ability-to-re-add-farmland-mechanics-from-Alpha.patch similarity index 95% rename from patches/server/0094-Ability-to-re-add-farmland-mechanics-from-Alpha.patch rename to patches/server/0095-Ability-to-re-add-farmland-mechanics-from-Alpha.patch index 5d5789314..15c277b3c 100644 --- a/patches/server/0094-Ability-to-re-add-farmland-mechanics-from-Alpha.patch +++ b/patches/server/0095-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 40a67af5af896e4427f5092998cd07b4b36e6159..56ebfaf5e523fe0ef70c2950f2efac12829e0cf2 100644 +index 1bfbc2cba2b81d2e2aef50c32dc1eb590afc5f1e..3a3f096f5edb65d854f81d96100bdf133647916c 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -402,8 +402,10 @@ public class PurpurWorldConfig { diff --git a/patches/server/0095-Add-adjustable-breeding-cooldown-to-config.patch b/patches/server/0096-Add-adjustable-breeding-cooldown-to-config.patch similarity index 98% rename from patches/server/0095-Add-adjustable-breeding-cooldown-to-config.patch rename to patches/server/0096-Add-adjustable-breeding-cooldown-to-config.patch index 28da796f6..dcf26343d 100644 --- a/patches/server/0095-Add-adjustable-breeding-cooldown-to-config.patch +++ b/patches/server/0096-Add-adjustable-breeding-cooldown-to-config.patch @@ -42,7 +42,7 @@ index 1808e1b01afa3041a54c9c9a7586d4d61960527a..5b523f3fa323378a8f96f58a9e252d2e EntityBreedEvent entityBreedEvent = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityBreedEvent(entityageable, this, other, breeder, this.breedItem, experience); if (entityBreedEvent.isCancelled()) { diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index d931bde93f29b01e3743833a2520685e5e88dba9..32cc7311559b2613269e347c73a1e000ff40f686 100644 +index a922bb0c65e4cee8cb693eb6e48ecaa26bdf7e71..10df967d7694c5806453bb4abbb14deab16e116d 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -182,6 +182,49 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl diff --git a/patches/server/0096-Make-entity-breeding-times-configurable.patch b/patches/server/0097-Make-entity-breeding-times-configurable.patch similarity index 99% rename from patches/server/0096-Make-entity-breeding-times-configurable.patch rename to patches/server/0097-Make-entity-breeding-times-configurable.patch index e56b9bdab..0875fc114 100644 --- a/patches/server/0096-Make-entity-breeding-times-configurable.patch +++ b/patches/server/0097-Make-entity-breeding-times-configurable.patch @@ -284,7 +284,7 @@ index 41d47141bfd77b17cbf163bffdfeb002135035ca..8f02a1b39db0581efb8ccd2c889f048b this.entityData.set(Turtle.HOME_POS, pos); } diff --git a/src/main/java/net/minecraft/world/entity/animal/Wolf.java b/src/main/java/net/minecraft/world/entity/animal/Wolf.java -index 133aa48278ca51c74b5eb8900202e7076119e445..0e862d4f044683ec46c32929310641af5c1cc2d0 100644 +index 2985a7bcd4153798c347efa086120ed841770774..0647cee2d6a7c847ab923f819a092c9004eabc6c 100644 --- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java +++ b/src/main/java/net/minecraft/world/entity/animal/Wolf.java @@ -155,6 +155,11 @@ public class Wolf extends TamableAnimal implements NeutralMob, VariantHolder bossbars = new HashMap<>(); diff --git a/patches/server/0112-Striders-give-saddle-back.patch b/patches/server/0113-Striders-give-saddle-back.patch similarity index 100% rename from patches/server/0112-Striders-give-saddle-back.patch rename to patches/server/0113-Striders-give-saddle-back.patch diff --git a/patches/server/0113-PlayerBookTooLargeEvent.patch b/patches/server/0114-PlayerBookTooLargeEvent.patch similarity index 100% rename from patches/server/0113-PlayerBookTooLargeEvent.patch rename to patches/server/0114-PlayerBookTooLargeEvent.patch diff --git a/patches/server/0114-Full-netherite-armor-grants-fire-resistance.patch b/patches/server/0115-Full-netherite-armor-grants-fire-resistance.patch similarity index 100% rename from patches/server/0114-Full-netherite-armor-grants-fire-resistance.patch rename to patches/server/0115-Full-netherite-armor-grants-fire-resistance.patch diff --git a/patches/server/0115-Add-mobGriefing-bypass-to-everything-affected.patch b/patches/server/0116-Add-mobGriefing-bypass-to-everything-affected.patch similarity index 99% rename from patches/server/0115-Add-mobGriefing-bypass-to-everything-affected.patch rename to patches/server/0116-Add-mobGriefing-bypass-to-everything-affected.patch index 8789d3f19..1c17d4448 100644 --- a/patches/server/0115-Add-mobGriefing-bypass-to-everything-affected.patch +++ b/patches/server/0116-Add-mobGriefing-bypass-to-everything-affected.patch @@ -18,10 +18,10 @@ index 609260d43c42d9978f5e849b4dd7191fd21a6c32..b07d0fc6cbcf209f5c69f4b43011d3f7 BlockState iblockdata = Blocks.WITHER_ROSE.defaultBlockState(); diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java -index 8103f13155ad66bbd077a38ae4697ad14036b6a5..8b2dd71177b011c2a31e4959ca16057ad5288b22 100644 +index 4bcd6dc324b49165ae4ad6ab93e46ecd5445557b..d5c2b878abe44ee6fe856771c97759b2d0e51681 100644 --- a/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java -@@ -707,7 +707,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab +@@ -705,7 +705,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab public void aiStep() { super.aiStep(); this.level().getProfiler().push("looting"); diff --git a/patches/server/0116-Config-to-allow-Note-Block-sounds-when-blocked.patch b/patches/server/0117-Config-to-allow-Note-Block-sounds-when-blocked.patch similarity index 97% rename from patches/server/0116-Config-to-allow-Note-Block-sounds-when-blocked.patch rename to patches/server/0117-Config-to-allow-Note-Block-sounds-when-blocked.patch index 7c55621f8..2800db08e 100644 --- a/patches/server/0116-Config-to-allow-Note-Block-sounds-when-blocked.patch +++ b/patches/server/0117-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 aae7ee1641e4b1aa08bf2e018e4b7f6558bff513..6b691fef240a3eefa59f82dacbd0bc80cf0e350d 100644 +index 3d6b6f262aaf354b57973db247c73fdcca3488cf..489beb355db7ea1119470164c987408e9c34a60f 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -118,6 +118,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0117-Add-EntityTeleportHinderedEvent.patch b/patches/server/0118-Add-EntityTeleportHinderedEvent.patch similarity index 99% rename from patches/server/0117-Add-EntityTeleportHinderedEvent.patch rename to patches/server/0118-Add-EntityTeleportHinderedEvent.patch index 51b801fef..3eff09156 100644 --- a/patches/server/0117-Add-EntityTeleportHinderedEvent.patch +++ b/patches/server/0118-Add-EntityTeleportHinderedEvent.patch @@ -83,7 +83,7 @@ index 84479dad6078a2a12e6b977185bdbbe7f6b36576..4be205b10229b238039e4221df043e47 } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 745e57d58966dbe60b2301818c23d25eecdb6dc2..33425cdcde10f6446f059b290d4c372debcb9c0b 100644 +index 1faf1c4b777333030d164e277ee3552900f10cd3..c24aaffc141d8d75c18ae9a1dc35579f6d812a9e 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1436,6 +1436,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0118-Farmland-trampling-changes.patch b/patches/server/0119-Farmland-trampling-changes.patch similarity index 100% rename from patches/server/0118-Farmland-trampling-changes.patch rename to patches/server/0119-Farmland-trampling-changes.patch diff --git a/patches/server/0119-Movement-options-for-armor-stands.patch b/patches/server/0120-Movement-options-for-armor-stands.patch similarity index 98% rename from patches/server/0119-Movement-options-for-armor-stands.patch rename to patches/server/0120-Movement-options-for-armor-stands.patch index 47ff76bab..74afb5e6f 100644 --- a/patches/server/0119-Movement-options-for-armor-stands.patch +++ b/patches/server/0120-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 38e3c3051b971f7f0350012bb6d46d2e9bc06da2..2380f061033fb5bae99effe44f519570c60bd36b 100644 +index ffb83e96b070179467ddedbe7d24752752fffbeb..1731853a58788a5e9c036c4158503b00e3d0a7ca 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1926,7 +1926,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0120-Fix-stuck-in-portals.patch b/patches/server/0121-Fix-stuck-in-portals.patch similarity index 100% rename from patches/server/0120-Fix-stuck-in-portals.patch rename to patches/server/0121-Fix-stuck-in-portals.patch diff --git a/patches/server/0121-Toggle-for-water-sensitive-mob-damage.patch b/patches/server/0122-Toggle-for-water-sensitive-mob-damage.patch similarity index 100% rename from patches/server/0121-Toggle-for-water-sensitive-mob-damage.patch rename to patches/server/0122-Toggle-for-water-sensitive-mob-damage.patch diff --git a/patches/server/0122-Config-to-always-tame-in-Creative.patch b/patches/server/0123-Config-to-always-tame-in-Creative.patch similarity index 100% rename from patches/server/0122-Config-to-always-tame-in-Creative.patch rename to patches/server/0123-Config-to-always-tame-in-Creative.patch diff --git a/patches/server/0123-End-crystal-explosion-options.patch b/patches/server/0124-End-crystal-explosion-options.patch similarity index 100% rename from patches/server/0123-End-crystal-explosion-options.patch rename to patches/server/0124-End-crystal-explosion-options.patch diff --git a/patches/server/0124-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch b/patches/server/0125-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch similarity index 100% rename from patches/server/0124-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch rename to patches/server/0125-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch diff --git a/patches/server/0125-Dont-run-with-scissors.patch b/patches/server/0126-Dont-run-with-scissors.patch similarity index 100% rename from patches/server/0125-Dont-run-with-scissors.patch rename to patches/server/0126-Dont-run-with-scissors.patch diff --git a/patches/server/0126-One-Punch-Man.patch b/patches/server/0127-One-Punch-Man.patch similarity index 100% rename from patches/server/0126-One-Punch-Man.patch rename to patches/server/0127-One-Punch-Man.patch diff --git a/patches/server/0127-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch b/patches/server/0128-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch similarity index 100% rename from patches/server/0127-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch rename to patches/server/0128-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch diff --git a/patches/server/0128-Config-to-ignore-nearby-mobs-when-sleeping.patch b/patches/server/0129-Config-to-ignore-nearby-mobs-when-sleeping.patch similarity index 100% rename from patches/server/0128-Config-to-ignore-nearby-mobs-when-sleeping.patch rename to patches/server/0129-Config-to-ignore-nearby-mobs-when-sleeping.patch diff --git a/patches/server/0129-Add-back-player-spawned-endermite-API.patch b/patches/server/0130-Add-back-player-spawned-endermite-API.patch similarity index 100% rename from patches/server/0129-Add-back-player-spawned-endermite-API.patch rename to patches/server/0130-Add-back-player-spawned-endermite-API.patch diff --git a/patches/server/0130-Config-Enderman-aggressiveness-towards-Endermites.patch b/patches/server/0131-Config-Enderman-aggressiveness-towards-Endermites.patch similarity index 100% rename from patches/server/0130-Config-Enderman-aggressiveness-towards-Endermites.patch rename to patches/server/0131-Config-Enderman-aggressiveness-towards-Endermites.patch diff --git a/patches/server/0131-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch b/patches/server/0132-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch similarity index 100% rename from patches/server/0131-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch rename to patches/server/0132-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch diff --git a/patches/server/0132-Tick-fluids-config.patch b/patches/server/0133-Tick-fluids-config.patch similarity index 100% rename from patches/server/0132-Tick-fluids-config.patch rename to patches/server/0133-Tick-fluids-config.patch diff --git a/patches/server/0133-Config-to-disable-Llama-caravans.patch b/patches/server/0134-Config-to-disable-Llama-caravans.patch similarity index 100% rename from patches/server/0133-Config-to-disable-Llama-caravans.patch rename to patches/server/0134-Config-to-disable-Llama-caravans.patch diff --git a/patches/server/0134-Config-to-make-Creepers-explode-on-death.patch b/patches/server/0135-Config-to-make-Creepers-explode-on-death.patch similarity index 97% rename from patches/server/0134-Config-to-make-Creepers-explode-on-death.patch rename to patches/server/0135-Config-to-make-Creepers-explode-on-death.patch index e042f1c6f..60e756c4e 100644 --- a/patches/server/0134-Config-to-make-Creepers-explode-on-death.patch +++ b/patches/server/0135-Config-to-make-Creepers-explode-on-death.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Config to make Creepers explode on death Creepers exploded after being killed in the alpha days. This brings that back. diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java -index 798d00aae04ba48ca0bbd70ccf3b3e91180d97b4..e9eeddf5c39d66535163e67f41dbc9ac98643742 100644 +index 1ce1cf48624d8273dccc571ee37a08c06951acad..902191001a7302872ff661564fb6389457abaa9c 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java +++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java @@ -66,6 +66,7 @@ public class Creeper extends Monster implements PowerableMob { diff --git a/patches/server/0135-Configurable-ravager-griefable-blocks-list.patch b/patches/server/0136-Configurable-ravager-griefable-blocks-list.patch similarity index 100% rename from patches/server/0135-Configurable-ravager-griefable-blocks-list.patch rename to patches/server/0136-Configurable-ravager-griefable-blocks-list.patch diff --git a/patches/server/0136-Sneak-to-bulk-process-composter.patch b/patches/server/0137-Sneak-to-bulk-process-composter.patch similarity index 98% rename from patches/server/0136-Sneak-to-bulk-process-composter.patch rename to patches/server/0137-Sneak-to-bulk-process-composter.patch index e7a10d25d..eab7d94ce 100644 --- a/patches/server/0136-Sneak-to-bulk-process-composter.patch +++ b/patches/server/0137-Sneak-to-bulk-process-composter.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Sneak to bulk process composter diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java -index 24b1715397ba8e6f5e9841a030d0e3d964356f89..1ab35b3123c25a80706e6557b4152279bfe8f50f 100644 +index cc01ead133cc6859ca5d7a1d0ac3c12955e590da..9c035bfd8c75561886d5ff63f1df4acca6f71595 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java @@ -578,7 +578,7 @@ public class ServerPlayerGameMode { diff --git a/patches/server/0137-Config-for-skipping-night.patch b/patches/server/0138-Config-for-skipping-night.patch similarity index 100% rename from patches/server/0137-Config-for-skipping-night.patch rename to patches/server/0138-Config-for-skipping-night.patch diff --git a/patches/server/0138-Add-config-for-villager-trading.patch b/patches/server/0139-Add-config-for-villager-trading.patch similarity index 100% rename from patches/server/0138-Add-config-for-villager-trading.patch rename to patches/server/0139-Add-config-for-villager-trading.patch diff --git a/patches/server/0139-Drowning-Settings.patch b/patches/server/0140-Drowning-Settings.patch similarity index 97% rename from patches/server/0139-Drowning-Settings.patch rename to patches/server/0140-Drowning-Settings.patch index 8bb23aa06..192dac695 100644 --- a/patches/server/0139-Drowning-Settings.patch +++ b/patches/server/0140-Drowning-Settings.patch @@ -5,7 +5,7 @@ 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 c773613e5c19c1f141e0c4eef7fc96019508e04a..40d8611ecffd2a293192ecacf2e72ba83ae22318 100644 +index 13c3f64cc1740a2f9f726e32eaf60989bcf9eb2a..3993769068556926eb30e32d90204ceb4287119d 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -3482,7 +3482,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0140-Break-individual-slabs-when-sneaking.patch b/patches/server/0141-Break-individual-slabs-when-sneaking.patch similarity index 97% rename from patches/server/0140-Break-individual-slabs-when-sneaking.patch rename to patches/server/0141-Break-individual-slabs-when-sneaking.patch index 4b283283a..b0c5aa9b2 100644 --- a/patches/server/0140-Break-individual-slabs-when-sneaking.patch +++ b/patches/server/0141-Break-individual-slabs-when-sneaking.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Break individual slabs when sneaking diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java -index 1ab35b3123c25a80706e6557b4152279bfe8f50f..7e96d06e498ee8a5b3f237e70516552d0cf24388 100644 +index 9c035bfd8c75561886d5ff63f1df4acca6f71595..fe734df8b4521101c3e55c042957a531b3bdf945 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java @@ -405,6 +405,7 @@ public class ServerPlayerGameMode { diff --git a/patches/server/0141-Config-to-disable-hostile-mob-spawn-on-ice.patch b/patches/server/0142-Config-to-disable-hostile-mob-spawn-on-ice.patch similarity index 93% rename from patches/server/0141-Config-to-disable-hostile-mob-spawn-on-ice.patch rename to patches/server/0142-Config-to-disable-hostile-mob-spawn-on-ice.patch index 009e56c50..bf9b9ed8f 100644 --- a/patches/server/0141-Config-to-disable-hostile-mob-spawn-on-ice.patch +++ b/patches/server/0142-Config-to-disable-hostile-mob-spawn-on-ice.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Config to disable hostile mob spawn on ice diff --git a/src/main/java/net/minecraft/world/entity/monster/Monster.java b/src/main/java/net/minecraft/world/entity/monster/Monster.java -index 759839e912c54598b257ad738481364940f88a18..e60e6b3e5ae5a468cfe649ed2222412f3bc8b268 100644 +index e7bfce0534c7ef3a1480a1082ae8514caf78778b..6511b8c737a57fbc72122dd04e2b544987a49b92 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Monster.java +++ b/src/main/java/net/minecraft/world/entity/monster/Monster.java -@@ -88,6 +88,14 @@ public abstract class Monster extends PathfinderMob implements Enemy { +@@ -87,6 +87,14 @@ public abstract class Monster extends PathfinderMob implements Enemy { } public static boolean isDarkEnoughToSpawn(ServerLevelAccessor world, BlockPos pos, RandomSource random) { diff --git a/patches/server/0142-Config-to-show-Armor-Stand-arms-on-spawn.patch b/patches/server/0143-Config-to-show-Armor-Stand-arms-on-spawn.patch similarity index 92% rename from patches/server/0142-Config-to-show-Armor-Stand-arms-on-spawn.patch rename to patches/server/0143-Config-to-show-Armor-Stand-arms-on-spawn.patch index d9ad755e4..73a84faff 100644 --- a/patches/server/0142-Config-to-show-Armor-Stand-arms-on-spawn.patch +++ b/patches/server/0143-Config-to-show-Armor-Stand-arms-on-spawn.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Config to show Armor Stand arms on spawn diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java -index ea3cad6c9cc561b225cd41f04bd204c99ecd66ec..ad1ec2578fa428baa6b172c44b6c17e52daa5792 100644 +index 7180d65afee6216a0bc6ff2dc7888f64b9b6c22d..c0383771b08e1d89dfa4996b979248da1de8aca1 100644 --- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java +++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java @@ -116,6 +116,7 @@ public class ArmorStand extends LivingEntity { @@ -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 f11fabfe8861b5c602093b4ce051c6aa15796041..2eab0c6ab2a74e141f1e5e6062a2c66f72d35389 100644 +index 92b722c01699f5889da25b7e2ac31862b6df956f..f72e3c436911acc9b91f61e0ef4cc36c0dc0cb54 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -103,6 +103,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0143-Option-to-make-doors-require-redstone.patch b/patches/server/0144-Option-to-make-doors-require-redstone.patch similarity index 100% rename from patches/server/0143-Option-to-make-doors-require-redstone.patch rename to patches/server/0144-Option-to-make-doors-require-redstone.patch diff --git a/patches/server/0144-Config-to-allow-unsafe-enchants.patch b/patches/server/0145-Config-to-allow-unsafe-enchants.patch similarity index 100% rename from patches/server/0144-Config-to-allow-unsafe-enchants.patch rename to patches/server/0145-Config-to-allow-unsafe-enchants.patch diff --git a/patches/server/0145-Configurable-sponge-absorption.patch b/patches/server/0146-Configurable-sponge-absorption.patch similarity index 100% rename from patches/server/0145-Configurable-sponge-absorption.patch rename to patches/server/0146-Configurable-sponge-absorption.patch diff --git a/patches/server/0146-Projectile-offset-config.patch b/patches/server/0147-Projectile-offset-config.patch similarity index 100% rename from patches/server/0146-Projectile-offset-config.patch rename to patches/server/0147-Projectile-offset-config.patch diff --git a/patches/server/0147-Config-for-powered-rail-activation-distance.patch b/patches/server/0148-Config-for-powered-rail-activation-distance.patch similarity index 100% rename from patches/server/0147-Config-for-powered-rail-activation-distance.patch rename to patches/server/0148-Config-for-powered-rail-activation-distance.patch diff --git a/patches/server/0148-Piglin-portal-spawn-modifier.patch b/patches/server/0149-Piglin-portal-spawn-modifier.patch similarity index 100% rename from patches/server/0148-Piglin-portal-spawn-modifier.patch rename to patches/server/0149-Piglin-portal-spawn-modifier.patch diff --git a/patches/server/0149-Config-to-change-max-number-of-bees.patch b/patches/server/0150-Config-to-change-max-number-of-bees.patch similarity index 100% rename from patches/server/0149-Config-to-change-max-number-of-bees.patch rename to patches/server/0150-Config-to-change-max-number-of-bees.patch diff --git a/patches/server/0150-Config-for-wither-explosion-radius.patch b/patches/server/0151-Config-for-wither-explosion-radius.patch similarity index 100% rename from patches/server/0150-Config-for-wither-explosion-radius.patch rename to patches/server/0151-Config-for-wither-explosion-radius.patch diff --git a/patches/server/0151-Gamemode-extra-permissions.patch b/patches/server/0152-Gamemode-extra-permissions.patch similarity index 100% rename from patches/server/0151-Gamemode-extra-permissions.patch rename to patches/server/0152-Gamemode-extra-permissions.patch diff --git a/patches/server/0152-Configurable-piston-push-limit.patch b/patches/server/0153-Configurable-piston-push-limit.patch similarity index 100% rename from patches/server/0152-Configurable-piston-push-limit.patch rename to patches/server/0153-Configurable-piston-push-limit.patch diff --git a/patches/server/0153-Configurable-broadcast-settings.patch b/patches/server/0154-Configurable-broadcast-settings.patch similarity index 100% rename from patches/server/0153-Configurable-broadcast-settings.patch rename to patches/server/0154-Configurable-broadcast-settings.patch diff --git a/patches/server/0154-Configurable-mob-blindness.patch b/patches/server/0155-Configurable-mob-blindness.patch similarity index 97% rename from patches/server/0154-Configurable-mob-blindness.patch rename to patches/server/0155-Configurable-mob-blindness.patch index 71eb724e4..307b267cd 100644 --- a/patches/server/0154-Configurable-mob-blindness.patch +++ b/patches/server/0155-Configurable-mob-blindness.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Configurable mob blindness Ported from https://github.com/raltsmc/mobblindness diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 578ab44fedb1522ed91a9f65bd2dda2273882ed2..9ccdd607d23e00974b6a44f656885ee6fd4d39ad 100644 +index d076f7f42e98ca240c169e1c165097bf4c3f46e8..d213e299d7bdba4161bd1a2fee9b1042a561abc0 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1043,6 +1043,17 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0155-Hide-hidden-players-from-entity-selector.patch b/patches/server/0156-Hide-hidden-players-from-entity-selector.patch similarity index 100% rename from patches/server/0155-Hide-hidden-players-from-entity-selector.patch rename to patches/server/0156-Hide-hidden-players-from-entity-selector.patch diff --git a/patches/server/0156-Config-for-health-to-impact-Creeper-explosion-radius.patch b/patches/server/0157-Config-for-health-to-impact-Creeper-explosion-radius.patch similarity index 96% rename from patches/server/0156-Config-for-health-to-impact-Creeper-explosion-radius.patch rename to patches/server/0157-Config-for-health-to-impact-Creeper-explosion-radius.patch index 363a5a94f..4e1c3f0b9 100644 --- a/patches/server/0156-Config-for-health-to-impact-Creeper-explosion-radius.patch +++ b/patches/server/0157-Config-for-health-to-impact-Creeper-explosion-radius.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Config for health to impact Creeper explosion radius diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java -index e9eeddf5c39d66535163e67f41dbc9ac98643742..3643f62853dd5782e1dd36bd533864e0ae11a2f1 100644 +index 902191001a7302872ff661564fb6389457abaa9c..1769c1d31bb68904be426e1069266cec809cf31a 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java +++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java @@ -374,9 +374,10 @@ public class Creeper extends Monster implements PowerableMob { diff --git a/patches/server/0157-Iron-golem-calm-anger-options.patch b/patches/server/0158-Iron-golem-calm-anger-options.patch similarity index 100% rename from patches/server/0157-Iron-golem-calm-anger-options.patch rename to patches/server/0158-Iron-golem-calm-anger-options.patch diff --git a/patches/server/0158-Breedable-parrots.patch b/patches/server/0159-Breedable-parrots.patch similarity index 100% rename from patches/server/0158-Breedable-parrots.patch rename to patches/server/0159-Breedable-parrots.patch diff --git a/patches/server/0159-Configurable-powered-rail-boost-modifier.patch b/patches/server/0160-Configurable-powered-rail-boost-modifier.patch similarity index 100% rename from patches/server/0159-Configurable-powered-rail-boost-modifier.patch rename to patches/server/0160-Configurable-powered-rail-boost-modifier.patch diff --git a/patches/server/0160-Add-config-change-multiplier-critical-damage-value.patch b/patches/server/0161-Add-config-change-multiplier-critical-damage-value.patch similarity index 100% rename from patches/server/0160-Add-config-change-multiplier-critical-damage-value.patch rename to patches/server/0161-Add-config-change-multiplier-critical-damage-value.patch diff --git a/patches/server/0161-Option-to-disable-dragon-egg-teleporting.patch b/patches/server/0162-Option-to-disable-dragon-egg-teleporting.patch similarity index 100% rename from patches/server/0161-Option-to-disable-dragon-egg-teleporting.patch rename to patches/server/0162-Option-to-disable-dragon-egg-teleporting.patch diff --git a/patches/server/0162-Config-for-unverified-username-message.patch b/patches/server/0163-Config-for-unverified-username-message.patch similarity index 100% rename from patches/server/0162-Config-for-unverified-username-message.patch rename to patches/server/0163-Config-for-unverified-username-message.patch diff --git a/patches/server/0163-Make-anvil-cumulative-cost-configurable.patch b/patches/server/0164-Make-anvil-cumulative-cost-configurable.patch similarity index 100% rename from patches/server/0163-Make-anvil-cumulative-cost-configurable.patch rename to patches/server/0164-Make-anvil-cumulative-cost-configurable.patch diff --git a/patches/server/0164-Bee-can-work-when-raining-or-at-night.patch b/patches/server/0165-Bee-can-work-when-raining-or-at-night.patch similarity index 97% rename from patches/server/0164-Bee-can-work-when-raining-or-at-night.patch rename to patches/server/0165-Bee-can-work-when-raining-or-at-night.patch index 6f348f3b9..511869c40 100644 --- a/patches/server/0164-Bee-can-work-when-raining-or-at-night.patch +++ b/patches/server/0165-Bee-can-work-when-raining-or-at-night.patch @@ -18,7 +18,7 @@ index e7f85150fb7dcee5ba0d7bc3830a0544e18e9817..55fb4555dacfb6c34ff491b88cfed2b6 return flag && !this.isHiveNearFire(); } else { diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java -index f52823146944d333f2d050e90261b570ba66f5dd..d8efb00c325448d566c59418fe22268c6eb4cfce 100644 +index fb84af3b1709101fa572d11a1c27970a316f2eab..5e982bab268746a05b97f5b9f71422548ea12983 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java @@ -212,7 +212,7 @@ public class BeehiveBlockEntity extends BlockEntity { diff --git a/patches/server/0165-API-for-any-mob-to-burn-daylight.patch b/patches/server/0166-API-for-any-mob-to-burn-daylight.patch similarity index 98% rename from patches/server/0165-API-for-any-mob-to-burn-daylight.patch rename to patches/server/0166-API-for-any-mob-to-burn-daylight.patch index 3f5ad2800..ab5d94f36 100644 --- a/patches/server/0165-API-for-any-mob-to-burn-daylight.patch +++ b/patches/server/0166-API-for-any-mob-to-burn-daylight.patch @@ -6,7 +6,7 @@ Subject: [PATCH] API for any mob to burn daylight Co-authored by: Encode42 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 40d8611ecffd2a293192ecacf2e72ba83ae22318..0bbba33736c9fc95759fa9807ad8e42eee176ff8 100644 +index 3993769068556926eb30e32d90204ceb4287119d..14cadfb2fb802a6106b40cdac5c49ca8f40afeb7 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -557,6 +557,22 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess @@ -100,10 +100,10 @@ index d213e299d7bdba4161bd1a2fee9b1042a561abc0..936491872bc1d0c260daff8c62223a21 public boolean isSensitiveToWater() { diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java -index 8b2dd71177b011c2a31e4959ca16057ad5288b22..6dfb13eef96ff43d368cd8163ae5883571cec604 100644 +index d5c2b878abe44ee6fe856771c97759b2d0e51681..2166a9db0fd6c3c3cb3293c99e81b08f733089eb 100644 --- a/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java -@@ -1780,17 +1780,8 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab +@@ -1778,17 +1778,8 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab protected void playAttackSound() {} public boolean isSunBurnTick() { diff --git a/patches/server/0166-Config-MobEffect-by-world.patch b/patches/server/0167-Config-MobEffect-by-world.patch similarity index 100% rename from patches/server/0166-Config-MobEffect-by-world.patch rename to patches/server/0167-Config-MobEffect-by-world.patch diff --git a/patches/server/0167-Beacon-Activation-Range-Configurable.patch b/patches/server/0168-Beacon-Activation-Range-Configurable.patch similarity index 100% rename from patches/server/0167-Beacon-Activation-Range-Configurable.patch rename to patches/server/0168-Beacon-Activation-Range-Configurable.patch diff --git a/patches/server/0168-Make-lightning-rod-range-configurable.patch b/patches/server/0169-Make-lightning-rod-range-configurable.patch similarity index 100% rename from patches/server/0168-Make-lightning-rod-range-configurable.patch rename to patches/server/0169-Make-lightning-rod-range-configurable.patch diff --git a/patches/server/0169-Burp-delay-burp-after-eating-food-fills-hunger-bar-c.patch b/patches/server/0170-Burp-delay-burp-after-eating-food-fills-hunger-bar-c.patch similarity index 100% rename from patches/server/0169-Burp-delay-burp-after-eating-food-fills-hunger-bar-c.patch rename to patches/server/0170-Burp-delay-burp-after-eating-food-fills-hunger-bar-c.patch diff --git a/patches/server/0170-Allow-player-join-full-server-by-permission.patch b/patches/server/0171-Allow-player-join-full-server-by-permission.patch similarity index 93% rename from patches/server/0170-Allow-player-join-full-server-by-permission.patch rename to patches/server/0171-Allow-player-join-full-server-by-permission.patch index e02c3a9f6..007b8473b 100644 --- a/patches/server/0170-Allow-player-join-full-server-by-permission.patch +++ b/patches/server/0171-Allow-player-join-full-server-by-permission.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Allow player join full server by permission diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index a1e8b2a00fdeeb26293e280a1443f99871faaa75..71f989f5349339c2481be03c81a41704ffbe42a9 100644 +index 8b02ceeb89286c09ece26054ebe70a61c296dfd6..15b71ef1f52467eec0020fb837f78d9f2cfd8556 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -748,7 +748,7 @@ public abstract class PlayerList { diff --git a/patches/server/0171-Add-portal-permission-bypass.patch b/patches/server/0172-Add-portal-permission-bypass.patch similarity index 100% rename from patches/server/0171-Add-portal-permission-bypass.patch rename to patches/server/0172-Add-portal-permission-bypass.patch diff --git a/patches/server/0172-Shulker-spawn-from-bullet-options.patch b/patches/server/0173-Shulker-spawn-from-bullet-options.patch similarity index 100% rename from patches/server/0172-Shulker-spawn-from-bullet-options.patch rename to patches/server/0173-Shulker-spawn-from-bullet-options.patch diff --git a/patches/server/0173-Eating-glow-berries-adds-glow-effect.patch b/patches/server/0174-Eating-glow-berries-adds-glow-effect.patch similarity index 100% rename from patches/server/0173-Eating-glow-berries-adds-glow-effect.patch rename to patches/server/0174-Eating-glow-berries-adds-glow-effect.patch diff --git a/patches/server/0174-Option-to-make-drowned-break-doors.patch b/patches/server/0175-Option-to-make-drowned-break-doors.patch similarity index 100% rename from patches/server/0174-Option-to-make-drowned-break-doors.patch rename to patches/server/0175-Option-to-make-drowned-break-doors.patch diff --git a/patches/server/0175-Configurable-hunger-starvation-damage.patch b/patches/server/0176-Configurable-hunger-starvation-damage.patch similarity index 95% rename from patches/server/0175-Configurable-hunger-starvation-damage.patch rename to patches/server/0176-Configurable-hunger-starvation-damage.patch index 7898e6b25..33c28adde 100644 --- a/patches/server/0175-Configurable-hunger-starvation-damage.patch +++ b/patches/server/0176-Configurable-hunger-starvation-damage.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configurable hunger starvation damage diff --git a/src/main/java/net/minecraft/world/food/FoodData.java b/src/main/java/net/minecraft/world/food/FoodData.java -index 515dd3b769917c4aa60ce180ef24f38ca12e6848..c7ad716f607afe382436d088a2b2e622e02a0671 100644 +index b702b7270fae8fafc39588fbc39b4e0014809047..842a908051bdf6c5f0ef8ce3ac84a7ce210500b5 100644 --- a/src/main/java/net/minecraft/world/food/FoodData.java +++ b/src/main/java/net/minecraft/world/food/FoodData.java @@ -107,7 +107,7 @@ public class FoodData { diff --git a/patches/server/0176-Enhance-SysoutCatcher.patch b/patches/server/0177-Enhance-SysoutCatcher.patch similarity index 100% rename from patches/server/0176-Enhance-SysoutCatcher.patch rename to patches/server/0177-Enhance-SysoutCatcher.patch diff --git a/patches/server/0177-Add-uptime-command.patch b/patches/server/0178-Add-uptime-command.patch similarity index 97% rename from patches/server/0177-Add-uptime-command.patch rename to patches/server/0178-Add-uptime-command.patch index a9760ad1c..25428b056 100644 --- a/patches/server/0177-Add-uptime-command.patch +++ b/patches/server/0178-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 73774049d9d4165036ddf90979d2de837e3701d8..ebdfbb69f52ec180cadf1187d310f15d221584b2 100644 +index c7b7cc0d9ce589b5a0600e9b8c46b2e5d7a520bd..9f86a0397c0b64cb31dad245e2dc84d0fadd42d7 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 73774049d9d4165036ddf90979d2de837e3701d8..ebdfbb69f52ec180cadf1187d310f15d } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index ada01633d26745900f15a512293a93aa3b1ee42f..d2ec3b09bd5176f339fb618e4a1c89959fc0b7ff 100644 +index 5300e75cb10c74188fdee49c65e56255652bc82a..8e8cc0b294c89cc9ebabee42d6a6d9ced4f9cd7d 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> { diff --git a/patches/server/0229-Configurable-minimum-demand-for-trades.patch b/patches/server/0230-Configurable-minimum-demand-for-trades.patch similarity index 100% rename from patches/server/0229-Configurable-minimum-demand-for-trades.patch rename to patches/server/0230-Configurable-minimum-demand-for-trades.patch diff --git a/patches/server/0230-Lobotomize-stuck-villagers.patch b/patches/server/0231-Lobotomize-stuck-villagers.patch similarity index 100% rename from patches/server/0230-Lobotomize-stuck-villagers.patch rename to patches/server/0231-Lobotomize-stuck-villagers.patch diff --git a/patches/server/0231-Option-for-villager-display-trade-item.patch b/patches/server/0232-Option-for-villager-display-trade-item.patch similarity index 100% rename from patches/server/0231-Option-for-villager-display-trade-item.patch rename to patches/server/0232-Option-for-villager-display-trade-item.patch diff --git a/patches/server/0232-MC-238526-Fix-spawner-not-spawning-water-animals-cor.patch b/patches/server/0233-MC-238526-Fix-spawner-not-spawning-water-animals-cor.patch similarity index 100% rename from patches/server/0232-MC-238526-Fix-spawner-not-spawning-water-animals-cor.patch rename to patches/server/0233-MC-238526-Fix-spawner-not-spawning-water-animals-cor.patch diff --git a/patches/server/0233-Config-for-mob-last-hurt-by-player-time.patch b/patches/server/0234-Config-for-mob-last-hurt-by-player-time.patch similarity index 97% rename from patches/server/0233-Config-for-mob-last-hurt-by-player-time.patch rename to patches/server/0234-Config-for-mob-last-hurt-by-player-time.patch index 6beb8859f..e42bdbf2c 100644 --- a/patches/server/0233-Config-for-mob-last-hurt-by-player-time.patch +++ b/patches/server/0234-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 40a0b2ede7dae5db26c6be12f181e4394669ced3..30149ed40d34818bdbd9098298e8f4cf82116c4c 100644 +index 8c992659cb1a6d894d66ed8d8b943c6dc4b6c4c9..9582498c5cbcc859b942384e8e0e492cb2cdea03 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1567,13 +1567,13 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0234-Anvil-repair-damage-options.patch b/patches/server/0235-Anvil-repair-damage-options.patch similarity index 100% rename from patches/server/0234-Anvil-repair-damage-options.patch rename to patches/server/0235-Anvil-repair-damage-options.patch diff --git a/patches/server/0235-Option-to-disable-turtle-egg-trampling-with-feather-.patch b/patches/server/0236-Option-to-disable-turtle-egg-trampling-with-feather-.patch similarity index 100% rename from patches/server/0235-Option-to-disable-turtle-egg-trampling-with-feather-.patch rename to patches/server/0236-Option-to-disable-turtle-egg-trampling-with-feather-.patch diff --git a/patches/server/0236-Add-toggle-for-enchant-level-clamping.patch b/patches/server/0237-Add-toggle-for-enchant-level-clamping.patch similarity index 100% rename from patches/server/0236-Add-toggle-for-enchant-level-clamping.patch rename to patches/server/0237-Add-toggle-for-enchant-level-clamping.patch diff --git a/patches/server/0237-Skip-junit-tests-for-purpur-commands.patch b/patches/server/0238-Skip-junit-tests-for-purpur-commands.patch similarity index 100% rename from patches/server/0237-Skip-junit-tests-for-purpur-commands.patch rename to patches/server/0238-Skip-junit-tests-for-purpur-commands.patch diff --git a/patches/server/0238-Implement-configurable-search-radius-for-villagers-t.patch b/patches/server/0239-Implement-configurable-search-radius-for-villagers-t.patch similarity index 100% rename from patches/server/0238-Implement-configurable-search-radius-for-villagers-t.patch rename to patches/server/0239-Implement-configurable-search-radius-for-villagers-t.patch diff --git a/patches/server/0239-Stonecutter-damage.patch b/patches/server/0240-Stonecutter-damage.patch similarity index 100% rename from patches/server/0239-Stonecutter-damage.patch rename to patches/server/0240-Stonecutter-damage.patch diff --git a/patches/server/0240-Configurable-damage-settings-for-magma-blocks.patch b/patches/server/0241-Configurable-damage-settings-for-magma-blocks.patch similarity index 100% rename from patches/server/0240-Configurable-damage-settings-for-magma-blocks.patch rename to patches/server/0241-Configurable-damage-settings-for-magma-blocks.patch diff --git a/patches/server/0241-Add-config-for-snow-on-blue-ice.patch b/patches/server/0242-Add-config-for-snow-on-blue-ice.patch similarity index 100% rename from patches/server/0241-Add-config-for-snow-on-blue-ice.patch rename to patches/server/0242-Add-config-for-snow-on-blue-ice.patch diff --git a/patches/server/0242-Skeletons-eat-wither-roses.patch b/patches/server/0243-Skeletons-eat-wither-roses.patch similarity index 100% rename from patches/server/0242-Skeletons-eat-wither-roses.patch rename to patches/server/0243-Skeletons-eat-wither-roses.patch diff --git a/patches/server/0243-Enchantment-Table-Persists-Lapis.patch b/patches/server/0244-Enchantment-Table-Persists-Lapis.patch similarity index 100% rename from patches/server/0243-Enchantment-Table-Persists-Lapis.patch rename to patches/server/0244-Enchantment-Table-Persists-Lapis.patch diff --git a/patches/server/0244-Spark-Profiler.patch b/patches/server/0245-Spark-Profiler.patch similarity index 100% rename from patches/server/0244-Spark-Profiler.patch rename to patches/server/0245-Spark-Profiler.patch diff --git a/patches/server/0245-Option-to-disable-kick-for-out-of-order-chat.patch b/patches/server/0246-Option-to-disable-kick-for-out-of-order-chat.patch similarity index 100% rename from patches/server/0245-Option-to-disable-kick-for-out-of-order-chat.patch rename to patches/server/0246-Option-to-disable-kick-for-out-of-order-chat.patch diff --git a/patches/server/0246-Config-for-sculk-shrieker-can_summon-state.patch b/patches/server/0247-Config-for-sculk-shrieker-can_summon-state.patch similarity index 100% rename from patches/server/0246-Config-for-sculk-shrieker-can_summon-state.patch rename to patches/server/0247-Config-for-sculk-shrieker-can_summon-state.patch diff --git a/patches/server/0247-Config-to-not-let-coral-die.patch b/patches/server/0248-Config-to-not-let-coral-die.patch similarity index 100% rename from patches/server/0247-Config-to-not-let-coral-die.patch rename to patches/server/0248-Config-to-not-let-coral-die.patch diff --git a/patches/server/0248-Add-local-difficulty-api.patch b/patches/server/0249-Add-local-difficulty-api.patch similarity index 91% rename from patches/server/0248-Add-local-difficulty-api.patch rename to patches/server/0249-Add-local-difficulty-api.patch index 8c16f600e..18b5d8b49 100644 --- a/patches/server/0248-Add-local-difficulty-api.patch +++ b/patches/server/0249-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 8045d6c9398d1c88595da6e41aa1ed27fb6fbad0..685d52605bb2cc8eb7a4065e0e7cf634a22a512a 100644 +index 362ca138a5cd5ad19f1300015c2571794adc3649..e771af8e79f0a89bc88d3c573b062dc7321fb36b 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -2338,6 +2338,12 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0249-Add-toggle-for-RNG-manipulation.patch b/patches/server/0250-Add-toggle-for-RNG-manipulation.patch similarity index 97% rename from patches/server/0249-Add-toggle-for-RNG-manipulation.patch rename to patches/server/0250-Add-toggle-for-RNG-manipulation.patch index 1f18781f2..75599eaae 100644 --- a/patches/server/0249-Add-toggle-for-RNG-manipulation.patch +++ b/patches/server/0250-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 0bbba33736c9fc95759fa9807ad8e42eee176ff8..9c294bb8ae3cb9ec18ed633821c64c38bad50e95 100644 +index 14cadfb2fb802a6106b40cdac5c49ca8f40afeb7..ca6a05c47ba6064cc0febccf14705613479b727c 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -580,7 +580,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0250-Remove-Timings.patch b/patches/server/0251-Remove-Timings.patch similarity index 97% rename from patches/server/0250-Remove-Timings.patch rename to patches/server/0251-Remove-Timings.patch index fce019eed..57814e8a2 100644 --- a/patches/server/0250-Remove-Timings.patch +++ b/patches/server/0251-Remove-Timings.patch @@ -42,10 +42,10 @@ index e2c24813f59c2fd075c740ac1842a38f20ed8554..01efbc507b3d58f13f78ee286f93df40 } catch (Exception exception) { if (exception instanceof ReportedException) { diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index a9e7f5d8f2e2605878c35863e933f93d8b05c166..20d6d433925312a5894d9d6628ec3c39483ef4d2 100644 +index 4cf4c138b8494f7a7f4a0efeeece571a1c405943..b7d0f2f07ee7f9f7c93a01ffd3453db06ab9cd9f 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1601,15 +1601,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop { entityplayer.connection.suspendFlushing(); }); @@ -97,7 +97,7 @@ index a9e7f5d8f2e2605878c35863e933f93d8b05c166..20d6d433925312a5894d9d6628ec3c39 // Paper start - Folia scheduler API ((io.papermc.paper.threadedregions.scheduler.FoliaGlobalRegionScheduler) Bukkit.getGlobalRegionScheduler()).tick(); getAllLevels().forEach(level -> { -@@ -1760,21 +1760,21 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop { // Paper - Ensure main @@ -522,7 +522,7 @@ index 71f989f5349339c2481be03c81a41704ffbe42a9..b14e56c6b117b28c604259ad179d10e7 int numSaved = 0; long now = MinecraftServer.currentTick; for (int i = 0; i < this.players.size(); ++i) { -@@ -1238,7 +1238,7 @@ public abstract class PlayerList { +@@ -1239,7 +1239,7 @@ public abstract class PlayerList { } // Paper end - Incremental chunk and player saving } @@ -675,10 +675,10 @@ index 5453b7051337908ac1c8201827c1b5eec9e1608b..c68a3ab2129d4eba7f7c08b811fe3461 } } diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java -index c1e2d3a75b9d4710ab6d8b5c62af4bc136a2b668..ca8ae8e1c51b937dac916e0b0dc94b5e2e61efeb 100644 +index 30ddb35140ae4a6faba98c191bb8eadbafc35377..48999a860a3b9ed691691c355beaf3e0674acb95 100644 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java -@@ -515,10 +515,10 @@ public class CraftScheduler implements BukkitScheduler { +@@ -504,10 +504,10 @@ public class CraftScheduler implements BukkitScheduler { this.runners.remove(task.getTaskId()); } } @@ -691,7 +691,7 @@ index c1e2d3a75b9d4710ab6d8b5c62af4bc136a2b668..ca8ae8e1c51b937dac916e0b0dc94b5e //this.debugHead = this.debugHead.getNextHead(currentTick); // Paper } -@@ -561,7 +561,7 @@ public class CraftScheduler implements BukkitScheduler { +@@ -550,7 +550,7 @@ public class CraftScheduler implements BukkitScheduler { } void parsePending() { // Paper @@ -700,7 +700,7 @@ index c1e2d3a75b9d4710ab6d8b5c62af4bc136a2b668..ca8ae8e1c51b937dac916e0b0dc94b5e CraftTask head = this.head; CraftTask task = head.getNext(); CraftTask lastTask = head; -@@ -580,7 +580,7 @@ public class CraftScheduler implements BukkitScheduler { +@@ -569,7 +569,7 @@ public class CraftScheduler implements BukkitScheduler { task.setNext(null); } this.head = lastTask; @@ -710,10 +710,10 @@ index c1e2d3a75b9d4710ab6d8b5c62af4bc136a2b668..ca8ae8e1c51b937dac916e0b0dc94b5e private boolean isReady(final int currentTick) { diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java -index ea26d9464644b5217879b8c21b4da28e57708dcb..5835dc236b3f5291a804f7fb14a12eb466d4e0ba 100644 +index ba369f3dcfdf498e971dc4405d39657a9b6e97cc..8f181e03eda734b18f8c9ee80ee6e45f8689d178 100644 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java -@@ -96,13 +96,13 @@ public class CraftTask implements BukkitTask, Runnable { // Spigot +@@ -81,13 +81,13 @@ public class CraftTask implements BukkitTask, Runnable { // Spigot @Override public void run() { diff --git a/patches/server/0251-Remove-Mojang-Profiler.patch b/patches/server/0252-Remove-Mojang-Profiler.patch similarity index 98% rename from patches/server/0251-Remove-Mojang-Profiler.patch rename to patches/server/0252-Remove-Mojang-Profiler.patch index ac6d768b6..8571c2c70 100644 --- a/patches/server/0251-Remove-Mojang-Profiler.patch +++ b/patches/server/0252-Remove-Mojang-Profiler.patch @@ -83,7 +83,7 @@ index e9775b4506909bee65a74964f0d5391a0513de1d..684f7f202305c09b1037c5d38a52a5ea } } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 20d6d433925312a5894d9d6628ec3c39483ef4d2..a4c6b7342c0cc2d8017561645d25f94571167765 100644 +index b7d0f2f07ee7f9f7c93a01ffd3453db06ab9cd9f..255c5e65523f3c82d8bbbebb5219fb161fe8e02a 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -422,13 +422,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop { return false; } : this::haveTime); -@@ -1326,7 +1326,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop 0 && this.tickCount % autosavePeriod == 0; try { this.isSaving = true; -@@ -1642,7 +1642,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop 0; // Purpur @@ -246,7 +246,7 @@ index 20d6d433925312a5894d9d6628ec3c39483ef4d2..a4c6b7342c0cc2d8017561645d25f945 try { //worldserver.timings.doTick.startTiming(); // Spigot // Purpur -@@ -1832,17 +1832,17 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop { this.executeBlocking(() -> { this.saveDebugReport(path.resolve("server")); -@@ -2853,40 +2854,40 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop list = this.level().getEntitiesOfClass(ItemEntity.class, this.getBoundingBox().inflate((double) baseblockposition.getX(), (double) baseblockposition.getY(), (double) baseblockposition.getZ())); -@@ -726,7 +726,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab +@@ -724,7 +724,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab } } @@ -1321,7 +1321,7 @@ index 6dfb13eef96ff43d368cd8163ae5883571cec604..a07cadcbd73f7058a5cf8535fb317ac0 } protected Vec3i getPickupReach() { -@@ -946,44 +946,44 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab +@@ -944,44 +944,44 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab return; } // Paper end - Allow nerfed mobs to jump and float diff --git a/patches/server/0252-Add-more-logger-output-for-invalid-movement-kicks.patch b/patches/server/0253-Add-more-logger-output-for-invalid-movement-kicks.patch similarity index 96% rename from patches/server/0252-Add-more-logger-output-for-invalid-movement-kicks.patch rename to patches/server/0253-Add-more-logger-output-for-invalid-movement-kicks.patch index a3ff71edc..4473b46f7 100644 --- a/patches/server/0252-Add-more-logger-output-for-invalid-movement-kicks.patch +++ b/patches/server/0253-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 3f388240694709c198c7d16be56127101f5e6df3..1c41ad915ad5f1ef63fea96fefe53fd037174ac3 100644 +index efb72ae3ce609117258dfc9f09b53add4ef0fd8e..29d69101326017f68b10329f51dd6b93c1bf1d60 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -721,6 +721,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0253-Add-Bee-API.patch b/patches/server/0254-Add-Bee-API.patch similarity index 100% rename from patches/server/0253-Add-Bee-API.patch rename to patches/server/0254-Add-Bee-API.patch diff --git a/patches/server/0254-Debug-Marker-API.patch b/patches/server/0255-Debug-Marker-API.patch similarity index 100% rename from patches/server/0254-Debug-Marker-API.patch rename to patches/server/0255-Debug-Marker-API.patch diff --git a/patches/server/0255-mob-spawning-option-to-ignore-creative-players.patch b/patches/server/0256-mob-spawning-option-to-ignore-creative-players.patch similarity index 96% rename from patches/server/0255-mob-spawning-option-to-ignore-creative-players.patch rename to patches/server/0256-mob-spawning-option-to-ignore-creative-players.patch index c771638b1..9e3f506e0 100644 --- a/patches/server/0255-mob-spawning-option-to-ignore-creative-players.patch +++ b/patches/server/0256-mob-spawning-option-to-ignore-creative-players.patch @@ -5,7 +5,7 @@ Subject: [PATCH] mob spawning option to ignore creative players diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java -index 35e94c06361795d032f995e8282f8b35c075dae7..0f90a6803851eba51e164772c984b1cd1193d882 100644 +index 4dc060bc677984d91a30a88155c576d5e187aa1b..061706ee732f9809d6b73305c14871257af8305e 100644 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java @@ -253,7 +253,7 @@ public final class NaturalSpawner { diff --git a/patches/server/0256-Add-skeleton-bow-accuracy-option.patch b/patches/server/0257-Add-skeleton-bow-accuracy-option.patch similarity index 100% rename from patches/server/0256-Add-skeleton-bow-accuracy-option.patch rename to patches/server/0257-Add-skeleton-bow-accuracy-option.patch diff --git a/patches/server/0257-Add-death-screen-API.patch b/patches/server/0258-Add-death-screen-API.patch similarity index 92% rename from patches/server/0257-Add-death-screen-API.patch rename to patches/server/0258-Add-death-screen-API.patch index c09ddec30..12a710512 100644 --- a/patches/server/0257-Add-death-screen-API.patch +++ b/patches/server/0258-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 afd7a48f6c85aa00fe53f8ee6a53d790f81a6048..6a3b023b0f60dbb350943bdd7f0bfead9e8e3ce0 100644 +index dfc15b03996a1a82918c85f3ebea59d54177092a..b9130d040acff1e5cb7a475be93b03cdbe229683 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -3641,5 +3641,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0258-Implement-ram-and-rambar-commands.patch b/patches/server/0259-Implement-ram-and-rambar-commands.patch similarity index 99% rename from patches/server/0258-Implement-ram-and-rambar-commands.patch rename to patches/server/0259-Implement-ram-and-rambar-commands.patch index fbc34271f..9feb7b47b 100644 --- a/patches/server/0258-Implement-ram-and-rambar-commands.patch +++ b/patches/server/0259-Implement-ram-and-rambar-commands.patch @@ -201,7 +201,7 @@ index 0000000000000000000000000000000000000000..992f8dfc628c7485e335191e1308cdfd + } +} diff --git a/src/main/java/org/purpurmc/purpur/task/BossBarTask.java b/src/main/java/org/purpurmc/purpur/task/BossBarTask.java -index d333334f323049ca97e756324cff0b23eddacd2a..114f273dd7f8b8a3c02f0651f6944859b33a65d4 100644 +index 65c1bac3daf781c66442350ba08c43b21d2f1637..3c3d4cd52db93b97a40321030a70ebc282c9636b 100644 --- a/src/main/java/org/purpurmc/purpur/task/BossBarTask.java +++ b/src/main/java/org/purpurmc/purpur/task/BossBarTask.java @@ -89,17 +89,22 @@ public abstract class BossBarTask extends BukkitRunnable { diff --git a/patches/server/0259-Configurable-block-blast-resistance.patch b/patches/server/0260-Configurable-block-blast-resistance.patch similarity index 96% rename from patches/server/0259-Configurable-block-blast-resistance.patch rename to patches/server/0260-Configurable-block-blast-resistance.patch index 67508e941..5a6845a46 100644 --- a/patches/server/0259-Configurable-block-blast-resistance.patch +++ b/patches/server/0260-Configurable-block-blast-resistance.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configurable block blast resistance diff --git a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java -index 1b825b9012e24b12f83883f2056839c102802e4b..155a099eb9b0196385947f5765fad4e5c5b74b44 100644 +index 61918a4a1ea8e1a0f5965bbf2c9fdb2d7b7863e8..80d68b91ea4e4eb97e31d1df0c430740fb56bd74 100644 --- a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java +++ b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java @@ -85,7 +85,7 @@ public abstract class BlockBehaviour implements FeatureElement { diff --git a/patches/server/0260-Configurable-block-fall-damage-modifiers.patch b/patches/server/0261-Configurable-block-fall-damage-modifiers.patch similarity index 100% rename from patches/server/0260-Configurable-block-fall-damage-modifiers.patch rename to patches/server/0261-Configurable-block-fall-damage-modifiers.patch diff --git a/patches/server/0261-Language-API.patch b/patches/server/0262-Language-API.patch similarity index 93% rename from patches/server/0261-Language-API.patch rename to patches/server/0262-Language-API.patch index f2f12c30c..ad969a352 100644 --- a/patches/server/0261-Language-API.patch +++ b/patches/server/0262-Language-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Language API diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 8bd0bb8b9593347bd249312af3832a4c1a932a5c..002a3ee08d7e009ef1e4bd3bc274aa608846b219 100644 +index 1bb18e2870db62102709f3c0176f2a76492c9e1d..2e440d3c0b4bd42d6bc8409778473f574e22c54b 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -410,6 +410,20 @@ public final class CraftServer implements Server { diff --git a/patches/server/0262-Milk-Keeps-Beneficial-Effects.patch b/patches/server/0263-Milk-Keeps-Beneficial-Effects.patch similarity index 97% rename from patches/server/0262-Milk-Keeps-Beneficial-Effects.patch rename to patches/server/0263-Milk-Keeps-Beneficial-Effects.patch index 6c88b1969..097525247 100644 --- a/patches/server/0262-Milk-Keeps-Beneficial-Effects.patch +++ b/patches/server/0263-Milk-Keeps-Beneficial-Effects.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Milk Keeps Beneficial Effects diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index ed31f3e9741909c1840c46f993aead43a626dc64..cf01a2ef9d72edc7661661c13a85c777bf32b83b 100644 +index 94a1874576ed07bacdd399785666f69d4b4086c8..fa43300ba2110a85b67eb8ace6c67f2b27fb4ed9 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1130,6 +1130,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0263-MC-121706-Fix-mobs-not-looking-up-and-down-when-stra.patch b/patches/server/0264-MC-121706-Fix-mobs-not-looking-up-and-down-when-stra.patch similarity index 100% rename from patches/server/0263-MC-121706-Fix-mobs-not-looking-up-and-down-when-stra.patch rename to patches/server/0264-MC-121706-Fix-mobs-not-looking-up-and-down-when-stra.patch diff --git a/patches/server/0264-Add-log-suppression-for-LibraryLoader.patch b/patches/server/0265-Add-log-suppression-for-LibraryLoader.patch similarity index 94% rename from patches/server/0264-Add-log-suppression-for-LibraryLoader.patch rename to patches/server/0265-Add-log-suppression-for-LibraryLoader.patch index ec6d8feef..a2e7999d0 100644 --- a/patches/server/0264-Add-log-suppression-for-LibraryLoader.patch +++ b/patches/server/0265-Add-log-suppression-for-LibraryLoader.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add log suppression for LibraryLoader diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -index eac4ad715b8b5c97802763aee0ff2941cf0afb8d..72e918ad137dbfe8cde8b179f352224c8b2a1dad 100644 +index 8d1b86a5591f7032c39010e7a61942eceb4f5f49..a47dbe37e940e55dbf7378df299abb7f3367de83 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -465,11 +465,14 @@ public class PurpurConfig { diff --git a/patches/server/0265-Add-an-option-to-fix-MC-3304-projectile-looting.patch b/patches/server/0266-Add-an-option-to-fix-MC-3304-projectile-looting.patch similarity index 98% rename from patches/server/0265-Add-an-option-to-fix-MC-3304-projectile-looting.patch rename to patches/server/0266-Add-an-option-to-fix-MC-3304-projectile-looting.patch index d6fcd6f12..8b7940143 100644 --- a/patches/server/0265-Add-an-option-to-fix-MC-3304-projectile-looting.patch +++ b/patches/server/0266-Add-an-option-to-fix-MC-3304-projectile-looting.patch @@ -30,7 +30,7 @@ index 8d8944a0455b3401d84cab636d61447e7d51ab19..0a7aa715674e5577e7f2327f6d0d253e return SoundEvents.ARROW_HIT; } diff --git a/src/main/java/net/minecraft/world/item/ProjectileWeaponItem.java b/src/main/java/net/minecraft/world/item/ProjectileWeaponItem.java -index 7ae7626c82969ea5a6fc5aa4a0c7ec43cea73adb..ffbc56290eb8e36339e29f6084bb207366506c39 100644 +index 32dd0b13a0819f597d8a93c6bc3a155781067544..9751eea2d8aa3a45da34f09377d2fc81fe9a90d8 100644 --- a/src/main/java/net/minecraft/world/item/ProjectileWeaponItem.java +++ b/src/main/java/net/minecraft/world/item/ProjectileWeaponItem.java @@ -110,6 +110,8 @@ public abstract class ProjectileWeaponItem extends Item { diff --git a/patches/server/0266-Add-option-to-allow-creeper-to-encircle-target-when-.patch b/patches/server/0267-Add-option-to-allow-creeper-to-encircle-target-when-.patch similarity index 100% rename from patches/server/0266-Add-option-to-allow-creeper-to-encircle-target-when-.patch rename to patches/server/0267-Add-option-to-allow-creeper-to-encircle-target-when-.patch diff --git a/patches/server/0267-Fire-Immunity-API.patch b/patches/server/0268-Fire-Immunity-API.patch similarity index 97% rename from patches/server/0267-Fire-Immunity-API.patch rename to patches/server/0268-Fire-Immunity-API.patch index e2ebeb56b..11268d4ae 100644 --- a/patches/server/0267-Fire-Immunity-API.patch +++ b/patches/server/0268-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 42ff02305e9eedb0a7c4a3b25106eb98776696a4..74e12d2f451f7ac482994bac4daa6841716e5a7c 100644 +index d261ac556c737be50e4ac214df10d7e711bea9b2..49ddbb2212d7c591cb21c253e0a4554b5e65ebad 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -431,6 +431,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0268-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch b/patches/server/0269-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch similarity index 96% rename from patches/server/0268-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch rename to patches/server/0269-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch index 2dbe699ce..3acfcf451 100644 --- a/patches/server/0268-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch +++ b/patches/server/0269-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 74e12d2f451f7ac482994bac4daa6841716e5a7c..a8124403002b88f1bdd3bf09d7858b3ea8e7106f 100644 +index 49ddbb2212d7c591cb21c253e0a4554b5e65ebad..75d7ce413cc002f17e443ee9232531d894ec7f24 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -959,6 +959,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0269-Added-got-ram-event.patch b/patches/server/0270-Added-got-ram-event.patch similarity index 100% rename from patches/server/0269-Added-got-ram-event.patch rename to patches/server/0270-Added-got-ram-event.patch diff --git a/patches/server/0270-Log-skipped-entity-s-position.patch b/patches/server/0271-Log-skipped-entity-s-position.patch similarity index 100% rename from patches/server/0270-Log-skipped-entity-s-position.patch rename to patches/server/0271-Log-skipped-entity-s-position.patch diff --git a/patches/server/0271-End-Crystal-Cramming.patch b/patches/server/0272-End-Crystal-Cramming.patch similarity index 100% rename from patches/server/0271-End-Crystal-Cramming.patch rename to patches/server/0272-End-Crystal-Cramming.patch diff --git a/patches/server/0272-Option-to-allow-beacon-effects-when-covered-by-tinte.patch b/patches/server/0273-Option-to-allow-beacon-effects-when-covered-by-tinte.patch similarity index 100% rename from patches/server/0272-Option-to-allow-beacon-effects-when-covered-by-tinte.patch rename to patches/server/0273-Option-to-allow-beacon-effects-when-covered-by-tinte.patch diff --git a/patches/server/0273-Add-attribute-clamping-and-armor-limit-config.patch b/patches/server/0274-Add-attribute-clamping-and-armor-limit-config.patch similarity index 100% rename from patches/server/0273-Add-attribute-clamping-and-armor-limit-config.patch rename to patches/server/0274-Add-attribute-clamping-and-armor-limit-config.patch diff --git a/patches/server/0274-Config-to-remove-explosion-radius-clamp.patch b/patches/server/0275-Config-to-remove-explosion-radius-clamp.patch similarity index 95% rename from patches/server/0274-Config-to-remove-explosion-radius-clamp.patch rename to patches/server/0275-Config-to-remove-explosion-radius-clamp.patch index 1e5ee2266..602b96919 100644 --- a/patches/server/0274-Config-to-remove-explosion-radius-clamp.patch +++ b/patches/server/0275-Config-to-remove-explosion-radius-clamp.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Config to remove explosion radius clamp diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java -index 4ce32603dcd691e018a3e1962311d2ac707439aa..d7cd063240a2799996cf7efa3f766ee748702db1 100644 +index 28eafd9b22b745a940b4465aae01cb738a2d7002..8dd513e3aa12bb5086d4eebe9a93c1f2ffb0b9eb 100644 --- a/src/main/java/net/minecraft/world/level/Explosion.java +++ b/src/main/java/net/minecraft/world/level/Explosion.java @@ -340,7 +340,7 @@ public class Explosion { diff --git a/patches/server/0275-bonemealable-sugarcane-cactus-and-netherwart.patch b/patches/server/0276-bonemealable-sugarcane-cactus-and-netherwart.patch similarity index 100% rename from patches/server/0275-bonemealable-sugarcane-cactus-and-netherwart.patch rename to patches/server/0276-bonemealable-sugarcane-cactus-and-netherwart.patch diff --git a/patches/server/0276-Add-PreExplodeEvents.patch b/patches/server/0277-Add-PreExplodeEvents.patch similarity index 100% rename from patches/server/0276-Add-PreExplodeEvents.patch rename to patches/server/0277-Add-PreExplodeEvents.patch diff --git a/patches/server/0277-Improve-output-of-plugins-command.patch b/patches/server/0278-Improve-output-of-plugins-command.patch similarity index 100% rename from patches/server/0277-Improve-output-of-plugins-command.patch rename to patches/server/0278-Improve-output-of-plugins-command.patch diff --git a/patches/server/0278-Make-GUI-Great-Again.patch b/patches/server/0279-Make-GUI-Great-Again.patch similarity index 100% rename from patches/server/0278-Make-GUI-Great-Again.patch rename to patches/server/0279-Make-GUI-Great-Again.patch diff --git a/patches/server/0279-Stored-Bee-API.patch b/patches/server/0280-Stored-Bee-API.patch similarity index 98% rename from patches/server/0279-Stored-Bee-API.patch rename to patches/server/0280-Stored-Bee-API.patch index 525c836e8..40c7a13e4 100644 --- a/patches/server/0279-Stored-Bee-API.patch +++ b/patches/server/0280-Stored-Bee-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Stored Bee API diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java -index d8efb00c325448d566c59418fe22268c6eb4cfce..f7a6ab35c95ffda73f17843916ddb624ad290b42 100644 +index 5e982bab268746a05b97f5b9f71422548ea12983..a9cff34c85e1907bcbca2b051289781484580a15 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java @@ -146,11 +146,33 @@ public class BeehiveBlockEntity extends BlockEntity { diff --git a/patches/server/0280-Shears-can-defuse-TNT.patch b/patches/server/0281-Shears-can-defuse-TNT.patch similarity index 100% rename from patches/server/0280-Shears-can-defuse-TNT.patch rename to patches/server/0281-Shears-can-defuse-TNT.patch diff --git a/patches/server/0281-Explorer-Map-API.patch b/patches/server/0282-Explorer-Map-API.patch similarity index 100% rename from patches/server/0281-Explorer-Map-API.patch rename to patches/server/0282-Explorer-Map-API.patch diff --git a/patches/server/0282-Option-Ocelot-Spawn-Under-Sea-Level.patch b/patches/server/0283-Option-Ocelot-Spawn-Under-Sea-Level.patch similarity index 100% rename from patches/server/0282-Option-Ocelot-Spawn-Under-Sea-Level.patch rename to patches/server/0283-Option-Ocelot-Spawn-Under-Sea-Level.patch diff --git a/patches/server/0283-add-an-option-for-piglins-to-ignore-gold-trimmed-arm.patch b/patches/server/0284-add-an-option-for-piglins-to-ignore-gold-trimmed-arm.patch similarity index 100% rename from patches/server/0283-add-an-option-for-piglins-to-ignore-gold-trimmed-arm.patch rename to patches/server/0284-add-an-option-for-piglins-to-ignore-gold-trimmed-arm.patch diff --git a/patches/server/0284-Add-option-for-always-showing-item-in-player-death-m.patch b/patches/server/0285-Add-option-for-always-showing-item-in-player-death-m.patch similarity index 97% rename from patches/server/0284-Add-option-for-always-showing-item-in-player-death-m.patch rename to patches/server/0285-Add-option-for-always-showing-item-in-player-death-m.patch index 09f7d07ed..4c26374a1 100644 --- a/patches/server/0284-Add-option-for-always-showing-item-in-player-death-m.patch +++ b/patches/server/0285-Add-option-for-always-showing-item-in-player-death-m.patch @@ -31,7 +31,7 @@ index d95d122601dd47a27e8d82a13b071919c360fe68..4a96d914f8aa6f0c5f13fc85369a311f } diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -index 111250146a1db4d0e2497c0dce0d9f0f1f298ab6..8c1b21f6bfb6d92cdd461c8ef7b2dd98b8f7db40 100644 +index ee62c418162f96f276c3c09db66d2df46e173a63..b720b291388d7dc9df62e45f9b3dd7d8a3d27f2b 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -571,4 +571,9 @@ public class PurpurConfig { diff --git a/patches/server/0285-place-end-crystal-on-any-block.patch b/patches/server/0286-place-end-crystal-on-any-block.patch similarity index 100% rename from patches/server/0285-place-end-crystal-on-any-block.patch rename to patches/server/0286-place-end-crystal-on-any-block.patch diff --git a/patches/server/0286-Add-option-to-disable-the-copper-oxidation-proximity.patch b/patches/server/0287-Add-option-to-disable-the-copper-oxidation-proximity.patch similarity index 100% rename from patches/server/0286-Add-option-to-disable-the-copper-oxidation-proximity.patch rename to patches/server/0287-Add-option-to-disable-the-copper-oxidation-proximity.patch diff --git a/patches/server/0287-register-minecraft-debug-commands.patch b/patches/server/0288-register-minecraft-debug-commands.patch similarity index 93% rename from patches/server/0287-register-minecraft-debug-commands.patch rename to patches/server/0288-register-minecraft-debug-commands.patch index ea689da3c..62b512fb0 100644 --- a/patches/server/0287-register-minecraft-debug-commands.patch +++ b/patches/server/0288-register-minecraft-debug-commands.patch @@ -5,7 +5,7 @@ Subject: [PATCH] register minecraft debug commands diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java -index 068a7d160cda08c5dc8b8c0f2f4185fdf8d97a5c..97ea831870c9312675c2acee170293a175ca6b51 100644 +index 8468452ff61f226b65be1dad21b627f2a178506e..f907150083ddabcf5be75730cbbca2259769ee7b 100644 --- a/src/main/java/net/minecraft/commands/Commands.java +++ b/src/main/java/net/minecraft/commands/Commands.java @@ -221,8 +221,8 @@ public class Commands { @@ -32,7 +32,7 @@ index 758fc5bc7465e6319bbbf06c2715655e491393ce..0f7d6da8685716604f0749d4f5b60730 io.papermc.paper.plugin.PluginInitializerManager.load(optionset); // Paper diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -index 8c1b21f6bfb6d92cdd461c8ef7b2dd98b8f7db40..7e1ffdf66be384e68c2ab005a1b439609e4a1a13 100644 +index b720b291388d7dc9df62e45f9b3dd7d8a3d27f2b..59d919908f8f12e74f811cf6c6f2e7e59e45361f 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -576,4 +576,9 @@ public class PurpurConfig { diff --git a/patches/server/0288-Configurable-villager-search-radius.patch b/patches/server/0289-Configurable-villager-search-radius.patch similarity index 100% rename from patches/server/0288-Configurable-villager-search-radius.patch rename to patches/server/0289-Configurable-villager-search-radius.patch diff --git a/patches/server/0289-option-to-make-ravagers-afraid-of-rabbits.patch b/patches/server/0290-option-to-make-ravagers-afraid-of-rabbits.patch similarity index 100% rename from patches/server/0289-option-to-make-ravagers-afraid-of-rabbits.patch rename to patches/server/0290-option-to-make-ravagers-afraid-of-rabbits.patch diff --git a/patches/server/0290-config-for-startup-commands.patch b/patches/server/0291-config-for-startup-commands.patch similarity index 93% rename from patches/server/0290-config-for-startup-commands.patch rename to patches/server/0291-config-for-startup-commands.patch index 188c141cf..a452e4b95 100644 --- a/patches/server/0290-config-for-startup-commands.patch +++ b/patches/server/0291-config-for-startup-commands.patch @@ -5,10 +5,10 @@ Subject: [PATCH] config for startup commands diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 0852e14cbb194bd524147ec443eb2791e9ecf3a6..b8628e9ab434feaae40c65f0fa016f6d57352f38 100644 +index 255c5e65523f3c82d8bbbebb5219fb161fe8e02a..5ac46bfce13cf408853ba7b6a786da252f791ecc 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1259,6 +1259,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop -Date: Thu, 18 Jul 2024 03:25:54 -0700 -Subject: [PATCH] re-add missing chunk api calls - - -diff --git a/src/main/java/ca/spottedleaf/moonrise/common/util/ChunkSystem.java b/src/main/java/ca/spottedleaf/moonrise/common/util/ChunkSystem.java -index 79ea42ff287beadb997d5d805a3d5faa6f80216a..96535983d1bdc3a9eb3b1646a4bf815b5726cf1d 100644 ---- a/src/main/java/ca/spottedleaf/moonrise/common/util/ChunkSystem.java -+++ b/src/main/java/ca/spottedleaf/moonrise/common/util/ChunkSystem.java -@@ -88,12 +88,14 @@ public final class ChunkSystem { - ((ChunkSystemServerLevel)((ServerLevel)chunk.getLevel())).moonrise$getLoadedChunks().add( - ((ChunkSystemLevelChunk)chunk).moonrise$getChunkAndHolder() - ); -+ chunk.loadCallback(); // Purpur - } - - public static void onChunkNotBorder(final LevelChunk chunk, final ChunkHolder holder) { - ((ChunkSystemServerLevel)((ServerLevel)chunk.getLevel())).moonrise$getLoadedChunks().remove( - ((ChunkSystemLevelChunk)chunk).moonrise$getChunkAndHolder() - ); -+ chunk.unloadCallback(); // Purpur - } - - public static void onChunkPostNotBorder(final LevelChunk chunk, final ChunkHolder holder) {