diff --git a/patches/unapplied/api/0031-Add-StructureGenerateEvent.patch b/patches/api/0031-Add-StructureGenerateEvent.patch similarity index 97% rename from patches/unapplied/api/0031-Add-StructureGenerateEvent.patch rename to patches/api/0031-Add-StructureGenerateEvent.patch index 122256b89..f228663db 100644 --- a/patches/unapplied/api/0031-Add-StructureGenerateEvent.patch +++ b/patches/api/0031-Add-StructureGenerateEvent.patch @@ -18,9 +18,27 @@ along with this program. If not, see . Co-authored-by: Mariell Hoversholm +diff --git a/src/main/java/org/bukkit/event/world/WorldEvent.java b/src/main/java/org/bukkit/event/world/WorldEvent.java +index cffeff33f007d3b03b7c862b25be453f705da739..1fa083d53dce161ef9e9f19407f230c94b2d7d15 100644 +--- a/src/main/java/org/bukkit/event/world/WorldEvent.java ++++ b/src/main/java/org/bukkit/event/world/WorldEvent.java +@@ -10,6 +10,13 @@ import org.jetbrains.annotations.NotNull; + public abstract class WorldEvent extends Event { + private final World world; + ++ // Purpur start ++ public WorldEvent(boolean isAsync, @NotNull final World world) { ++ super(isAsync); ++ this.world = world; ++ } ++ // Purpur end ++ + public WorldEvent(@NotNull final World world) { + this.world = world; + } diff --git a/src/main/java/org/purpurmc/purpur/event/world/StructureGenerateEvent.java b/src/main/java/org/purpurmc/purpur/event/world/StructureGenerateEvent.java new file mode 100644 -index 0000000000000000000000000000000000000000..e77f45f761368da9b230c425d975a717cf4d10fd +index 0000000000000000000000000000000000000000..c49d0da74f59e06176e616f80dffd65c918e1389 --- /dev/null +++ b/src/main/java/org/purpurmc/purpur/event/world/StructureGenerateEvent.java @@ -0,0 +1,68 @@ @@ -92,21 +110,3 @@ index 0000000000000000000000000000000000000000..e77f45f761368da9b230c425d975a717 + return handlers; + } +} -diff --git a/src/main/java/org/bukkit/event/world/WorldEvent.java b/src/main/java/org/bukkit/event/world/WorldEvent.java -index cffeff33f007d3b03b7c862b25be453f705da739..1fa083d53dce161ef9e9f19407f230c94b2d7d15 100644 ---- a/src/main/java/org/bukkit/event/world/WorldEvent.java -+++ b/src/main/java/org/bukkit/event/world/WorldEvent.java -@@ -10,6 +10,13 @@ import org.jetbrains.annotations.NotNull; - public abstract class WorldEvent extends Event { - private final World world; - -+ // Purpur start -+ public WorldEvent(boolean isAsync, @NotNull final World world) { -+ super(isAsync); -+ this.world = world; -+ } -+ // Purpur end -+ - public WorldEvent(@NotNull final World world) { - this.world = world; - } diff --git a/patches/api/0031-Conflict-on-change-for-adventure-deprecations.patch b/patches/api/0032-Conflict-on-change-for-adventure-deprecations.patch similarity index 100% rename from patches/api/0031-Conflict-on-change-for-adventure-deprecations.patch rename to patches/api/0032-Conflict-on-change-for-adventure-deprecations.patch diff --git a/patches/api/0032-Add-enchantment-target-for-bows-and-crossbows.patch b/patches/api/0033-Add-enchantment-target-for-bows-and-crossbows.patch similarity index 100% rename from patches/api/0032-Add-enchantment-target-for-bows-and-crossbows.patch rename to patches/api/0033-Add-enchantment-target-for-bows-and-crossbows.patch diff --git a/patches/api/0033-Iron-golem-poppy-calms-anger.patch b/patches/api/0034-Iron-golem-poppy-calms-anger.patch similarity index 100% rename from patches/api/0033-Iron-golem-poppy-calms-anger.patch rename to patches/api/0034-Iron-golem-poppy-calms-anger.patch diff --git a/patches/api/0034-API-for-any-mob-to-burn-daylight.patch b/patches/api/0035-API-for-any-mob-to-burn-daylight.patch similarity index 100% rename from patches/api/0034-API-for-any-mob-to-burn-daylight.patch rename to patches/api/0035-API-for-any-mob-to-burn-daylight.patch diff --git a/patches/api/0035-Flying-Fall-Damage-API.patch b/patches/api/0036-Flying-Fall-Damage-API.patch similarity index 100% rename from patches/api/0035-Flying-Fall-Damage-API.patch rename to patches/api/0036-Flying-Fall-Damage-API.patch diff --git a/patches/api/0036-Add-back-player-spawned-endermite-API.patch b/patches/api/0037-Add-back-player-spawned-endermite-API.patch similarity index 100% rename from patches/api/0036-Add-back-player-spawned-endermite-API.patch rename to patches/api/0037-Add-back-player-spawned-endermite-API.patch diff --git a/patches/api/0037-Fix-default-permission-system.patch b/patches/api/0038-Fix-default-permission-system.patch similarity index 100% rename from patches/api/0037-Fix-default-permission-system.patch rename to patches/api/0038-Fix-default-permission-system.patch diff --git a/patches/api/0038-Summoner-API.patch b/patches/api/0039-Summoner-API.patch similarity index 100% rename from patches/api/0038-Summoner-API.patch rename to patches/api/0039-Summoner-API.patch diff --git a/patches/api/0039-Clean-up-version-command-output-for-console.patch b/patches/api/0040-Clean-up-version-command-output-for-console.patch similarity index 100% rename from patches/api/0039-Clean-up-version-command-output-for-console.patch rename to patches/api/0040-Clean-up-version-command-output-for-console.patch diff --git a/patches/api/0040-Add-force-and-prompt-parameters-to-resource-pack-api.patch b/patches/api/0041-Add-force-and-prompt-parameters-to-resource-pack-api.patch similarity index 100% rename from patches/api/0040-Add-force-and-prompt-parameters-to-resource-pack-api.patch rename to patches/api/0041-Add-force-and-prompt-parameters-to-resource-pack-api.patch diff --git a/patches/api/0041-Extended-OfflinePlayer-API.patch b/patches/api/0042-Extended-OfflinePlayer-API.patch similarity index 100% rename from patches/api/0041-Extended-OfflinePlayer-API.patch rename to patches/api/0042-Extended-OfflinePlayer-API.patch diff --git a/patches/api/0042-Added-the-ability-to-add-combustible-items.patch b/patches/api/0043-Added-the-ability-to-add-combustible-items.patch similarity index 95% rename from patches/api/0042-Added-the-ability-to-add-combustible-items.patch rename to patches/api/0043-Added-the-ability-to-add-combustible-items.patch index dbcd994dd..38a395ae5 100644 --- a/patches/api/0042-Added-the-ability-to-add-combustible-items.patch +++ b/patches/api/0043-Added-the-ability-to-add-combustible-items.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Added the ability to add combustible items diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 167d8fa9f8cb5ee67149da3b9b63c613668f20b0..cdfda28119cb1c1f22ec42a37546413b3e4af8da 100644 +index 4ef8c75df64e670c55f13efaa69651fd636d5f12..c98794dff18890fc2fe964238e06c0e20e58750f 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -2139,5 +2139,24 @@ public final class Bukkit { diff --git a/patches/unapplied/server/0139-Add-StructureGenerateEvent.patch b/patches/server/0139-Add-StructureGenerateEvent.patch similarity index 67% rename from patches/unapplied/server/0139-Add-StructureGenerateEvent.patch rename to patches/server/0139-Add-StructureGenerateEvent.patch index 378abd851..c41be0bc3 100644 --- a/patches/unapplied/server/0139-Add-StructureGenerateEvent.patch +++ b/patches/server/0139-Add-StructureGenerateEvent.patch @@ -19,22 +19,21 @@ along with this program. If not, see . Co-authored-by: Mariell Hoversholm diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java -index f8a2aa31e38f64f88a82d5a388b58f1962d5fda0..b98f05c32d81195e779701d90d30f345c9695cbf 100644 +index e4591c0b3c8547cc6f4e2a0891fc378ee4334d9e..11b0697f668f6c0965a74081c149585fdf49b209 100644 --- a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java +++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java -@@ -454,7 +454,14 @@ public abstract class ChunkGenerator implements BiomeManager.NoiseBiomeSource { - - if (structuresettingsfeature != null) { - StructureStart structurestart = structureAccessor.getStartForFeature(sectionposition, StructureFeature.STRONGHOLD, chunk); -- -+ // Purpur start -+ if (new org.purpurmc.purpur.event.world.StructureGenerateEvent( -+ structureAccessor.getWorld().getWorld(), -+ org.bukkit.StructureType.getStructureTypes().get(structurestart.getFeature().getFeatureName().toLowerCase()), -+ chunkcoordintpair.x, -+ chunkcoordintpair.z -+ ).callEvent()) -+ // Purpur end +@@ -458,6 +458,14 @@ public abstract class ChunkGenerator implements BiomeManager.NoiseBiomeSource { if (structurestart == null || !structurestart.isValid()) { StructureStart structurestart1 = StructureFeatures.STRONGHOLD.generate(registryManager, this, this.biomeSource, structureManager, worldSeed, chunkcoordintpair, ChunkGenerator.fetchReferences(structureAccessor, chunk, sectionposition, StructureFeature.STRONGHOLD), structuresettingsfeature, chunk, ChunkGenerator::validStrongholdBiome); ++ // Purpur start ++ if (new org.purpurmc.purpur.event.world.StructureGenerateEvent( ++ structureAccessor.getWorld().getWorld(), ++ org.bukkit.StructureType.getStructureTypes().get(structurestart1.getFeature().getFeatureName().toLowerCase()), ++ chunkcoordintpair.x, ++ chunkcoordintpair.z ++ ).callEvent()) ++ // Purpur end + structureAccessor.setStartForFeature(sectionposition, StructureFeature.STRONGHOLD, structurestart1, chunk); + } + } diff --git a/patches/server/0139-Fix-stuck-in-portals.patch b/patches/server/0140-Fix-stuck-in-portals.patch similarity index 94% rename from patches/server/0139-Fix-stuck-in-portals.patch rename to patches/server/0140-Fix-stuck-in-portals.patch index edddbadf1..fa16ca6dd 100644 --- a/patches/server/0139-Fix-stuck-in-portals.patch +++ b/patches/server/0140-Fix-stuck-in-portals.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix stuck in portals diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index dd186ad2080d358ee1ed5c8ac6725a9e3dcaeb39..8b2280d29c41879b26c85d1b0c1ac52f8b7bfacd 100644 +index 67a9f4d394372b229a42f54344590b02439bb260..0d58442a23793c0e0d70a2caf16736b5fba8879f 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1171,6 +1171,7 @@ public class ServerPlayer extends Player { @@ -37,7 +37,7 @@ index 1428e4f1aa8262ff33c789c419451ecef192116f..197326d2831f804620fbfe289a1617ec this.isInsidePortal = true; diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 4c65643e508d4c80a3e8f76d7f7fd1f128bd646f..2840cea2cb04cc011f7670fccd29cea8dc861d6d 100644 +index 1b557f300fb895df5358d9a9c3a6b14661ca66b8..f1f4eda3adb8ef19958472558e91c585b9646c6b 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -297,6 +297,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0140-Toggle-for-water-sensitive-mob-damage.patch b/patches/server/0141-Toggle-for-water-sensitive-mob-damage.patch similarity index 96% rename from patches/server/0140-Toggle-for-water-sensitive-mob-damage.patch rename to patches/server/0141-Toggle-for-water-sensitive-mob-damage.patch index 719064037..b8f2cb138 100644 --- a/patches/server/0140-Toggle-for-water-sensitive-mob-damage.patch +++ b/patches/server/0141-Toggle-for-water-sensitive-mob-damage.patch @@ -21,7 +21,7 @@ index ca2bf36120ba09ed27ad7b1064431f9feffa3420..2feec97ffe62cfe063085e3767937e8a @Override diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java -index 95c765ce622da83cfdff655ca746468fce37a491..d1fba8937127d40df87b3e243697cc83936610d8 100644 +index 33868c78d5e435230cbfdfcf01795c82411ac7c7..2d20c36149433304aa420f66c39a66caddb8ed19 100644 --- a/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java @@ -868,7 +868,7 @@ public abstract class Mob extends LivingEntity { @@ -34,7 +34,7 @@ index 95c765ce622da83cfdff655ca746468fce37a491..d1fba8937127d40df87b3e243697cc83 } return; diff --git a/src/main/java/net/minecraft/world/entity/ambient/Bat.java b/src/main/java/net/minecraft/world/entity/ambient/Bat.java -index 3e957f4f983e337219b4eed31134f08357b4cb05..518080c1ebb5847081036dbf32d994cea0d95bb3 100644 +index aaf18021fe4e37d4ff3b04390268c18c47232f06..a97038d02d2edeb52c555457469467efa77d13df 100644 --- a/src/main/java/net/minecraft/world/entity/ambient/Bat.java +++ b/src/main/java/net/minecraft/world/entity/ambient/Bat.java @@ -95,6 +95,11 @@ public class Bat extends AmbientCreature { @@ -50,7 +50,7 @@ index 3e957f4f983e337219b4eed31134f08357b4cb05..518080c1ebb5847081036dbf32d994ce @Override diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java -index 5fafd26e77f100cf94bf16f05fa09276bdd56136..69511e218f9e1fa0c334023aed13337907cee875 100644 +index b7d6d88aa9f60090b88ac35084b9810b6fef0cfa..0f3848287798dcaa57a99b531202e23fe8d05744 100644 --- a/src/main/java/net/minecraft/world/entity/animal/Bee.java +++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java @@ -220,6 +220,11 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal { @@ -66,7 +66,7 @@ index 5fafd26e77f100cf94bf16f05fa09276bdd56136..69511e218f9e1fa0c334023aed133379 @Override diff --git a/src/main/java/net/minecraft/world/entity/animal/Cat.java b/src/main/java/net/minecraft/world/entity/animal/Cat.java -index bc088e237e6f1f2a4cde766b7586a621f1cb54e2..d6f50d524cd00fb54dd987cc9a9c560766a12553 100644 +index 7d1e22f3c6eb5462d07027b3a2890b07667ddc46..bbada6ca16146eae026ae5ca63372970799815b8 100644 --- a/src/main/java/net/minecraft/world/entity/animal/Cat.java +++ b/src/main/java/net/minecraft/world/entity/animal/Cat.java @@ -150,6 +150,11 @@ public class Cat extends TamableAnimal { @@ -82,7 +82,7 @@ index bc088e237e6f1f2a4cde766b7586a621f1cb54e2..d6f50d524cd00fb54dd987cc9a9c5607 public ResourceLocation getResourceLocation() { diff --git a/src/main/java/net/minecraft/world/entity/animal/Chicken.java b/src/main/java/net/minecraft/world/entity/animal/Chicken.java -index 249e01f0be9aeeed764bd102b7a9fa4ca9e7b473..c57fef58dc33c8568047114a3486e4a9fe9523d0 100644 +index 0b1ba6f25d13296fbcd6a2aee3b7ab5edbf4b22a..eb3678d3a23d1eddc09b8032564235e101d56166 100644 --- a/src/main/java/net/minecraft/world/entity/animal/Chicken.java +++ b/src/main/java/net/minecraft/world/entity/animal/Chicken.java @@ -75,6 +75,11 @@ public class Chicken extends Animal { @@ -114,7 +114,7 @@ index f772c60ab5b4ac5468483d9765386b9b72ad8d0f..82fdce04fe3867016d1b5e24df52a550 @Override diff --git a/src/main/java/net/minecraft/world/entity/animal/Cow.java b/src/main/java/net/minecraft/world/entity/animal/Cow.java -index 95ef459c804e9aff02c80cd31612185096413cd0..fa3bbdd27de6382904588213022191a52d9758a0 100644 +index 2c838d71105d2b88934efd154c7ec69a7ba47681..7042b95e92520c5e152af0fa71a553122ec814df 100644 --- a/src/main/java/net/minecraft/world/entity/animal/Cow.java +++ b/src/main/java/net/minecraft/world/entity/animal/Cow.java @@ -62,6 +62,11 @@ public class Cow extends Animal { @@ -130,7 +130,7 @@ index 95ef459c804e9aff02c80cd31612185096413cd0..fa3bbdd27de6382904588213022191a5 @Override diff --git a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java -index 27747e712a5964b43a7fe1d11165740b38e58dd6..591573926eb1358ef82e9e5418be0f1d4ba663cb 100644 +index ea0fb3b032a86223bfdee05a56baa15abfbe5d38..49e5a753aae7d72102ee700f3d8309f2f488cc12 100644 --- a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java +++ b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java @@ -153,6 +153,11 @@ public class Dolphin extends WaterAnimal { @@ -146,7 +146,7 @@ index 27747e712a5964b43a7fe1d11165740b38e58dd6..591573926eb1358ef82e9e5418be0f1d @Nullable diff --git a/src/main/java/net/minecraft/world/entity/animal/Fox.java b/src/main/java/net/minecraft/world/entity/animal/Fox.java -index 1daccbc51b6ec635130932995350eb0de8abe0a3..eb4bdf6f77c8427527c06843982da5159711973c 100644 +index d667159664c05e4e45fe3c22a52f5e228a91409a..f409215a99d6d0d2eda35173d1be762b11e96441 100644 --- a/src/main/java/net/minecraft/world/entity/animal/Fox.java +++ b/src/main/java/net/minecraft/world/entity/animal/Fox.java @@ -182,6 +182,11 @@ public class Fox extends Animal { @@ -162,7 +162,7 @@ index 1daccbc51b6ec635130932995350eb0de8abe0a3..eb4bdf6f77c8427527c06843982da515 @Override diff --git a/src/main/java/net/minecraft/world/entity/animal/IronGolem.java b/src/main/java/net/minecraft/world/entity/animal/IronGolem.java -index 6d1c077066dfe910b56b4882fd0b5005b56b9bd2..c96289cc4bf5731862849f491a2049a41c768eed 100644 +index 945a07babd8860c912c8aca1555c09922d5feaf3..52cc0df083d5a4685fd00f7db0d92b277fb0c994 100644 --- a/src/main/java/net/minecraft/world/entity/animal/IronGolem.java +++ b/src/main/java/net/minecraft/world/entity/animal/IronGolem.java @@ -85,6 +85,11 @@ public class IronGolem extends AbstractGolem implements NeutralMob { @@ -194,7 +194,7 @@ index 8fb2f77571370c80dbafdf5c9a3c57c83a9fbd42..467e5bc4e9262fc331bb88f02e3b26f9 @Override diff --git a/src/main/java/net/minecraft/world/entity/animal/Ocelot.java b/src/main/java/net/minecraft/world/entity/animal/Ocelot.java -index e5ad9c33f21920f434647e4f632adbaa29182efa..e0a930e059f9551be786277449cdcd9241580b2a 100644 +index 4bf4403cb65b8e1fee9c253c7932ad839a99c92e..97d4caad92a2b54daff12e4909bc7b041ba99094 100644 --- a/src/main/java/net/minecraft/world/entity/animal/Ocelot.java +++ b/src/main/java/net/minecraft/world/entity/animal/Ocelot.java @@ -89,6 +89,11 @@ public class Ocelot extends Animal { @@ -210,7 +210,7 @@ index e5ad9c33f21920f434647e4f632adbaa29182efa..e0a930e059f9551be786277449cdcd92 public boolean isTrusting() { diff --git a/src/main/java/net/minecraft/world/entity/animal/Panda.java b/src/main/java/net/minecraft/world/entity/animal/Panda.java -index a02562550d9392eb9105ad8b63d7adfc7a6234ea..8a8a6fad2eeed14deb18138b66f68276cf1884bd 100644 +index a3f04f6b4df1c7d8759addecaa4ea16e08b456f5..6270c4bad2c4f4f2770bc2cc2688de5ddd18dae4 100644 --- a/src/main/java/net/minecraft/world/entity/animal/Panda.java +++ b/src/main/java/net/minecraft/world/entity/animal/Panda.java @@ -137,6 +137,11 @@ public class Panda extends Animal { @@ -226,7 +226,7 @@ index a02562550d9392eb9105ad8b63d7adfc7a6234ea..8a8a6fad2eeed14deb18138b66f68276 @Override diff --git a/src/main/java/net/minecraft/world/entity/animal/Parrot.java b/src/main/java/net/minecraft/world/entity/animal/Parrot.java -index 7441dbdc630a4ea80aed18a622bc061eb91579a5..5064673a78a6bc5cb8b8973d451946239cd995a0 100644 +index a5e6a6271b88ff16914c5d1d067552b36af0772a..cb25e36052934c2442fed8e32578915aef3b8074 100644 --- a/src/main/java/net/minecraft/world/entity/animal/Parrot.java +++ b/src/main/java/net/minecraft/world/entity/animal/Parrot.java @@ -191,6 +191,11 @@ public class Parrot extends ShoulderRidingEntity implements FlyingAnimal { @@ -242,7 +242,7 @@ index 7441dbdc630a4ea80aed18a622bc061eb91579a5..5064673a78a6bc5cb8b8973d45194623 @Nullable diff --git a/src/main/java/net/minecraft/world/entity/animal/Pig.java b/src/main/java/net/minecraft/world/entity/animal/Pig.java -index 454f683bc339f65605b212ba9a64fcc123c0ca67..ebe769f29a03776bffc655fe7b29598eee891eee 100644 +index 998cfee2bb20ed4536843a7bb56d9e346665f612..5aa57ce71c401e47c361dc8b74ac241a1732aede 100644 --- a/src/main/java/net/minecraft/world/entity/animal/Pig.java +++ b/src/main/java/net/minecraft/world/entity/animal/Pig.java @@ -84,6 +84,11 @@ public class Pig extends Animal implements ItemSteerable, Saddleable { @@ -258,7 +258,7 @@ index 454f683bc339f65605b212ba9a64fcc123c0ca67..ebe769f29a03776bffc655fe7b29598e @Override diff --git a/src/main/java/net/minecraft/world/entity/animal/PolarBear.java b/src/main/java/net/minecraft/world/entity/animal/PolarBear.java -index 00ea9461c1ce55d3219b3829990b0a77434c83e1..e1dbd1acb5e62281190fe2ce20f35ac88e6d24db 100644 +index 9b3870ad371e2c7df1587479291fd821c3e9ee4a..288de9480635f0df718596ff73e69101e164fc61 100644 --- a/src/main/java/net/minecraft/world/entity/animal/PolarBear.java +++ b/src/main/java/net/minecraft/world/entity/animal/PolarBear.java @@ -120,6 +120,11 @@ public class PolarBear extends Animal implements NeutralMob { @@ -290,7 +290,7 @@ index 654ad8cd11bc11432811ed7408c0ce9b473a3245..5d8a01df7b86f1a23b30ed67b27ebde7 @Override diff --git a/src/main/java/net/minecraft/world/entity/animal/Rabbit.java b/src/main/java/net/minecraft/world/entity/animal/Rabbit.java -index d7fbe9322ae22274c37e8b36500d993eab5bf397..2a6fa3435995a72d0241d5339b4fcc3dbff3b544 100644 +index a65e2addade6b7e5ad47d0f7d25ebc1790b7329f..59286f143f7ffcaf4da5bad4a0990cf437d53fdb 100644 --- a/src/main/java/net/minecraft/world/entity/animal/Rabbit.java +++ b/src/main/java/net/minecraft/world/entity/animal/Rabbit.java @@ -140,6 +140,11 @@ public class Rabbit extends Animal { @@ -322,7 +322,7 @@ index e42bdde7947e532a3a5517c874411a39132bb73e..04bf6f321e39821bae2d1871c54e304c @Override diff --git a/src/main/java/net/minecraft/world/entity/animal/Sheep.java b/src/main/java/net/minecraft/world/entity/animal/Sheep.java -index 7d3a8324eabe65c7ca89be0ad954a6fad5983b84..1ab9c27a7bc6879e011d3a4e05f19a48fe7c0a9f 100644 +index efd416c472815cc0fea0bebc3db2588a4012036b..1d80303243da8a945c3866291e3a1a196245a0db 100644 --- a/src/main/java/net/minecraft/world/entity/animal/Sheep.java +++ b/src/main/java/net/minecraft/world/entity/animal/Sheep.java @@ -136,6 +136,11 @@ public class Sheep extends Animal implements Shearable { @@ -338,7 +338,7 @@ index 7d3a8324eabe65c7ca89be0ad954a6fad5983b84..1ab9c27a7bc6879e011d3a4e05f19a48 @Override diff --git a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java -index af4db007807d94888fa945d9d43785b74bee2b67..d457978c0345aa51c03880cf87a08494b2e117c5 100644 +index 0c22b4502be1bf886307ad9b35c49ca617c28dbb..9581dccfd671d89d296d3b07fb45a0234d110395 100644 --- a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java +++ b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java @@ -111,7 +111,7 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM @@ -351,7 +351,7 @@ index af4db007807d94888fa945d9d43785b74bee2b67..d457978c0345aa51c03880cf87a08494 @Override diff --git a/src/main/java/net/minecraft/world/entity/animal/Squid.java b/src/main/java/net/minecraft/world/entity/animal/Squid.java -index 9a99904bd761df5861f68533279ebde39644b4f8..0d64c2de83ff0e6d874adb7698ca439202bf2c0f 100644 +index d4e1e0117ce9105452679d64779086b8408fb83c..7397d04b3fabca1f6d32adc571f56d2ad8fed751 100644 --- a/src/main/java/net/minecraft/world/entity/animal/Squid.java +++ b/src/main/java/net/minecraft/world/entity/animal/Squid.java @@ -91,6 +91,11 @@ public class Squid extends WaterAnimal { @@ -383,7 +383,7 @@ index 2de2dc96b7f5960d4cef3184c14409e0868158cd..cbe50aacc9279d147d25775b3855c3a8 public static String getPredefinedName(int variant) { diff --git a/src/main/java/net/minecraft/world/entity/animal/Turtle.java b/src/main/java/net/minecraft/world/entity/animal/Turtle.java -index 76657c68577030f65ce87036c12149c4eccf4908..5fb58a80ac5a6f6ec7779ccad4cff7356cae087c 100644 +index 0aec4ed51072948b9257e9d4b07eed92d95d902f..29749815ef26c7e956d6e773037554893e82284d 100644 --- a/src/main/java/net/minecraft/world/entity/animal/Turtle.java +++ b/src/main/java/net/minecraft/world/entity/animal/Turtle.java @@ -106,6 +106,11 @@ public class Turtle extends Animal { @@ -399,7 +399,7 @@ index 76657c68577030f65ce87036c12149c4eccf4908..5fb58a80ac5a6f6ec7779ccad4cff735 public void setHomePos(BlockPos 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 a669a00d68807ed451a1b0def7a92e17ffb7bee1..b039cbbcc33a6b1925d1cf4339018219ceb6c2ad 100644 +index 20e0e74d7e43f436172ca7b4cb8b613ba116f9ec..663683a50f7a1125f406b6ec8bf7a0419be5f36a 100644 --- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java +++ b/src/main/java/net/minecraft/world/entity/animal/Wolf.java @@ -199,6 +199,11 @@ public class Wolf extends TamableAnimal implements NeutralMob { @@ -415,7 +415,7 @@ index a669a00d68807ed451a1b0def7a92e17ffb7bee1..b039cbbcc33a6b1925d1cf4339018219 @Override diff --git a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java -index 7afe0e3a91b3b88da2b5ab034a45163880ff12bf..476973760b8ef18332cde3e878c28ff4c3b72058 100644 +index 4020f631f4f02834550a60630d5d429004d71269..d0edbad76a749163f77723547001e59352654e12 100644 --- a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java +++ b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java @@ -116,6 +116,11 @@ public class Axolotl extends Animal implements LerpingModel, Bucketable { @@ -479,7 +479,7 @@ index 2c5cb1b759a0b6e0233345da5a968288ec338837..16755249c4700fa59f704b7c88e3490d @Override diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java -index 4108202537f9f150e2a65427f3d71765783f835c..d0016761c124a4d593b18006efa18757ad385ab0 100644 +index a13ccd308277fbead585cf452f65e4b30a00fa8a..81957c9daa27682ee701092e207d72166e159382 100644 --- a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java +++ b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java @@ -129,6 +129,11 @@ public class Llama extends AbstractChestedHorse implements RangedAttackMob { @@ -559,7 +559,7 @@ index b6d9ba8dd5694952ca2eba54726ac5e587175250..88da7a365c28e2d097d0a7bff30ea1ac public static AttributeSupplier.Builder createAttributes() { diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java -index 6ba83c938456dc79c8cd948ae981c6f2e93702ae..ed1c473ef80202b3aa4996b5acb9728857eaec8c 100644 +index f237bcff01e4102f68663bbaa1254bbd5b98ee0c..618b8fe6fcf71c58c297b7d918e6c74de6077331 100644 --- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java +++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java @@ -159,6 +159,11 @@ public class EnderDragon extends Mob implements Enemy { @@ -575,7 +575,7 @@ index 6ba83c938456dc79c8cd948ae981c6f2e93702ae..ed1c473ef80202b3aa4996b5acb97288 public static AttributeSupplier.Builder createAttributes() { diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java -index 86cd0a6d42a232ad81e0593f3b5b23c97d20db39..29351213075a26b5beefeeba012d05fc9c986696 100644 +index cf36bf3067f86572ffb75c2a155dbfc8e3750a12..3b752f97f75c78657f37215ecd92b7460a71f090 100644 --- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java +++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java @@ -218,6 +218,11 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob @@ -591,7 +591,7 @@ index 86cd0a6d42a232ad81e0593f3b5b23c97d20db39..29351213075a26b5beefeeba012d05fc @Override diff --git a/src/main/java/net/minecraft/world/entity/monster/Blaze.java b/src/main/java/net/minecraft/world/entity/monster/Blaze.java -index b1f82e0ce34081ac9d928f42d9ffbbfd507b4ca9..1f0dee90f706cad373286c185af3a8234edacf4a 100644 +index 0075e2dd67c58bed30bfec1707291a1d92b13537..e9d540984b9bb7fab563b81f6d28aa85c90402e9 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Blaze.java +++ b/src/main/java/net/minecraft/world/entity/monster/Blaze.java @@ -138,7 +138,7 @@ public class Blaze extends Monster { @@ -620,7 +620,7 @@ index 45b53f11b52cc161775fcaa18567e4a74c5e71b8..58d11054bd62338a8b6959663420d286 @Override 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 d06bba26db491950588d8b7ef356156663972e4f..f6a8d026c2380b9d7ec3121c7e144c6f19f5323c 100644 +index 8ac278f8e55ad7a090ad332db2da1e1eaef0db4d..cf8b4f538ee2df715162adc460c6e8e58b50ba52 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java +++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java @@ -146,6 +146,11 @@ public class Creeper extends Monster implements PowerableMob { @@ -636,7 +636,7 @@ index d06bba26db491950588d8b7ef356156663972e4f..f6a8d026c2380b9d7ec3121c7e144c6f @Override diff --git a/src/main/java/net/minecraft/world/entity/monster/Drowned.java b/src/main/java/net/minecraft/world/entity/monster/Drowned.java -index c4eeeec1ff1963263459d29b7a7babd2ea8293e4..bd209089f0730674f811d96bdbe7915d6a857729 100644 +index 02c8fd96d11e3a27b5fddb27d65fddffd157fb52..4d2bb12b8168fceae71622a9f8bd5102d0024208 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Drowned.java +++ b/src/main/java/net/minecraft/world/entity/monster/Drowned.java @@ -104,6 +104,11 @@ public class Drowned extends Zombie implements RangedAttackMob { @@ -668,7 +668,7 @@ index e25374b06e3babd93cd5bbdd58ea401a92dbb001..0aa4d8e506462cfe6fb69414a30cc5eb public static AttributeSupplier.Builder createAttributes() { diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java -index be620f9f305aad756bb5b932764aaf24baebda55..a0b347f9daf5e8cf28ec3e308b639d5200c276dd 100644 +index 188c56ac98e88507f09f8603970ba2238629b8e3..b050f2d16a6aed98654f51fa4ede496a0be07b45 100644 --- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java +++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java @@ -293,7 +293,7 @@ public class EnderMan extends Monster implements NeutralMob { @@ -681,7 +681,7 @@ index be620f9f305aad756bb5b932764aaf24baebda55..a0b347f9daf5e8cf28ec3e308b639d52 @Override diff --git a/src/main/java/net/minecraft/world/entity/monster/Endermite.java b/src/main/java/net/minecraft/world/entity/monster/Endermite.java -index d5c8cba1c443681e8bf81db1298ea24c954b1136..680a9cfc79c7b9d012f68142980ff32b9fb9f228 100644 +index 16755569f1f2ea7cf6bfe52c279d8e192b9d0098..de422b384f5bd5ddc09229a3fc846aeb7176c07c 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Endermite.java +++ b/src/main/java/net/minecraft/world/entity/monster/Endermite.java @@ -51,6 +51,11 @@ public class Endermite extends Monster { @@ -697,7 +697,7 @@ index d5c8cba1c443681e8bf81db1298ea24c954b1136..680a9cfc79c7b9d012f68142980ff32b @Override diff --git a/src/main/java/net/minecraft/world/entity/monster/Evoker.java b/src/main/java/net/minecraft/world/entity/monster/Evoker.java -index e55cc17687247de4817939cd2d73ef667d946ca3..a38c2b27d2d0f5a8cef8e9ff0a914f2e88aaad87 100644 +index f0f8d81539ce6a5d0b84488b6dc15fe53e0b1083..1f5aa1980b49b36900d515dc57696a4bc22267d0 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Evoker.java +++ b/src/main/java/net/minecraft/world/entity/monster/Evoker.java @@ -62,6 +62,11 @@ public class Evoker extends SpellcasterIllager { @@ -713,7 +713,7 @@ index e55cc17687247de4817939cd2d73ef667d946ca3..a38c2b27d2d0f5a8cef8e9ff0a914f2e @Override diff --git a/src/main/java/net/minecraft/world/entity/monster/Ghast.java b/src/main/java/net/minecraft/world/entity/monster/Ghast.java -index 93bd5c9fa3356d8d8575e109130fffb2fa4334c5..d8bc592ea8265411dbb19f18cd99920e866ef187 100644 +index bfb413af45d30d99c762f9b0c52f60c3ef000106..753227f5eb9c944e708aafb5247202aa5e4e729f 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Ghast.java +++ b/src/main/java/net/minecraft/world/entity/monster/Ghast.java @@ -76,6 +76,11 @@ public class Ghast extends FlyingMob implements Enemy { @@ -729,7 +729,7 @@ index 93bd5c9fa3356d8d8575e109130fffb2fa4334c5..d8bc592ea8265411dbb19f18cd99920e @Override diff --git a/src/main/java/net/minecraft/world/entity/monster/Giant.java b/src/main/java/net/minecraft/world/entity/monster/Giant.java -index 91e28c414545d2bbb4e2f22c516d0f683e8b04ec..10a351c5efd5cf8f73078dcb268468e7b2058d2d 100644 +index de7c2064b2c3876eebdee01908b39b1beb9701b6..c2d39a4a4d0bddc38accd31772a2fd7926b6e08c 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Giant.java +++ b/src/main/java/net/minecraft/world/entity/monster/Giant.java @@ -102,6 +102,11 @@ public class Giant extends Monster { @@ -745,7 +745,7 @@ index 91e28c414545d2bbb4e2f22c516d0f683e8b04ec..10a351c5efd5cf8f73078dcb268468e7 @Override diff --git a/src/main/java/net/minecraft/world/entity/monster/Guardian.java b/src/main/java/net/minecraft/world/entity/monster/Guardian.java -index 170b5b4e3d023950c1c0a8e5d383ab5e5e888424..ddbbc4118079b88f5e4f804f52fa903633bda9b1 100644 +index 7747493846e7d9c5c65d5976519144a6db9bd3e0..0675c018bbf4eb0947350737b41de4e56410520e 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Guardian.java +++ b/src/main/java/net/minecraft/world/entity/monster/Guardian.java @@ -92,6 +92,11 @@ public class Guardian extends Monster { @@ -777,7 +777,7 @@ index 7bb8ef0bb2de9a0b0d5048f8a4089835c41de568..5458ac83fa555e22ca858f4f596ebb8f public static boolean checkHuskSpawnRules(EntityType type, ServerLevelAccessor world, MobSpawnType spawnReason, BlockPos pos, Random random) { diff --git a/src/main/java/net/minecraft/world/entity/monster/Illusioner.java b/src/main/java/net/minecraft/world/entity/monster/Illusioner.java -index dfcaad2d90abd2ce6f4a3a340ac205ce70c061e1..c9bfed1721e0b933e13f1d4c7a61215230bb18c9 100644 +index 4ed0fb155dfae60cee24dc0752fa525c90f2f442..322058dbb82888c70bf770bed58356dc07839188 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Illusioner.java +++ b/src/main/java/net/minecraft/world/entity/monster/Illusioner.java @@ -76,6 +76,11 @@ public class Illusioner extends SpellcasterIllager implements RangedAttackMob { @@ -809,7 +809,7 @@ index 68abf045f0510abc45bdc2fd8c147f27c2fa784d..cd6b136960b2c37c6e6d56c4e5f7fd30 public static AttributeSupplier.Builder createAttributes() { diff --git a/src/main/java/net/minecraft/world/entity/monster/Phantom.java b/src/main/java/net/minecraft/world/entity/monster/Phantom.java -index c3fde22e1cf98881da66e70870ced65f0ce0abc3..5cf1d412c248a558b53b99ffede96ead5579f51c 100644 +index 94e034916df2626652cb6bfb05f0d5557c7b4803..943d3e6db3212372b4ba8be35e15397f5b8c8a79 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java +++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java @@ -136,6 +136,11 @@ public class Phantom extends FlyingMob implements Enemy { @@ -825,7 +825,7 @@ index c3fde22e1cf98881da66e70870ced65f0ce0abc3..5cf1d412c248a558b53b99ffede96ead @Override diff --git a/src/main/java/net/minecraft/world/entity/monster/Pillager.java b/src/main/java/net/minecraft/world/entity/monster/Pillager.java -index 466c3e33d48223f6a94c018036b992d7aa57dc6c..a089ccc5312bf3b2d78d701c1d9b2b42f8a87e7b 100644 +index 2c7155f2b3c29ff1f777ff6b6d0b19ef922614ae..4c98060c8edcd58bcd957dee54ebba5d03b62546 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Pillager.java +++ b/src/main/java/net/minecraft/world/entity/monster/Pillager.java @@ -78,6 +78,11 @@ public class Pillager extends AbstractIllager implements CrossbowAttackMob, Inve @@ -841,7 +841,7 @@ index 466c3e33d48223f6a94c018036b992d7aa57dc6c..a089ccc5312bf3b2d78d701c1d9b2b42 @Override diff --git a/src/main/java/net/minecraft/world/entity/monster/Ravager.java b/src/main/java/net/minecraft/world/entity/monster/Ravager.java -index 5eb9e19531c5c996dd669f6e430b0dfb3d94928a..d3df45f7dbb688b56f03a4174e6311f83b437e18 100644 +index a9681016023be8586268a366914273334e3e7f9e..bb4b50e64908f54d84182208f5d605db20d1456d 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Ravager.java +++ b/src/main/java/net/minecraft/world/entity/monster/Ravager.java @@ -90,6 +90,11 @@ public class Ravager extends Raider { @@ -857,7 +857,7 @@ index 5eb9e19531c5c996dd669f6e430b0dfb3d94928a..d3df45f7dbb688b56f03a4174e6311f8 @Override diff --git a/src/main/java/net/minecraft/world/entity/monster/Shulker.java b/src/main/java/net/minecraft/world/entity/monster/Shulker.java -index 30eafae391ff5447cd9f61212798a54b026956c4..e463a4b40dbaed9c2d4e29d18cba98e47af3df3c 100644 +index db381e7fd6f4fb8d4b30800821a8fdf9c6dba63c..0cef642b6b13347b953f59e1bca909aa7451b851 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Shulker.java +++ b/src/main/java/net/minecraft/world/entity/monster/Shulker.java @@ -107,6 +107,11 @@ public class Shulker extends AbstractGolem implements Enemy { @@ -873,7 +873,7 @@ index 30eafae391ff5447cd9f61212798a54b026956c4..e463a4b40dbaed9c2d4e29d18cba98e4 @Override diff --git a/src/main/java/net/minecraft/world/entity/monster/Silverfish.java b/src/main/java/net/minecraft/world/entity/monster/Silverfish.java -index d215d8eff468c8bab9db160ea2b3fa1e6749d1a3..b0ae595d946057b7f6120717d079b13eea9ebec1 100644 +index 5057b9b6ad2c47a11ca11b281393ccf6a6e8dd6f..2b77a73c0042a40fcc464dd878a3b9114138b3ff 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Silverfish.java +++ b/src/main/java/net/minecraft/world/entity/monster/Silverfish.java @@ -56,6 +56,11 @@ public class Silverfish extends Monster { @@ -905,7 +905,7 @@ index f3d73b9cf3d3cd0d69ea2f8152a1ced4289ee417..2cf7a67e5294099154f8acaa897f12e8 @Override diff --git a/src/main/java/net/minecraft/world/entity/monster/Slime.java b/src/main/java/net/minecraft/world/entity/monster/Slime.java -index f8e25df1b84296962b85b09e94bc42b57588607a..a560da0d50e37ced5a4d9b79378a9e4a331efadf 100644 +index 92a5dc8a26bb6177634e5f1afb37f12828c70ace..d49ba154d173aa7bf5a679b7bfcc55de851ea34b 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Slime.java +++ b/src/main/java/net/minecraft/world/entity/monster/Slime.java @@ -125,6 +125,11 @@ public class Slime extends Mob implements Enemy { @@ -921,7 +921,7 @@ index f8e25df1b84296962b85b09e94bc42b57588607a..a560da0d50e37ced5a4d9b79378a9e4a @Override diff --git a/src/main/java/net/minecraft/world/entity/monster/Spider.java b/src/main/java/net/minecraft/world/entity/monster/Spider.java -index 3f61e97cadd1c94d55093a7771b241029aee99f3..86c96558279fe31622da2eaba64e3cc4f487ab19 100644 +index d095df11ffc34dd641bc2795365a4d1dda8cbc88..be6b7c91990c133f8ca1c9747f64119829888bbb 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Spider.java +++ b/src/main/java/net/minecraft/world/entity/monster/Spider.java @@ -66,6 +66,11 @@ public class Spider extends Monster { @@ -953,7 +953,7 @@ index 86b1c7a1ddd33249ce3d1ff25030d4218058af2c..9c556ee62a0eb09629d80dc5fc703476 public static boolean checkStraySpawnRules(EntityType type, ServerLevelAccessor world, MobSpawnType spawnReason, BlockPos pos, Random random) { diff --git a/src/main/java/net/minecraft/world/entity/monster/Strider.java b/src/main/java/net/minecraft/world/entity/monster/Strider.java -index b4f7d6f4b7e6f6d5fe9e472f1723430c3301378b..167b40048bafa4c7a1993823a62f34b6d5758d90 100644 +index 5902f0883ca0ad706801dc693bb3ac79b3eae91c..400afd587c6f9f52adf8d575d54b8dbe515b3144 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Strider.java +++ b/src/main/java/net/minecraft/world/entity/monster/Strider.java @@ -408,7 +408,7 @@ public class Strider extends Animal implements ItemSteerable, Saddleable { @@ -966,7 +966,7 @@ index b4f7d6f4b7e6f6d5fe9e472f1723430c3301378b..167b40048bafa4c7a1993823a62f34b6 @Override diff --git a/src/main/java/net/minecraft/world/entity/monster/Vex.java b/src/main/java/net/minecraft/world/entity/monster/Vex.java -index 08f744680a07a877d6e235c0d9e4f108ddc46b78..1c540f1e562a8da6990a3c36138721b0963d9324 100644 +index 8747ebbc637ceb1c61a38baf063a3352aa093a1f..1606f15ee56383533b3e2bfca9cf00b63c7c474a 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Vex.java +++ b/src/main/java/net/minecraft/world/entity/monster/Vex.java @@ -100,6 +100,11 @@ public class Vex extends Monster { @@ -982,7 +982,7 @@ index 08f744680a07a877d6e235c0d9e4f108ddc46b78..1c540f1e562a8da6990a3c36138721b0 @Override diff --git a/src/main/java/net/minecraft/world/entity/monster/Vindicator.java b/src/main/java/net/minecraft/world/entity/monster/Vindicator.java -index c611dd58a7697093087c6d2c3b47cf85a1400722..1aa5c9affe53e86c8a3230932f05c1cea08ee8c7 100644 +index 66ad217d541ce6a2071209abeedd1b688cc5d8eb..626784961ac0ee2de987ee8e5a996683960ff878 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Vindicator.java +++ b/src/main/java/net/minecraft/world/entity/monster/Vindicator.java @@ -73,6 +73,11 @@ public class Vindicator extends AbstractIllager { @@ -998,7 +998,7 @@ index c611dd58a7697093087c6d2c3b47cf85a1400722..1aa5c9affe53e86c8a3230932f05c1ce @Override diff --git a/src/main/java/net/minecraft/world/entity/monster/Witch.java b/src/main/java/net/minecraft/world/entity/monster/Witch.java -index 2eac41d27610a33adc6c2ef442cc687f0ddbdc5b..8792d8d3847f360663b0f3ed71f20a2e4f750321 100644 +index 3bc25acc139b5d2b9fb20a491649ff613d5adc82..263009d0d69e26b7eab6d387c67590511c9b8ff6 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Witch.java +++ b/src/main/java/net/minecraft/world/entity/monster/Witch.java @@ -74,6 +74,11 @@ public class Witch extends Raider implements RangedAttackMob { @@ -1046,7 +1046,7 @@ index fe315ebb69773d243feb2fbda369fc6ff23d93c8..f96d891eeae384a210a7399a605d5d9c @Override diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java -index 6f636ddea90e89fa17fa76d25b93ab5079cda88b..be8182a2063fefa2c8f986c629eb629ef9dc1fee 100644 +index 8fe5ce2242b136f930584fdf6b5fcf27030f248b..493f3fe736cef11531d345b076ca240b5feb6ff2 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java +++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java @@ -131,6 +131,11 @@ public class Zombie extends Monster { @@ -1142,7 +1142,7 @@ index f6734f2eb44af7b2389de5079831e0e4f8a1c742..d3a298734e4434d29b66e94fc6c299d3 public static AttributeSupplier.Builder createAttributes() { diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java -index 5292f5f164f2c1bc1aa0ce920bee5afdcc0d2dde..91ecd7e9663b2375f2884a9b598dbae18b740838 100644 +index 84f26b30c04715ed9d39c27738705a0d589249f3..56d57670e7e315d53abc60d6c9df2a8777536b30 100644 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java @@ -179,6 +179,11 @@ public class Villager extends AbstractVillager implements ReputationEventHandler @@ -1174,7 +1174,7 @@ index c5dbb1c8210b71f7d9d91089cb139f65605573a8..e5b78c9d6fb326771d65ea9afd9da38c @Override diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 2840cea2cb04cc011f7670fccd29cea8dc861d6d..096e8d68982b982722681d8a543558614202ed06 100644 +index f1f4eda3adb8ef19958472558e91c585b9646c6b..5ab1aa6e2ff6bb267c5ba3993e9d7f879fe3477f 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -574,6 +574,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0141-Config-to-always-tame-in-Creative.patch b/patches/server/0142-Config-to-always-tame-in-Creative.patch similarity index 93% rename from patches/server/0141-Config-to-always-tame-in-Creative.patch rename to patches/server/0142-Config-to-always-tame-in-Creative.patch index cba824295..815936967 100644 --- a/patches/server/0141-Config-to-always-tame-in-Creative.patch +++ b/patches/server/0142-Config-to-always-tame-in-Creative.patch @@ -20,7 +20,7 @@ index 5c64905e90ccca6e0b347241ddf9cc3f71058b8e..3bd7521b131b2b40f807bdc7ab95e64c return; } diff --git a/src/main/java/net/minecraft/world/entity/animal/Cat.java b/src/main/java/net/minecraft/world/entity/animal/Cat.java -index d6f50d524cd00fb54dd987cc9a9c560766a12553..e9954c99fdb089d57b32ddd754fee33fd642fece 100644 +index bbada6ca16146eae026ae5ca63372970799815b8..c4ffe4517d7b8c521b5a11555eeffbe3c7a1801d 100644 --- a/src/main/java/net/minecraft/world/entity/animal/Cat.java +++ b/src/main/java/net/minecraft/world/entity/animal/Cat.java @@ -480,7 +480,7 @@ public class Cat extends TamableAnimal { @@ -33,7 +33,7 @@ index d6f50d524cd00fb54dd987cc9a9c560766a12553..e9954c99fdb089d57b32ddd754fee33f this.setOrderedToSit(true); this.level.broadcastEntityEvent(this, (byte) 7); diff --git a/src/main/java/net/minecraft/world/entity/animal/Parrot.java b/src/main/java/net/minecraft/world/entity/animal/Parrot.java -index 5064673a78a6bc5cb8b8973d451946239cd995a0..953db16af175e14e1a47487659a0346216d8cdbc 100644 +index cb25e36052934c2442fed8e32578915aef3b8074..de702ce3e2dffc44e380b8470aa540a3226a54cb 100644 --- a/src/main/java/net/minecraft/world/entity/animal/Parrot.java +++ b/src/main/java/net/minecraft/world/entity/animal/Parrot.java @@ -326,7 +326,7 @@ public class Parrot extends ShoulderRidingEntity implements FlyingAnimal { @@ -46,7 +46,7 @@ index 5064673a78a6bc5cb8b8973d451946239cd995a0..953db16af175e14e1a47487659a03462 this.level.broadcastEntityEvent(this, (byte) 7); } else { 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 b039cbbcc33a6b1925d1cf4339018219ceb6c2ad..57e8ef6f7c20d74fdc25d9ab2a9c35b1de1dc49b 100644 +index 663683a50f7a1125f406b6ec8bf7a0419be5f36a..713fe8ac2293fe2e60c5834b3d6fd2f12f3bc391 100644 --- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java +++ b/src/main/java/net/minecraft/world/entity/animal/Wolf.java @@ -519,7 +519,7 @@ public class Wolf extends TamableAnimal implements NeutralMob { @@ -59,7 +59,7 @@ index b039cbbcc33a6b1925d1cf4339018219ceb6c2ad..57e8ef6f7c20d74fdc25d9ab2a9c35b1 this.navigation.stop(); this.setTarget((LivingEntity) null); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 096e8d68982b982722681d8a543558614202ed06..59b9082ad765120b743605de9f8ccbb9cbcd588c 100644 +index 5ab1aa6e2ff6bb267c5ba3993e9d7f879fe3477f..143c29bb648ea7630d9d812d16c10020f89f4b7e 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -385,6 +385,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0142-End-crystal-explosion-options.patch b/patches/server/0143-End-crystal-explosion-options.patch similarity index 98% rename from patches/server/0142-End-crystal-explosion-options.patch rename to patches/server/0143-End-crystal-explosion-options.patch index 33c0b6caf..f38665312 100644 --- a/patches/server/0142-End-crystal-explosion-options.patch +++ b/patches/server/0143-End-crystal-explosion-options.patch @@ -52,7 +52,7 @@ index f8863cabad1bd0c3c2c62b8e17612d9559237d68..06c6addfa2a8dab1ad52a3588e9aeba5 this.onDestroyedBy(source); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 59b9082ad765120b743605de9f8ccbb9cbcd588c..60d6c0e75ca4e74adc33b951111bae7f178cd0ac 100644 +index 143c29bb648ea7630d9d812d16c10020f89f4b7e..489487cc533b47cca10526d649fc7d0e1571dd2e 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -463,6 +463,35 @@ public class PurpurWorldConfig { diff --git a/patches/server/0143-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch b/patches/server/0144-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch similarity index 93% rename from patches/server/0143-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch rename to patches/server/0144-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch index 125a045b7..ce3e48062 100644 --- a/patches/server/0143-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch +++ b/patches/server/0144-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configs for if Wither/Ender Dragon can ride vehicles diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java -index ed1c473ef80202b3aa4996b5acb9728857eaec8c..ea5e71b2264c73888d9355f31177a50ccdb50110 100644 +index 618b8fe6fcf71c58c297b7d918e6c74de6077331..fc071603d760a2e34033bd6341a156cd9ac1e3f3 100644 --- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java +++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java @@ -1114,6 +1114,7 @@ public class EnderDragon extends Mob implements Enemy { @@ -17,7 +17,7 @@ index ed1c473ef80202b3aa4996b5acb9728857eaec8c..ea5e71b2264c73888d9355f31177a50c } diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java -index 29351213075a26b5beefeeba012d05fc9c986696..b6f1ad54cdacafb0995a992ff3990a5517380ab3 100644 +index 3b752f97f75c78657f37215ecd92b7460a71f090..5ef45fe1dac1df779727f9c441f7e6515185e507 100644 --- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java +++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java @@ -733,6 +733,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob @@ -29,7 +29,7 @@ index 29351213075a26b5beefeeba012d05fc9c986696..b6f1ad54cdacafb0995a992ff3990a55 } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 60d6c0e75ca4e74adc33b951111bae7f178cd0ac..b8dfe1a519a1777b3e0c5644dc82ef89edbb034b 100644 +index 489487cc533b47cca10526d649fc7d0e1571dd2e..b55e4e43554ef1e4afcc25101cfa82f0dd95db11 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -896,6 +896,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0144-Dont-run-with-scissors.patch b/patches/server/0145-Dont-run-with-scissors.patch similarity index 100% rename from patches/server/0144-Dont-run-with-scissors.patch rename to patches/server/0145-Dont-run-with-scissors.patch diff --git a/patches/server/0145-One-Punch-Man.patch b/patches/server/0146-One-Punch-Man.patch similarity index 93% rename from patches/server/0145-One-Punch-Man.patch rename to patches/server/0146-One-Punch-Man.patch index fd69fbe2f..b4df1e0d0 100644 --- a/patches/server/0145-One-Punch-Man.patch +++ b/patches/server/0146-One-Punch-Man.patch @@ -5,7 +5,7 @@ Subject: [PATCH] One Punch Man! diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index e0c5947610ab711024c0ef6346f2ca9a87701139..61c59634533fd3ebe79219ccc9d4e35137f1a2aa 100644 +index 5268bc9c2fd7cc3aac78f89e463e275e0e351202..d61f3bd4afaa5f890d70606cfb7ea5cb97067a33 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -2123,6 +2123,20 @@ public abstract class LivingEntity extends Entity { @@ -30,7 +30,7 @@ index e0c5947610ab711024c0ef6346f2ca9a87701139..61c59634533fd3ebe79219ccc9d4e351 if (human) { // PAIL: Be sure to drag all this code from the EntityHuman subclass each update. diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 38fefd5ff631df27ee05b5f8776f1466d15022bd..c816e073d6e3293e75fb3f18a03ea80782c3f15a 100644 +index 37e7ff9b3da306ff091e430e6091d69c6384289f..f9678bacd3d49f93907725d24d407a24aa8a8d7a 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -302,6 +302,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0146-Add-config-for-snow-on-blue-ice.patch b/patches/server/0147-Add-config-for-snow-on-blue-ice.patch similarity index 96% rename from patches/server/0146-Add-config-for-snow-on-blue-ice.patch rename to patches/server/0147-Add-config-for-snow-on-blue-ice.patch index 574b628e0..778850fd8 100644 --- a/patches/server/0146-Add-config-for-snow-on-blue-ice.patch +++ b/patches/server/0147-Add-config-for-snow-on-blue-ice.patch @@ -29,7 +29,7 @@ index fbbb0155bd66f1daa160e03f866741d903e1869e..86f7b4117b8b9bd36e38962e3290f7b9 @Override diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index c816e073d6e3293e75fb3f18a03ea80782c3f15a..885f535396622aa2ceb1335ef84ad142e03549e3 100644 +index f9678bacd3d49f93907725d24d407a24aa8a8d7a..dc2fd82f87e01f9a69bfd2cbc38da1148202cf4b 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -524,6 +524,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0147-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch b/patches/server/0148-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch similarity index 98% rename from patches/server/0147-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch rename to patches/server/0148-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch index d21c73d50..9befaa26f 100644 --- a/patches/server/0147-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch +++ b/patches/server/0148-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch @@ -43,7 +43,7 @@ index 749ab72edc0d2e9c6f1161415ab8d59d3d6ca976..897c202c0905040072a06fdfa2032a7f // Paper end if (user instanceof net.minecraft.server.level.ServerPlayer) { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 885f535396622aa2ceb1335ef84ad142e03549e3..7f779df11c73e366fb807d7aece7bba88e1cbcb4 100644 +index dc2fd82f87e01f9a69bfd2cbc38da1148202cf4b..d8fd7ac4c9368e439867f6bbc718b93561edca5f 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -159,6 +159,10 @@ public class PurpurWorldConfig { diff --git a/patches/server/0148-Config-to-ignore-nearby-mobs-when-sleeping.patch b/patches/server/0149-Config-to-ignore-nearby-mobs-when-sleeping.patch similarity index 92% rename from patches/server/0148-Config-to-ignore-nearby-mobs-when-sleeping.patch rename to patches/server/0149-Config-to-ignore-nearby-mobs-when-sleeping.patch index a8c8601c1..8a4235533 100644 --- a/patches/server/0148-Config-to-ignore-nearby-mobs-when-sleeping.patch +++ b/patches/server/0149-Config-to-ignore-nearby-mobs-when-sleeping.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Config to ignore nearby mobs when sleeping diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 8b2280d29c41879b26c85d1b0c1ac52f8b7bfacd..0294e31bb7a4346fd9a3b45ef0bed5582b8abfcc 100644 +index 0d58442a23793c0e0d70a2caf16736b5fba8879f..04cc1a6c14328c17fb1b387a2a01cdfdd7b72ad8 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1321,7 +1321,7 @@ public class ServerPlayer extends Player { @@ -18,7 +18,7 @@ index 8b2280d29c41879b26c85d1b0c1ac52f8b7bfacd..0294e31bb7a4346fd9a3b45ef0bed558 } } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 7f779df11c73e366fb807d7aece7bba88e1cbcb4..ff2cdbdb785628e564de0fefaef68b408c5e3e8a 100644 +index d8fd7ac4c9368e439867f6bbc718b93561edca5f..1e6bf257d8f587af6397c39ff8d5107120313107 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -311,6 +311,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0149-Add-back-player-spawned-endermite-API.patch b/patches/server/0150-Add-back-player-spawned-endermite-API.patch similarity index 97% rename from patches/server/0149-Add-back-player-spawned-endermite-API.patch rename to patches/server/0150-Add-back-player-spawned-endermite-API.patch index e85082b1d..b7e6b2311 100644 --- a/patches/server/0149-Add-back-player-spawned-endermite-API.patch +++ b/patches/server/0150-Add-back-player-spawned-endermite-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add back player spawned endermite API diff --git a/src/main/java/net/minecraft/world/entity/monster/Endermite.java b/src/main/java/net/minecraft/world/entity/monster/Endermite.java -index 680a9cfc79c7b9d012f68142980ff32b9fb9f228..aeb46595e663f8584d3ef45d92420d915dc52e71 100644 +index de422b384f5bd5ddc09229a3fc846aeb7176c07c..fce4cf14f5275d7e996db60dab83d4351cc08796 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Endermite.java +++ b/src/main/java/net/minecraft/world/entity/monster/Endermite.java @@ -30,6 +30,7 @@ import net.minecraft.world.level.block.state.BlockState; diff --git a/patches/server/0150-Config-Enderman-aggressiveness-towards-Endermites.patch b/patches/server/0151-Config-Enderman-aggressiveness-towards-Endermites.patch similarity index 100% rename from patches/server/0150-Config-Enderman-aggressiveness-towards-Endermites.patch rename to patches/server/0151-Config-Enderman-aggressiveness-towards-Endermites.patch diff --git a/patches/server/0151-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch b/patches/server/0152-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch similarity index 93% rename from patches/server/0151-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch rename to patches/server/0152-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch index 623547f35..1d8b1ae02 100644 --- a/patches/server/0151-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch +++ b/patches/server/0152-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch @@ -7,7 +7,7 @@ Prevents Enderman from becoming aggresive towards players that are wearing a Dra Adds functionality to a useless item! diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java -index 75d0998d7e6109592400c14c4aee063f7942961d..13cdfb0175152d2ba203c01f14f2f98d87f812b3 100644 +index c7216abec9b93cce9198568470ebe21f40d6423b..fd06b697b810e4e74345c636cb3a02bc23959e76 100644 --- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java +++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java @@ -256,7 +256,7 @@ public class EnderMan extends Monster implements NeutralMob { @@ -20,7 +20,7 @@ index 75d0998d7e6109592400c14c4aee063f7942961d..13cdfb0175152d2ba203c01f14f2f98d } else { Vec3 vec3d = player.getViewVector(1.0F).normalize(); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 83534bbdad44c682cf5fdf8a94390f224c5906f1..6ab78da881142ee146499a6193cbfa36cc7fc10a 100644 +index 7e3c65b3a10c6dbfc345b7d7ada8cfdd27a15596..95e34c8fa39fcc0be6608e2dfab716606f81937a 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -947,6 +947,8 @@ public class PurpurWorldConfig { diff --git a/patches/server/0152-Tick-fluids-config.patch b/patches/server/0153-Tick-fluids-config.patch similarity index 97% rename from patches/server/0152-Tick-fluids-config.patch rename to patches/server/0153-Tick-fluids-config.patch index f57bd03fe..69ec05f77 100644 --- a/patches/server/0152-Tick-fluids-config.patch +++ b/patches/server/0153-Tick-fluids-config.patch @@ -36,7 +36,7 @@ index 11ebadaa2438281a54cffe025a49ee5046a71ba5..07c25a2518eb5ce0da6131ce5ceb10ac } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 6ab78da881142ee146499a6193cbfa36cc7fc10a..241383f4edf4a1ec8d6b92400a6055527a49758c 100644 +index 95e34c8fa39fcc0be6608e2dfab716606f81937a..0f6065ca8d952c0ae12dcf9ccb6baea3f386808e 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -413,6 +413,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0153-Config-to-disable-Llama-caravans.patch b/patches/server/0154-Config-to-disable-Llama-caravans.patch similarity index 100% rename from patches/server/0153-Config-to-disable-Llama-caravans.patch rename to patches/server/0154-Config-to-disable-Llama-caravans.patch diff --git a/patches/server/0154-Config-to-make-Creepers-explode-on-death.patch b/patches/server/0155-Config-to-make-Creepers-explode-on-death.patch similarity index 94% rename from patches/server/0154-Config-to-make-Creepers-explode-on-death.patch rename to patches/server/0155-Config-to-make-Creepers-explode-on-death.patch index d90b0d3d7..ab08cfe90 100644 --- a/patches/server/0154-Config-to-make-Creepers-explode-on-death.patch +++ b/patches/server/0155-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 f6a8d026c2380b9d7ec3121c7e144c6f19f5323c..73b0c8403eca3c26f76e59fc4b057b5029e3f014 100644 +index cf8b4f538ee2df715162adc460c6e8e58b50ba52..525b94c61693cfd7d68305cbf4eb08a87f3ca66a 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java +++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java @@ -64,6 +64,7 @@ public class Creeper extends Monster implements PowerableMob { @@ -50,7 +50,7 @@ index f6a8d026c2380b9d7ec3121c7e144c6f19f5323c..73b0c8403eca3c26f76e59fc4b057b50 private void spawnLingeringCloud() { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index e068b364782311c24790e23ecfd67e571d75d3a2..a94219011d920e14355b48d1638a0b612d3cb11c 100644 +index 94bc54757899557a5f3fd5a6fa426823c846981f..b9b3be202285c4926f1816d28ffce7983862062b 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -809,6 +809,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0155-Configurable-ravager-griefable-blocks-list.patch b/patches/server/0156-Configurable-ravager-griefable-blocks-list.patch similarity index 96% rename from patches/server/0155-Configurable-ravager-griefable-blocks-list.patch rename to patches/server/0156-Configurable-ravager-griefable-blocks-list.patch index cad863970..6875c115f 100644 --- a/patches/server/0155-Configurable-ravager-griefable-blocks-list.patch +++ b/patches/server/0156-Configurable-ravager-griefable-blocks-list.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configurable ravager griefable blocks list diff --git a/src/main/java/net/minecraft/world/entity/monster/Ravager.java b/src/main/java/net/minecraft/world/entity/monster/Ravager.java -index d3df45f7dbb688b56f03a4174e6311f83b437e18..d2ed76b554607469093e1bc62600f01556b8472e 100644 +index bb4b50e64908f54d84182208f5d605db20d1456d..83e835a63bc0a211b75db82f4f4eb28874eea9ec 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Ravager.java +++ b/src/main/java/net/minecraft/world/entity/monster/Ravager.java @@ -200,7 +200,7 @@ public class Ravager extends Raider { @@ -31,7 +31,7 @@ index e9087a46e401bc99b73c2cf2731fdac3e68719f8..e054edf9e7c4eef231e155516433c6fa } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index a94219011d920e14355b48d1638a0b612d3cb11c..845123a88ded1ca19d28b6a22dbee4bd3b9dcbec 100644 +index b9b3be202285c4926f1816d28ffce7983862062b..018accfcdfcaa14596c47f2764efe45339ca4a39 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1580,6 +1580,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0156-Sneak-to-bulk-process-composter.patch b/patches/server/0157-Sneak-to-bulk-process-composter.patch similarity index 98% rename from patches/server/0156-Sneak-to-bulk-process-composter.patch rename to patches/server/0157-Sneak-to-bulk-process-composter.patch index ef26cfdd7..48bae63b5 100644 --- a/patches/server/0156-Sneak-to-bulk-process-composter.patch +++ b/patches/server/0157-Sneak-to-bulk-process-composter.patch @@ -75,7 +75,7 @@ index fb8b8a9733ac50096d8406487ab1ae167ef5f7b1..16598ca0fd953b6af98dfcdb6716e2e1 int i = (Integer) iblockdata.getValue(ComposterBlock.LEVEL); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 845123a88ded1ca19d28b6a22dbee4bd3b9dcbec..dc036e95b92bf349484f006d22530e0b8516d01a 100644 +index 018accfcdfcaa14596c47f2764efe45339ca4a39..d2f7127b21515f1afe9451f243a0e5614a91a488 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -474,6 +474,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0157-Config-for-skipping-night.patch b/patches/server/0158-Config-for-skipping-night.patch similarity index 92% rename from patches/server/0157-Config-for-skipping-night.patch rename to patches/server/0158-Config-for-skipping-night.patch index 646b36d96..4576ab23d 100644 --- a/patches/server/0157-Config-for-skipping-night.patch +++ b/patches/server/0158-Config-for-skipping-night.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Config for skipping night diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index da197e74b1a7b5831b98628198879dd7fdeff074..359ba71b137eac65a8ba6c1e5eda70412eb3550f 100644 +index 74e89ada75e34b8d09c55bea4f58b2c72e21dfcb..62d6764b5477e77b34a96e816be74050eede6b4b 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -604,7 +604,7 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -18,7 +18,7 @@ index da197e74b1a7b5831b98628198879dd7fdeff074..359ba71b137eac65a8ba6c1e5eda7041 j = this.levelData.getDayTime() + 24000L; TimeSkipEvent event = new TimeSkipEvent(this.getWorld(), TimeSkipEvent.SkipReason.NIGHT_SKIP, (j - j % 24000L) - this.getDayTime()); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index dc036e95b92bf349484f006d22530e0b8516d01a..2c3114fba8dc6d52cc4f4eef9b350aa93ab266e1 100644 +index d2f7127b21515f1afe9451f243a0e5614a91a488..37334be50f9ddd1ff5e0fc2629ecd3ec6aaa278a 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -312,6 +312,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0158-Add-config-for-villager-trading.patch b/patches/server/0159-Add-config-for-villager-trading.patch similarity index 95% rename from patches/server/0158-Add-config-for-villager-trading.patch rename to patches/server/0159-Add-config-for-villager-trading.patch index 10bc01549..78bc20b8d 100644 --- a/patches/server/0158-Add-config-for-villager-trading.patch +++ b/patches/server/0159-Add-config-for-villager-trading.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add config for villager trading diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java -index 91ecd7e9663b2375f2884a9b598dbae18b740838..779e0e0ee72cd2835cda69b49b769c1882a55a66 100644 +index 56d57670e7e315d53abc60d6c9df2a8777536b30..aceb5dff85779983473962cd8cb016811560d0a6 100644 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java @@ -357,7 +357,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler @@ -31,7 +31,7 @@ index e5b78c9d6fb326771d65ea9afd9da38c204922f0..1a8df13b06b1ac5e5a7d63033b4a5326 this.openTradingScreen(player, this.getDisplayName(), 1); } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 2c3114fba8dc6d52cc4f4eef9b350aa93ab266e1..276abd030cfdec1a41b81ddbc844b3736fe272af 100644 +index 37334be50f9ddd1ff5e0fc2629ecd3ec6aaa278a..af9622da4048668cc80baf57fbb1c4e151344170 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1952,6 +1952,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0159-Allow-infinity-on-crossbows.patch b/patches/server/0160-Allow-infinity-on-crossbows.patch similarity index 100% rename from patches/server/0159-Allow-infinity-on-crossbows.patch rename to patches/server/0160-Allow-infinity-on-crossbows.patch diff --git a/patches/server/0160-Drowning-Settings.patch b/patches/server/0161-Drowning-Settings.patch similarity index 95% rename from patches/server/0160-Drowning-Settings.patch rename to patches/server/0161-Drowning-Settings.patch index a77c7a1cb..e587baf4d 100644 --- a/patches/server/0160-Drowning-Settings.patch +++ b/patches/server/0161-Drowning-Settings.patch @@ -27,7 +27,7 @@ index 197326d2831f804620fbfe289a1617ec94cf891c..ce02c8ba13c3e940709361e91747f9c9 public int getAirSupply() { diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 61c59634533fd3ebe79219ccc9d4e35137f1a2aa..4b88efb67d1d3522c4520e0aa4c8f45c95383222 100644 +index d61f3bd4afaa5f890d70606cfb7ea5cb97067a33..f3b5ef83240d58655029e33bbb1ea17bae304639 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -420,7 +420,7 @@ public abstract class LivingEntity extends Entity { @@ -49,7 +49,7 @@ index 61c59634533fd3ebe79219ccc9d4e35137f1a2aa..4b88efb67d1d3522c4520e0aa4c8f45c } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 276abd030cfdec1a41b81ddbc844b3736fe272af..75cfd4d62bff28829f490b89c5800d17dbfc42c7 100644 +index af9622da4048668cc80baf57fbb1c4e151344170..0c34c88e1bd7ec56248aa36927faca4728399bde 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -122,6 +122,15 @@ public class PurpurWorldConfig { diff --git a/patches/server/0161-Break-individual-slabs-when-sneaking.patch b/patches/server/0162-Break-individual-slabs-when-sneaking.patch similarity index 97% rename from patches/server/0161-Break-individual-slabs-when-sneaking.patch rename to patches/server/0162-Break-individual-slabs-when-sneaking.patch index 85bd832a7..43fdd2043 100644 --- a/patches/server/0161-Break-individual-slabs-when-sneaking.patch +++ b/patches/server/0162-Break-individual-slabs-when-sneaking.patch @@ -47,7 +47,7 @@ index 54df5c2987822a727a31be2b3769d39fabb6159a..70b6a65a7d321fc71c98289f09f21cca + // Purpur end } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 75cfd4d62bff28829f490b89c5800d17dbfc42c7..83d1ac76f93bbba8d07c19cfc0fe67d6861ac491 100644 +index 0c34c88e1bd7ec56248aa36927faca4728399bde..408688a2ad20e74716fad24bd65cceeca8c371a4 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -606,6 +606,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0162-Config-to-disable-hostile-mob-spawn-on-ice.patch b/patches/server/0163-Config-to-disable-hostile-mob-spawn-on-ice.patch similarity index 95% rename from patches/server/0162-Config-to-disable-hostile-mob-spawn-on-ice.patch rename to patches/server/0163-Config-to-disable-hostile-mob-spawn-on-ice.patch index 5d0cc42e4..e06e075a7 100644 --- a/patches/server/0162-Config-to-disable-hostile-mob-spawn-on-ice.patch +++ b/patches/server/0163-Config-to-disable-hostile-mob-spawn-on-ice.patch @@ -22,7 +22,7 @@ index 457880c9e894a83d88505cf0b7235df919eea591..9c38fdb23853ebdca7b8d904760a3958 return false; } else if (world.getBrightness(LightLayer.BLOCK, pos) > 0) { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 83d1ac76f93bbba8d07c19cfc0fe67d6861ac491..681ccd22efa6145ac571eef034aeb38dbfc274ee 100644 +index 408688a2ad20e74716fad24bd65cceeca8c371a4..064bb5a0fcff3692609ad84b09227276aa0e140a 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -553,8 +553,12 @@ public class PurpurWorldConfig { diff --git a/patches/server/0163-Config-to-show-Armor-Stand-arms-on-spawn.patch b/patches/server/0164-Config-to-show-Armor-Stand-arms-on-spawn.patch similarity index 96% rename from patches/server/0163-Config-to-show-Armor-Stand-arms-on-spawn.patch rename to patches/server/0164-Config-to-show-Armor-Stand-arms-on-spawn.patch index d9230dda1..6db83529f 100644 --- a/patches/server/0163-Config-to-show-Armor-Stand-arms-on-spawn.patch +++ b/patches/server/0164-Config-to-show-Armor-Stand-arms-on-spawn.patch @@ -17,7 +17,7 @@ index e9e24435057cff9c0af758ca2aa822c3b1c3593d..8634431cabae82b71f409f02c84dda2d 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 681ccd22efa6145ac571eef034aeb38dbfc274ee..87827692b0ea864b7d7d1c79761d2f3436f6d432 100644 +index 064bb5a0fcff3692609ad84b09227276aa0e140a..f3a29c15d993b8dd4936b9f9678be9740110f72f 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -106,6 +106,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0164-Option-to-make-doors-require-redstone.patch b/patches/server/0165-Option-to-make-doors-require-redstone.patch similarity index 98% rename from patches/server/0164-Option-to-make-doors-require-redstone.patch rename to patches/server/0165-Option-to-make-doors-require-redstone.patch index ff6bcee69..0ee90196c 100644 --- a/patches/server/0164-Option-to-make-doors-require-redstone.patch +++ b/patches/server/0165-Option-to-make-doors-require-redstone.patch @@ -67,7 +67,7 @@ index 1df52a9c86c01696a8bc9f84a2082387160b3eeb..a4b9c5da133e2e8ad45d447e3f184cb1 + // Purpur end } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 87827692b0ea864b7d7d1c79761d2f3436f6d432..9ae0773835689b308987a72424cb7422aea5b714 100644 +index f3a29c15d993b8dd4936b9f9678be9740110f72f..18bd4e5088af39e08b2d861b3d53d242a7e5879e 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -499,6 +499,16 @@ public class PurpurWorldConfig { diff --git a/patches/server/0165-Config-to-allow-for-unsafe-enchants.patch b/patches/server/0166-Config-to-allow-for-unsafe-enchants.patch similarity index 100% rename from patches/server/0165-Config-to-allow-for-unsafe-enchants.patch rename to patches/server/0166-Config-to-allow-for-unsafe-enchants.patch diff --git a/patches/server/0166-Configurable-sponge-absorption.patch b/patches/server/0167-Configurable-sponge-absorption.patch similarity index 97% rename from patches/server/0166-Configurable-sponge-absorption.patch rename to patches/server/0167-Configurable-sponge-absorption.patch index 06e2d5d67..6b3861886 100644 --- a/patches/server/0166-Configurable-sponge-absorption.patch +++ b/patches/server/0167-Configurable-sponge-absorption.patch @@ -43,7 +43,7 @@ index 842997ea9f25a05d74a2e8300e44cc39a7e9cd96..97b4e3c0d2b1bbde77b135b8595c3bfa } } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 9ae0773835689b308987a72424cb7422aea5b714..ee05d89dab1264b3d5d5334bd186c4b6e93fa2c2 100644 +index 18bd4e5088af39e08b2d861b3d53d242a7e5879e..9d791317fe59b0bf80fefb65d049521363a5bead 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -632,6 +632,13 @@ public class PurpurWorldConfig { diff --git a/patches/server/0167-Projectile-offset-config.patch b/patches/server/0168-Projectile-offset-config.patch similarity index 98% rename from patches/server/0167-Projectile-offset-config.patch rename to patches/server/0168-Projectile-offset-config.patch index 7275eba03..1082aeeb5 100644 --- a/patches/server/0167-Projectile-offset-config.patch +++ b/patches/server/0168-Projectile-offset-config.patch @@ -18,7 +18,7 @@ index 33df0ca406dc8321b76b393f317bbd1c8ebe6366..220513d3fd5645322886522ea4f6b8c5 entityarrow.setCritArrow(true); } diff --git a/src/main/java/net/minecraft/world/item/CrossbowItem.java b/src/main/java/net/minecraft/world/item/CrossbowItem.java -index 78f6d335dedd933ff225e2c63b879626b6b76ee7..311a8f4e7c644a02590c8e1ad1784229439c8d4d 100644 +index e39f1241b19d3ce8b847c880a414bca89ec80356..45f3c129626e7b1f1cb06db940b85d217ae6d10e 100644 --- a/src/main/java/net/minecraft/world/item/CrossbowItem.java +++ b/src/main/java/net/minecraft/world/item/CrossbowItem.java @@ -65,7 +65,7 @@ public class CrossbowItem extends ProjectileWeaponItem implements Vanishable { @@ -96,7 +96,7 @@ index 5beaafec0759543d3bddf99028c97d0d005be209..086f746cc632a90c67a6c30ea9197c5b entitythrowntrident.pickup = AbstractArrow.Pickup.CREATIVE_ONLY; } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index ee05d89dab1264b3d5d5334bd186c4b6e93fa2c2..20d3893b494dc9be2c469df2731e3dd3f6721cb3 100644 +index 9d791317fe59b0bf80fefb65d049521363a5bead..4be7e3537843983044dc4987b5e01ef5023c2632 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -381,6 +381,23 @@ public class PurpurWorldConfig { diff --git a/patches/server/0168-Config-for-powered-rail-activation-distance.patch b/patches/server/0169-Config-for-powered-rail-activation-distance.patch similarity index 94% rename from patches/server/0168-Config-for-powered-rail-activation-distance.patch rename to patches/server/0169-Config-for-powered-rail-activation-distance.patch index 881ff95a4..70b22936c 100644 --- a/patches/server/0168-Config-for-powered-rail-activation-distance.patch +++ b/patches/server/0169-Config-for-powered-rail-activation-distance.patch @@ -18,7 +18,7 @@ index 7fddb6fa8fd30ef88346a59f7867aae792f13772..40893e71fe8447b695350273bef9623b } else { int j = pos.getX(); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 20d3893b494dc9be2c469df2731e3dd3f6721cb3..78b7cca9f505c218446413ee399fe674994fce29 100644 +index 4be7e3537843983044dc4987b5e01ef5023c2632..5ff62bcd72b6012cca37c2d7de20e661d999169f 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -644,6 +644,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0169-Piglin-portal-spawn-modifier.patch b/patches/server/0170-Piglin-portal-spawn-modifier.patch similarity index 93% rename from patches/server/0169-Piglin-portal-spawn-modifier.patch rename to patches/server/0170-Piglin-portal-spawn-modifier.patch index 7472d8391..b943d9618 100644 --- a/patches/server/0169-Piglin-portal-spawn-modifier.patch +++ b/patches/server/0170-Piglin-portal-spawn-modifier.patch @@ -18,7 +18,7 @@ Difficulties: 3 - hard diff --git a/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java b/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java -index b99a9f76d6e400a053c57a96c9586fe09a4a5a26..41caccb63a6e6ce28cb6fc218dcb8fbd015fbcb7 100644 +index 13a367d2b5f245f4dd92df03288dc40b81e19603..bd593ec55fcccc1e02cf5683891c5586d989952c 100644 --- a/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java +++ b/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java @@ -55,7 +55,7 @@ public class NetherPortalBlock extends Block { @@ -31,7 +31,7 @@ index b99a9f76d6e400a053c57a96c9586fe09a4a5a26..41caccb63a6e6ce28cb6fc218dcb8fbd pos = pos.below(); } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 78b7cca9f505c218446413ee399fe674994fce29..acbdab94b72e711541b306424da5a594a284bfa8 100644 +index 5ff62bcd72b6012cca37c2d7de20e661d999169f..11a88d4e137cb808db4b1fa92c0939d949c0d84e 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1533,6 +1533,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0170-Config-to-change-max-number-of-bees.patch b/patches/server/0171-Config-to-change-max-number-of-bees.patch similarity index 100% rename from patches/server/0170-Config-to-change-max-number-of-bees.patch rename to patches/server/0171-Config-to-change-max-number-of-bees.patch diff --git a/patches/server/0171-Configurable-damage-settings-for-magma-blocks.patch b/patches/server/0172-Configurable-damage-settings-for-magma-blocks.patch similarity index 97% rename from patches/server/0171-Configurable-damage-settings-for-magma-blocks.patch rename to patches/server/0172-Configurable-damage-settings-for-magma-blocks.patch index 615c57280..3dacd56df 100644 --- a/patches/server/0171-Configurable-damage-settings-for-magma-blocks.patch +++ b/patches/server/0172-Configurable-damage-settings-for-magma-blocks.patch @@ -31,7 +31,7 @@ index 96b4597101a7f3e98ce30bfc301e8ca1620d0fe4..d7845984b5077cdcd40d652c226d5d60 entity.hurt(DamageSource.HOT_FLOOR, 1.0F); org.bukkit.craftbukkit.event.CraftEventFactory.blockDamage = null; // CraftBukkit diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index acbdab94b72e711541b306424da5a594a284bfa8..e8712c180173262821f280ada807dcbaf0d219f3 100644 +index 11a88d4e137cb808db4b1fa92c0939d949c0d84e..33d7e2a4081459f40425910a3e3b3b82d5a8b036 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -613,6 +613,13 @@ public class PurpurWorldConfig { diff --git a/patches/server/0172-Config-for-wither-explosion-radius.patch b/patches/server/0173-Config-for-wither-explosion-radius.patch similarity index 96% rename from patches/server/0172-Config-for-wither-explosion-radius.patch rename to patches/server/0173-Config-for-wither-explosion-radius.patch index b35fde0cb..d36a79e73 100644 --- a/patches/server/0172-Config-for-wither-explosion-radius.patch +++ b/patches/server/0173-Config-for-wither-explosion-radius.patch @@ -18,7 +18,7 @@ index a66e9826b8283366cec5adb54f79efee47d9df22..6cf8b12e94c17a8111eef5cc0157e4df if (!event.isCancelled()) { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index e8712c180173262821f280ada807dcbaf0d219f3..a838ed8f2801fd84f5b2ee2984294d5cb1b3dba0 100644 +index 33d7e2a4081459f40425910a3e3b3b82d5a8b036..074c25916b0f5a24fb128083ba7d9c28ab7cad59 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -2110,6 +2110,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0173-Gamemode-extra-permissions.patch b/patches/server/0174-Gamemode-extra-permissions.patch similarity index 100% rename from patches/server/0173-Gamemode-extra-permissions.patch rename to patches/server/0174-Gamemode-extra-permissions.patch diff --git a/patches/server/0174-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch b/patches/server/0175-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch similarity index 96% rename from patches/server/0174-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch rename to patches/server/0175-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch index f8553380c..9d540dfd8 100644 --- a/patches/server/0174-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch +++ b/patches/server/0175-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch @@ -18,7 +18,7 @@ index e5562b407bba35ab93bf8bc3c22ac9d45e8353cb..c688bb73cd062f36524cfc231cb691f2 if (blockState2 != null && level.getBlockState(blockPos.above()).isAir()) { level.playSound(player, blockPos, SoundEvents.SHOVEL_FLATTEN, SoundSource.BLOCKS, 1.0F, 1.0F); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index a838ed8f2801fd84f5b2ee2984294d5cb1b3dba0..bb29f18d8b97ac93324534181e356c86a42d3278 100644 +index 074c25916b0f5a24fb128083ba7d9c28ab7cad59..cb487e3a8c03fc2b7f7ccb328a7adfa7c7b3799b 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -398,6 +398,21 @@ public class PurpurWorldConfig { diff --git a/patches/server/0175-Configurable-piston-push-limit.patch b/patches/server/0176-Configurable-piston-push-limit.patch similarity index 96% rename from patches/server/0175-Configurable-piston-push-limit.patch rename to patches/server/0176-Configurable-piston-push-limit.patch index 3bbc4f29b..b9ca1946d 100644 --- a/patches/server/0175-Configurable-piston-push-limit.patch +++ b/patches/server/0176-Configurable-piston-push-limit.patch @@ -36,7 +36,7 @@ index 744d91546d1a810f60a43c15ed74b4158f341a4a..354538daefa603f6df5a139b6bff87db } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index bb29f18d8b97ac93324534181e356c86a42d3278..591225731b03e8a7b43e25514d11db6f914af3e2 100644 +index cb487e3a8c03fc2b7f7ccb328a7adfa7c7b3799b..b0464be1ddd80616f002471a0b2b64602bd3e6f1 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -635,6 +635,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0176-Configurable-broadcast-settings.patch b/patches/server/0177-Configurable-broadcast-settings.patch similarity index 100% rename from patches/server/0176-Configurable-broadcast-settings.patch rename to patches/server/0177-Configurable-broadcast-settings.patch diff --git a/patches/server/0177-Fix-SPIGOT-6278.patch b/patches/server/0178-Fix-SPIGOT-6278.patch similarity index 100% rename from patches/server/0177-Fix-SPIGOT-6278.patch rename to patches/server/0178-Fix-SPIGOT-6278.patch diff --git a/patches/server/0178-Configurable-mob-blindness.patch b/patches/server/0179-Configurable-mob-blindness.patch similarity index 93% rename from patches/server/0178-Configurable-mob-blindness.patch rename to patches/server/0179-Configurable-mob-blindness.patch index 1a7ca978a..509a7c1ba 100644 --- a/patches/server/0178-Configurable-mob-blindness.patch +++ b/patches/server/0179-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 4b88efb67d1d3522c4520e0aa4c8f45c95383222..42131cb0ed7346a6c9e466047a8f4a829523d611 100644 +index f3b5ef83240d58655029e33bbb1ea17bae304639..59f4415ba484e49897a20b8e9fc576b7d8b4bfe8 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -987,6 +987,17 @@ public abstract class LivingEntity extends Entity { @@ -28,7 +28,7 @@ index 4b88efb67d1d3522c4520e0aa4c8f45c95383222..42131cb0ed7346a6c9e466047a8f4a82 return d0; diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 591225731b03e8a7b43e25514d11db6f914af3e2..5ab2edfc3121a2171c760393f59b8f370fab8005 100644 +index b0464be1ddd80616f002471a0b2b64602bd3e6f1..e0e50d90c2d801688810f8ef122ee1c4e905a39b 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -459,6 +459,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0179-Hide-hidden-players-from-entity-selector.patch b/patches/server/0180-Hide-hidden-players-from-entity-selector.patch similarity index 100% rename from patches/server/0179-Hide-hidden-players-from-entity-selector.patch rename to patches/server/0180-Hide-hidden-players-from-entity-selector.patch diff --git a/patches/server/0180-Config-for-health-to-impact-Creeper-explosion-radius.patch b/patches/server/0181-Config-for-health-to-impact-Creeper-explosion-radius.patch similarity index 93% rename from patches/server/0180-Config-for-health-to-impact-Creeper-explosion-radius.patch rename to patches/server/0181-Config-for-health-to-impact-Creeper-explosion-radius.patch index f43f792ec..5d6f1737d 100644 --- a/patches/server/0180-Config-for-health-to-impact-Creeper-explosion-radius.patch +++ b/patches/server/0181-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 73b0c8403eca3c26f76e59fc4b057b5029e3f014..b8fa29185266df4f432a010ba229d1a6706b66f4 100644 +index 525b94c61693cfd7d68305cbf4eb08a87f3ca66a..35cbd013b1d58bb5fd1480922c2bd4307edfb6c3 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java +++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java @@ -361,9 +361,10 @@ public class Creeper extends Monster implements PowerableMob { @@ -21,7 +21,7 @@ index 73b0c8403eca3c26f76e59fc4b057b5029e3f014..b8fa29185266df4f432a010ba229d1a6 if (!event.isCancelled()) { this.dead = true; diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 5ab2edfc3121a2171c760393f59b8f370fab8005..775831d7852bd688a613aa9c54988b51b36985e3 100644 +index e0e50d90c2d801688810f8ef122ee1c4e905a39b..d33884c6d97c4caec65efe3e18ce6473a62ccfd1 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -905,6 +905,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0181-Iron-golem-poppy-calms-anger.patch b/patches/server/0182-Iron-golem-poppy-calms-anger.patch similarity index 100% rename from patches/server/0181-Iron-golem-poppy-calms-anger.patch rename to patches/server/0182-Iron-golem-poppy-calms-anger.patch diff --git a/patches/server/0182-Breedable-parrots.patch b/patches/server/0183-Breedable-parrots.patch similarity index 100% rename from patches/server/0182-Breedable-parrots.patch rename to patches/server/0183-Breedable-parrots.patch diff --git a/patches/server/0183-Configurable-powered-rail-boost-modifier.patch b/patches/server/0184-Configurable-powered-rail-boost-modifier.patch similarity index 96% rename from patches/server/0183-Configurable-powered-rail-boost-modifier.patch rename to patches/server/0184-Configurable-powered-rail-boost-modifier.patch index c5307751e..b4f4c40f2 100644 --- a/patches/server/0183-Configurable-powered-rail-boost-modifier.patch +++ b/patches/server/0184-Configurable-powered-rail-boost-modifier.patch @@ -18,7 +18,7 @@ index 6b58b32711b3aba9b7de9e7dee6d02073dad3b7f..0e6f2d1d48910c573ec2237002a02f33 Vec3 vec3d5 = this.getDeltaMovement(); double d21 = vec3d5.x; diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 564a2009f21e7caf36130e29bab28a27fd012ebf..b8b9c307b23ed49e7d21798aa9125e7b64edf200 100644 +index 2191f82f4cf6e47b0b9f32afc7d74838a05d5e57..cbc6e0aa76db3a0b58be9c1415e6cdc838eb9df7 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -227,6 +227,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0184-Add-config-change-multiplier-critical-damage-value.patch b/patches/server/0185-Add-config-change-multiplier-critical-damage-value.patch similarity index 92% rename from patches/server/0184-Add-config-change-multiplier-critical-damage-value.patch rename to patches/server/0185-Add-config-change-multiplier-critical-damage-value.patch index 56640a7ca..9fe1a48d5 100644 --- a/patches/server/0184-Add-config-change-multiplier-critical-damage-value.patch +++ b/patches/server/0185-Add-config-change-multiplier-critical-damage-value.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add config change multiplier critical damage value diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index 0a8c8a24af17262be3e656042dc5c8bce9364e8a..c7fbd149cc3a12f438b1dfaffba566278ef21bed 100644 +index 4ddeb2361528406a359eb0ccb204c965a03fc729..4252ff0201cbfbecc7b95ca86c1763dc5d88a4d7 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -1255,7 +1255,7 @@ public abstract class Player extends LivingEntity { @@ -18,7 +18,7 @@ index 0a8c8a24af17262be3e656042dc5c8bce9364e8a..c7fbd149cc3a12f438b1dfaffba56627 f += f1; diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index b8b9c307b23ed49e7d21798aa9125e7b64edf200..aac7e91c5d6e4d9dc2b1b131ac3cd4f4a07a493f 100644 +index cbc6e0aa76db3a0b58be9c1415e6cdc838eb9df7..9340520fc1f636d1c00b6c64fc838e21e23f48a4 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -326,6 +326,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0185-Option-to-disable-dragon-egg-teleporting.patch b/patches/server/0186-Option-to-disable-dragon-egg-teleporting.patch similarity index 95% rename from patches/server/0185-Option-to-disable-dragon-egg-teleporting.patch rename to patches/server/0186-Option-to-disable-dragon-egg-teleporting.patch index 32654ac5d..819868ccc 100644 --- a/patches/server/0185-Option-to-disable-dragon-egg-teleporting.patch +++ b/patches/server/0186-Option-to-disable-dragon-egg-teleporting.patch @@ -19,7 +19,7 @@ index 7e1edcc7b9f170b7c649437c2f0dd78c0bab9be4..5f8ac1fdac2c334951261f2b9702f5e7 BlockPos blockposition1 = pos.offset(world.random.nextInt(16) - world.random.nextInt(16), world.random.nextInt(8) - world.random.nextInt(8), world.random.nextInt(16) - world.random.nextInt(16)); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index aac7e91c5d6e4d9dc2b1b131ac3cd4f4a07a493f..74309929b9bbac31be89d3ddf6774dcbec4f7ded 100644 +index 9340520fc1f636d1c00b6c64fc838e21e23f48a4..bf94f53fb409cb1504e7b8330fcf54d9835e10c2 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -547,6 +547,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0186-Config-for-unverified-username-message.patch b/patches/server/0187-Config-for-unverified-username-message.patch similarity index 100% rename from patches/server/0186-Config-for-unverified-username-message.patch rename to patches/server/0187-Config-for-unverified-username-message.patch diff --git a/patches/server/0187-Make-anvil-cumulative-cost-configurable.patch b/patches/server/0188-Make-anvil-cumulative-cost-configurable.patch similarity index 100% rename from patches/server/0187-Make-anvil-cumulative-cost-configurable.patch rename to patches/server/0188-Make-anvil-cumulative-cost-configurable.patch diff --git a/patches/server/0188-ShulkerBox-allow-oversized-stacks.patch b/patches/server/0189-ShulkerBox-allow-oversized-stacks.patch similarity index 97% rename from patches/server/0188-ShulkerBox-allow-oversized-stacks.patch rename to patches/server/0189-ShulkerBox-allow-oversized-stacks.patch index 629552e59..5f3038f77 100644 --- a/patches/server/0188-ShulkerBox-allow-oversized-stacks.patch +++ b/patches/server/0189-ShulkerBox-allow-oversized-stacks.patch @@ -35,7 +35,7 @@ index 7f1230d915c98b6f30b13a06c2788bc2f7b7e912..9439119a70a411b1a7d9cd6a0090e413 blockEntity.saveToItem(itemStack); if (shulkerBoxBlockEntity.hasCustomName()) { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 74309929b9bbac31be89d3ddf6774dcbec4f7ded..53c1c12316dc0892b55fbbcce6933be3b378fd4a 100644 +index bf94f53fb409cb1504e7b8330fcf54d9835e10c2..d1b84e613bc7283b8f2dbb0671435be23ae48331 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -672,6 +672,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0189-Bee-can-work-when-raining-or-at-night.patch b/patches/server/0190-Bee-can-work-when-raining-or-at-night.patch similarity index 92% rename from patches/server/0189-Bee-can-work-when-raining-or-at-night.patch rename to patches/server/0190-Bee-can-work-when-raining-or-at-night.patch index e13852e83..ea7b4f73d 100644 --- a/patches/server/0189-Bee-can-work-when-raining-or-at-night.patch +++ b/patches/server/0190-Bee-can-work-when-raining-or-at-night.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Bee can work when raining or at night diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java -index 69511e218f9e1fa0c334023aed13337907cee875..b0ec555db51ce5451c178ad1d28df6d072f92bd3 100644 +index 0f3848287798dcaa57a99b531202e23fe8d05744..9fa2359662079f406ca6204fa06d5dbfefec49d5 100644 --- a/src/main/java/net/minecraft/world/entity/animal/Bee.java +++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java @@ -406,7 +406,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal { @@ -18,7 +18,7 @@ index 69511e218f9e1fa0c334023aed13337907cee875..b0ec555db51ce5451c178ad1d28df6d0 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 87ee1d0d51fb54702ae5763c01dba8632b2234e3..60dbc5c30e928cf00ed58e8fcbc4515371cc2ef7 100644 +index 2f8e6fb9f811fcfa6b6ed4dd15fcb38f061c8491..5faa6386a5666593f7bfb68dc4f1f303cbe6fda8 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 @@ -197,7 +197,7 @@ public class BeehiveBlockEntity extends BlockEntity { @@ -31,7 +31,7 @@ index 87ee1d0d51fb54702ae5763c01dba8632b2234e3..60dbc5c30e928cf00ed58e8fcbc45153 return false; } else { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 53c1c12316dc0892b55fbbcce6933be3b378fd4a..48b74a3c27ee04bae72153d140f90afab029cf15 100644 +index d1b84e613bc7283b8f2dbb0671435be23ae48331..549e835ab9b8c2ab1f2b8a5b292c7083f81353cf 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -779,6 +779,8 @@ public class PurpurWorldConfig { diff --git a/patches/server/0190-API-for-any-mob-to-burn-daylight.patch b/patches/server/0191-API-for-any-mob-to-burn-daylight.patch similarity index 96% rename from patches/server/0190-API-for-any-mob-to-burn-daylight.patch rename to patches/server/0191-API-for-any-mob-to-burn-daylight.patch index 9042e2516..c54407b06 100644 --- a/patches/server/0190-API-for-any-mob-to-burn-daylight.patch +++ b/patches/server/0191-API-for-any-mob-to-burn-daylight.patch @@ -29,7 +29,7 @@ index 35a04f593c66ae898b8b891dd4082aefe4d3feef..a4b0f5e289cbcb8eef3ba7994ab29319 // Purpur end } diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 42131cb0ed7346a6c9e466047a8f4a829523d611..e86d68ba3a875df414ad08ef05024dea95157014 100644 +index 59f4415ba484e49897a20b8e9fc576b7d8b4bfe8..1d9fa83b33921f64fe6e0917084e01b1a0dfa20e 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -262,6 +262,7 @@ public abstract class LivingEntity extends Entity { @@ -89,7 +89,7 @@ index 42131cb0ed7346a6c9e466047a8f4a829523d611..e86d68ba3a875df414ad08ef05024dea 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 d1fba8937127d40df87b3e243697cc83936610d8..ec4833cdff95e5038eba81886c2be88487bee279 100644 +index 2d20c36149433304aa420f66c39a66caddb8ed19..852ffb5c661f525b61fa95eccf1a0eb44c6fb4e2 100644 --- a/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java @@ -1656,17 +1656,7 @@ public abstract class Mob extends LivingEntity { @@ -112,7 +112,7 @@ index d1fba8937127d40df87b3e243697cc83936610d8..ec4833cdff95e5038eba81886c2be884 @Override diff --git a/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java b/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java -index 8869c32392383028128d6aa3eeaa474b7301cc0c..aa8a972479cea5d806959cf23df3101f0ea1ab2f 100644 +index a60ca5d69a9734c7979f953bd56c05c7016356d2..193622015c6d3dbff787061e13fa098a287bce0c 100644 --- a/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java +++ b/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java @@ -64,6 +64,7 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo @@ -209,7 +209,7 @@ index 5458ac83fa555e22ca858f4f596ebb8f37926dd5..ca5683e9b0b4aad3827fe6d00198da8e @Override diff --git a/src/main/java/net/minecraft/world/entity/monster/Phantom.java b/src/main/java/net/minecraft/world/entity/monster/Phantom.java -index 5cf1d412c248a558b53b99ffede96ead5579f51c..80fce16307a683c03a212b68fd9cb0ed2578d542 100644 +index 943d3e6db3212372b4ba8be35e15397f5b8c8a79..10b5c7f58f6f7248e9c97160faf7a52d57a797cf 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java +++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java @@ -60,6 +60,7 @@ public class Phantom extends FlyingMob implements Enemy { @@ -257,7 +257,7 @@ index 5cf1d412c248a558b53b99ffede96ead5579f51c..80fce16307a683c03a212b68fd9cb0ed public void setShouldBurnInDay(boolean shouldBurnInDay) { this.shouldBurnInDay = shouldBurnInDay; } // Paper end diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java -index be8182a2063fefa2c8f986c629eb629ef9dc1fee..2bd8dc3f5c0b28fb4ea380b4b4a8672d5ede2a38 100644 +index 493f3fe736cef11531d345b076ca240b5feb6ff2..735ecd9d768b9e579142810d5f03093dafad0fa3 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java +++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java @@ -93,11 +93,12 @@ public class Zombie extends Monster { @@ -333,7 +333,7 @@ index be8182a2063fefa2c8f986c629eb629ef9dc1fee..2bd8dc3f5c0b28fb4ea380b4b4a8672d // Paper end diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 30302c1cfdff65a5f1d0adde4c831f0a74f15851..1950210eb40c88ba7953f05190c7873b3221feb3 100644 +index 1f76a89e179b7a4bf28a172b1ece0603f975dbcd..16b4a5a5ae6e44ea63e0882757d0849ea2f74411 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -197,6 +197,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { diff --git a/patches/server/0191-Fix-advancement-triggers-on-entity-death.patch b/patches/server/0192-Fix-advancement-triggers-on-entity-death.patch similarity index 96% rename from patches/server/0191-Fix-advancement-triggers-on-entity-death.patch rename to patches/server/0192-Fix-advancement-triggers-on-entity-death.patch index e032a8965..8186208f0 100644 --- a/patches/server/0191-Fix-advancement-triggers-on-entity-death.patch +++ b/patches/server/0192-Fix-advancement-triggers-on-entity-death.patch @@ -16,7 +16,7 @@ restoring it back to the entity just before the criterion triggers run and then finally clearing the equipment again right after the criterion is done. diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index e86d68ba3a875df414ad08ef05024dea95157014..8f15148dc81c5370f19edb77b6412c3f97741a0a 100644 +index 1d9fa83b33921f64fe6e0917084e01b1a0dfa20e..c4fe33b1c7aa979f7bea21e091db393f61fc07ad 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1657,10 +1657,13 @@ public abstract class LivingEntity extends Entity { @@ -47,7 +47,7 @@ index e86d68ba3a875df414ad08ef05024dea95157014..8f15148dc81c5370f19edb77b6412c3f CompoundTag nbttagcompound = stack.getTag(); diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java -index ec4833cdff95e5038eba81886c2be88487bee279..2db4113b4c81d928eca1e2361425090aee099900 100644 +index 852ffb5c661f525b61fa95eccf1a0eb44c6fb4e2..bd39ab8959a805021d365813b5672b39368481a8 100644 --- a/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java @@ -1039,6 +1039,41 @@ public abstract class Mob extends LivingEntity { @@ -139,7 +139,7 @@ index 8634431cabae82b71f409f02c84dda2d8eca8504..46717e8979c3fb4a3bf9cc46f3b741a6 public boolean canTakeItem(ItemStack stack) { net.minecraft.world.entity.EquipmentSlot enumitemslot = Mob.getEquipmentSlotForItem(stack); diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index c7fbd149cc3a12f438b1dfaffba566278ef21bed..f55aef0116caf662f9cf1b14750422de802860bb 100644 +index 4252ff0201cbfbecc7b95ca86c1763dc5d88a4d7..5a73b085782dad9e4e35af18e6c70aca70793a5b 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -1990,6 +1990,52 @@ public abstract class Player extends LivingEntity { diff --git a/patches/server/0192-Config-MobEffect-by-world.patch b/patches/server/0193-Config-MobEffect-by-world.patch similarity index 98% rename from patches/server/0192-Config-MobEffect-by-world.patch rename to patches/server/0193-Config-MobEffect-by-world.patch index 3a2de2ad0..7cb5d7f02 100644 --- a/patches/server/0192-Config-MobEffect-by-world.patch +++ b/patches/server/0193-Config-MobEffect-by-world.patch @@ -40,7 +40,7 @@ index 8bbb9bdcf95989f1737714655f6f6a269d46d7f2..8d569eb2ec1b2bdbd415094ae04ae531 ((ServerPlayer) entityhuman).connection.send(new ClientboundSetHealthPacket(((ServerPlayer) entityhuman).getBukkitEntity().getScaledHealth(), entityhuman.getFoodData().foodLevel, entityhuman.getFoodData().saturationLevel)); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 48b74a3c27ee04bae72153d140f90afab029cf15..8558521fd931b67e7d4d95dada696658c2b69c93 100644 +index 549e835ab9b8c2ab1f2b8a5b292c7083f81353cf..9843e75c05fe49ea1fc3180e9bfe9b7ffeeb5b71 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -283,6 +283,21 @@ public class PurpurWorldConfig { diff --git a/patches/server/0193-Beacon-Activation-Range-Configurable.patch b/patches/server/0194-Beacon-Activation-Range-Configurable.patch similarity index 96% rename from patches/server/0193-Beacon-Activation-Range-Configurable.patch rename to patches/server/0194-Beacon-Activation-Range-Configurable.patch index 27b54fc41..bf610df9a 100644 --- a/patches/server/0193-Beacon-Activation-Range-Configurable.patch +++ b/patches/server/0194-Beacon-Activation-Range-Configurable.patch @@ -26,7 +26,7 @@ index 423560afba1bc03c0bb2b7d5d028451f34e59ec5..080694a06c9fdf57317dd281c4ddbd6c } else { return effectRange; diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 8558521fd931b67e7d4d95dada696658c2b69c93..f572a6816203216ed102cb04bd88b3d708389f5c 100644 +index 9843e75c05fe49ea1fc3180e9bfe9b7ffeeb5b71..3428e22f7cf6bca5cb1d49cdd434c5f039da3091 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -512,6 +512,17 @@ public class PurpurWorldConfig { diff --git a/patches/server/0194-Add-toggle-for-sand-duping-fix.patch b/patches/server/0195-Add-toggle-for-sand-duping-fix.patch similarity index 95% rename from patches/server/0194-Add-toggle-for-sand-duping-fix.patch rename to patches/server/0195-Add-toggle-for-sand-duping-fix.patch index 3007e2eb6..b0cb058ef 100644 --- a/patches/server/0194-Add-toggle-for-sand-duping-fix.patch +++ b/patches/server/0195-Add-toggle-for-sand-duping-fix.patch @@ -27,7 +27,7 @@ index 0c94b4cb6ee0c3dffe0b67a2291d0160ae0ef96f..92a9869dbabcaa704a0da8bc86f75786 } // Paper end - fix sand duping diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index f572a6816203216ed102cb04bd88b3d708389f5c..981ffd0b8cb204dd64fbc70c6fe3b88e389354cc 100644 +index 3428e22f7cf6bca5cb1d49cdd434c5f039da3091..67557b4c3495c15d3fba68852e9e09810a9c2750 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -698,6 +698,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0195-Add-toggle-for-end-portal-safe-teleporting.patch b/patches/server/0196-Add-toggle-for-end-portal-safe-teleporting.patch similarity index 94% rename from patches/server/0195-Add-toggle-for-end-portal-safe-teleporting.patch rename to patches/server/0196-Add-toggle-for-end-portal-safe-teleporting.patch index 77c2e9c5f..39b6d0845 100644 --- a/patches/server/0195-Add-toggle-for-end-portal-safe-teleporting.patch +++ b/patches/server/0196-Add-toggle-for-end-portal-safe-teleporting.patch @@ -18,7 +18,7 @@ index a4b0f5e289cbcb8eef3ba7994ab29319fbe2507b..3f2a2b8ff167a50d8c29583a7f4ee708 } diff --git a/src/main/java/net/minecraft/world/level/block/EndPortalBlock.java b/src/main/java/net/minecraft/world/level/block/EndPortalBlock.java -index 46fdaf744080ac01498ca693068616659a79b9ea..ca33161a9a2516031c942282fe26f970a40376a7 100644 +index bd4f980f68330fc46a02a6f4bb4403fac3a91919..8601ea0575323ea7cf07c4909a495bf5b1d10162 100644 --- a/src/main/java/net/minecraft/world/level/block/EndPortalBlock.java +++ b/src/main/java/net/minecraft/world/level/block/EndPortalBlock.java @@ -61,6 +61,22 @@ public class EndPortalBlock extends BaseEntityBlock { @@ -45,7 +45,7 @@ index 46fdaf744080ac01498ca693068616659a79b9ea..ca33161a9a2516031c942282fe26f970 entity.portalWorld = ((ServerLevel)world); entity.portalBlock = pos.immutable(); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 981ffd0b8cb204dd64fbc70c6fe3b88e389354cc..862eb9df819143317e949fcc902f0f1736c225d0 100644 +index 67557b4c3495c15d3fba68852e9e09810a9c2750..dbf4f78f4089edc437658a73a2cb242b9729d190 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -633,6 +633,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0196-Flying-Fall-Damage-API.patch b/patches/server/0197-Flying-Fall-Damage-API.patch similarity index 95% rename from patches/server/0196-Flying-Fall-Damage-API.patch rename to patches/server/0197-Flying-Fall-Damage-API.patch index cb22bbedd..c58fdfbd0 100644 --- a/patches/server/0196-Flying-Fall-Damage-API.patch +++ b/patches/server/0197-Flying-Fall-Damage-API.patch @@ -26,7 +26,7 @@ index 5a73b085782dad9e4e35af18e6c70aca70793a5b..e25b8b0023d4f0368f3104a9b2a01558 } else { if (fallDistance >= 2.0F) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 0bd742b09d607ba272a3d18fac164670492f60ca..7e59cad26627286bdba07399177cc8bef74a0c6d 100644 +index 235dbac7c3c28e5c2fb2aa3bfbafc7ff008e00ff..c1404be359c9f21bb7ae94b9cf69b6a01ba75392 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -2614,5 +2614,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0197-Make-lightning-rod-range-configurable.patch b/patches/server/0198-Make-lightning-rod-range-configurable.patch similarity index 100% rename from patches/server/0197-Make-lightning-rod-range-configurable.patch rename to patches/server/0198-Make-lightning-rod-range-configurable.patch diff --git a/patches/server/0198-Burp-after-eating-food-fills-hunger-bar-completely.patch b/patches/server/0199-Burp-after-eating-food-fills-hunger-bar-completely.patch similarity index 95% rename from patches/server/0198-Burp-after-eating-food-fills-hunger-bar-completely.patch rename to patches/server/0199-Burp-after-eating-food-fills-hunger-bar-completely.patch index c7f47da0c..014420d40 100644 --- a/patches/server/0198-Burp-after-eating-food-fills-hunger-bar-completely.patch +++ b/patches/server/0199-Burp-after-eating-food-fills-hunger-bar-completely.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Burp after eating food fills hunger bar completely diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index df780b1e7d0f598c5b5eb249f69f342af2381a08..8a2b855851316e6715b037430e6897535375f4e2 100644 +index e25b8b0023d4f0368f3104a9b2a015585e65b9f9..824365f63052cae797e53bf3a30fea78e3b60492 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -193,6 +193,8 @@ public abstract class Player extends LivingEntity { @@ -55,7 +55,7 @@ index 2934b6de1f1fb914a532ee20184df99d1acd8e65..65421cfff05c0493f5fef1bdff03172c public void eat(Item item, ItemStack stack) { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 862eb9df819143317e949fcc902f0f1736c225d0..2dc6b2f723f08d633898f9e982c9fb09a0c4c110 100644 +index dbf4f78f4089edc437658a73a2cb242b9729d190..3d079a1c63ff4dedb095e98f75a39b50ef1d04a1 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -342,6 +342,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0199-Allow-player-join-full-server-by-permission.patch b/patches/server/0200-Allow-player-join-full-server-by-permission.patch similarity index 93% rename from patches/server/0199-Allow-player-join-full-server-by-permission.patch rename to patches/server/0200-Allow-player-join-full-server-by-permission.patch index b0a43a8e7..f22930d2b 100644 --- a/patches/server/0199-Allow-player-join-full-server-by-permission.patch +++ b/patches/server/0200-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 e4e7049e9e9739b5f5035319640eb04642adcb05..28011a91a668efc4671bc78da72561b76018c7e8 100644 +index cf5916a1fe4fcf5353f5c7a00074b668469038ac..a1d851edb0f4eb5500146bda349b19f64932f13c 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -762,7 +762,7 @@ public abstract class PlayerList { diff --git a/patches/server/0200-Add-permission-bypass-for-portal-waiting.patch b/patches/server/0201-Add-permission-bypass-for-portal-waiting.patch similarity index 94% rename from patches/server/0200-Add-permission-bypass-for-portal-waiting.patch rename to patches/server/0201-Add-permission-bypass-for-portal-waiting.patch index 532ade1d6..760ba1555 100644 --- a/patches/server/0200-Add-permission-bypass-for-portal-waiting.patch +++ b/patches/server/0201-Add-permission-bypass-for-portal-waiting.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add permission bypass for portal waiting diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index 8a2b855851316e6715b037430e6897535375f4e2..f9247644e528415388911f22ac1833c678947d37 100644 +index 824365f63052cae797e53bf3a30fea78e3b60492..a527b048e2fe4716609778f03060e13b8b88c544 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -181,6 +181,7 @@ public abstract class Player extends LivingEntity { diff --git a/patches/server/0201-Shulker-spawn-from-bullet-options.patch b/patches/server/0202-Shulker-spawn-from-bullet-options.patch similarity index 96% rename from patches/server/0201-Shulker-spawn-from-bullet-options.patch rename to patches/server/0202-Shulker-spawn-from-bullet-options.patch index 949c58636..4cd6c48f5 100644 --- a/patches/server/0201-Shulker-spawn-from-bullet-options.patch +++ b/patches/server/0202-Shulker-spawn-from-bullet-options.patch @@ -13,7 +13,7 @@ Subject: [PATCH] Shulker spawn from bullet options (7 - 1) / 5.0 = 1.2 1.0 - 1.2 = -0.2 0% (6 other shulkers) diff --git a/src/main/java/net/minecraft/world/entity/monster/Shulker.java b/src/main/java/net/minecraft/world/entity/monster/Shulker.java -index e463a4b40dbaed9c2d4e29d18cba98e47af3df3c..73750ec94993fba1d4e7cf7927bb60166757805a 100644 +index 0cef642b6b13347b953f59e1bca909aa7451b851..ec7c5f638573ee331112d91cdfaa8511801c6891 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Shulker.java +++ b/src/main/java/net/minecraft/world/entity/monster/Shulker.java @@ -501,13 +501,22 @@ public class Shulker extends AbstractGolem implements Enemy { @@ -61,7 +61,7 @@ index f812a75985d26785639491c9a980387a3f261f2d..b11fb39b69f5225ca7da72ca1a2200c7 + // Purpur end } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 2dc6b2f723f08d633898f9e982c9fb09a0c4c110..3312036449d0c28b5ee04abce13f8db2576cd017 100644 +index 3d079a1c63ff4dedb095e98f75a39b50ef1d04a1..ab1d8798c092683b862a0c74dd9751395e3da1ae 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1808,6 +1808,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0202-Eating-glow-berries-adds-glow-effect.patch b/patches/server/0203-Eating-glow-berries-adds-glow-effect.patch similarity index 100% rename from patches/server/0202-Eating-glow-berries-adds-glow-effect.patch rename to patches/server/0203-Eating-glow-berries-adds-glow-effect.patch diff --git a/patches/server/0203-Option-to-make-drowned-break-doors.patch b/patches/server/0204-Option-to-make-drowned-break-doors.patch similarity index 94% rename from patches/server/0203-Option-to-make-drowned-break-doors.patch rename to patches/server/0204-Option-to-make-drowned-break-doors.patch index 01067247d..b06b48d06 100644 --- a/patches/server/0203-Option-to-make-drowned-break-doors.patch +++ b/patches/server/0204-Option-to-make-drowned-break-doors.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Option to make drowned break doors diff --git a/src/main/java/net/minecraft/world/entity/monster/Drowned.java b/src/main/java/net/minecraft/world/entity/monster/Drowned.java -index bd209089f0730674f811d96bdbe7915d6a857729..ddc38e57ae551f4954c8da884648c5ae018feb67 100644 +index 4d2bb12b8168fceae71622a9f8bd5102d0024208..a592fb29097232d5d9c6e6d946fb326fd901f27b 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Drowned.java +++ b/src/main/java/net/minecraft/world/entity/monster/Drowned.java @@ -30,6 +30,7 @@ import net.minecraft.world.entity.ai.goal.MoveToBlockGoal; @@ -34,7 +34,7 @@ index bd209089f0730674f811d96bdbe7915d6a857729..ddc38e57ae551f4954c8da884648c5ae @Override diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index fb13ffdb5d8bfb296fd10a5bc8e84bbbb309e4bb..92bc2ac4e9ac2a812d8523a1f35e5f865b5fb7c7 100644 +index e7514438274af2e71c1323f75e21ccf1e0303814..7d95c170d769e17e0f5d4791e47636c95565aeb9 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1039,6 +1039,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0204-Configurable-hunger-starvation-damage.patch b/patches/server/0205-Configurable-hunger-starvation-damage.patch similarity index 95% rename from patches/server/0204-Configurable-hunger-starvation-damage.patch rename to patches/server/0205-Configurable-hunger-starvation-damage.patch index 0a35e67a6..f74e5442b 100644 --- a/patches/server/0204-Configurable-hunger-starvation-damage.patch +++ b/patches/server/0205-Configurable-hunger-starvation-damage.patch @@ -18,7 +18,7 @@ index 65421cfff05c0493f5fef1bdff03172c9e33f33e..63584faeec4e5013be7a377e3203ec16 this.tickTimer = 0; diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 92bc2ac4e9ac2a812d8523a1f35e5f865b5fb7c7..6da884ad810dc1badcf16850e96ce25d3da72e04 100644 +index 7d95c170d769e17e0f5d4791e47636c95565aeb9..ec7abc7bbbaecf4b6dab7635c33f89d0e6c0a608 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -2397,4 +2397,9 @@ public class PurpurWorldConfig { diff --git a/patches/server/0205-Redirect-System.out-calls-to-plugin-loggers.patch b/patches/server/0206-Redirect-System.out-calls-to-plugin-loggers.patch similarity index 100% rename from patches/server/0205-Redirect-System.out-calls-to-plugin-loggers.patch rename to patches/server/0206-Redirect-System.out-calls-to-plugin-loggers.patch diff --git a/patches/server/0206-Armor-click-equip-options.patch b/patches/server/0207-Armor-click-equip-options.patch similarity index 98% rename from patches/server/0206-Armor-click-equip-options.patch rename to patches/server/0207-Armor-click-equip-options.patch index 5796fd03a..11d1714be 100644 --- a/patches/server/0206-Armor-click-equip-options.patch +++ b/patches/server/0207-Armor-click-equip-options.patch @@ -58,7 +58,7 @@ index 42f79d418ec4e2dbeac9a217d9dc144cda2ef714..250c0e31825f772d3fee7a523f150cb2 return InteractionResultHolder.fail(itemStack); } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 6da884ad810dc1badcf16850e96ce25d3da72e04..4307430bc0074a9061a40415019341926fd685fa 100644 +index ec7abc7bbbaecf4b6dab7635c33f89d0e6c0a608..b22347a9b3566fae94da5edb4ef6609540f2bffe 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -345,6 +345,8 @@ public class PurpurWorldConfig { diff --git a/patches/server/0207-Add-uptime-command.patch b/patches/server/0208-Add-uptime-command.patch similarity index 100% rename from patches/server/0207-Add-uptime-command.patch rename to patches/server/0208-Add-uptime-command.patch diff --git a/patches/server/0208-Structure-seed-options.patch b/patches/server/0209-Structure-seed-options.patch similarity index 95% rename from patches/server/0208-Structure-seed-options.patch rename to patches/server/0209-Structure-seed-options.patch index 3ad5ae862..a6ff20d6f 100644 --- a/patches/server/0208-Structure-seed-options.patch +++ b/patches/server/0209-Structure-seed-options.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Structure seed options diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java -index e4591c0b3c8547cc6f4e2a0891fc378ee4334d9e..fe0f14b363f4e6b583cd079f2cf627605731f764 100644 +index 11b0697f668f6c0965a74081c149585fdf49b209..096f05db09d98e2b8edfd35d2cd97f9b4085d056 100644 --- a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java +++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java -@@ -580,6 +580,23 @@ public abstract class ChunkGenerator implements BiomeManager.NoiseBiomeSource { +@@ -588,6 +588,23 @@ public abstract class ChunkGenerator implements BiomeManager.NoiseBiomeSource { case "village": seed = conf.villageSeed; break; diff --git a/patches/server/0209-Tool-actionable-options.patch b/patches/server/0210-Tool-actionable-options.patch similarity index 100% rename from patches/server/0209-Tool-actionable-options.patch rename to patches/server/0210-Tool-actionable-options.patch diff --git a/patches/server/0210-Store-placer-on-Block-when-placed.patch b/patches/server/0211-Store-placer-on-Block-when-placed.patch similarity index 100% rename from patches/server/0210-Store-placer-on-Block-when-placed.patch rename to patches/server/0211-Store-placer-on-Block-when-placed.patch diff --git a/patches/server/0211-Summoner-API.patch b/patches/server/0212-Summoner-API.patch similarity index 97% rename from patches/server/0211-Summoner-API.patch rename to patches/server/0212-Summoner-API.patch index 8b596b96c..8727599b2 100644 --- a/patches/server/0211-Summoner-API.patch +++ b/patches/server/0212-Summoner-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Summoner API diff --git a/src/main/java/net/minecraft/world/entity/animal/IronGolem.java b/src/main/java/net/minecraft/world/entity/animal/IronGolem.java -index efe3839f893eefe241dac14b7796baa2aaa22aad..24a4e75a79ba5f8b13fbbf3192a618d2b445c36c 100644 +index ff5d6f437b880ab0aa5897089694a620be7eacca..dd328a4514ef3638a44442797cbc616dbaef1f72 100644 --- a/src/main/java/net/minecraft/world/entity/animal/IronGolem.java +++ b/src/main/java/net/minecraft/world/entity/animal/IronGolem.java @@ -64,6 +64,7 @@ public class IronGolem extends AbstractGolem implements NeutralMob { @@ -49,7 +49,7 @@ index efe3839f893eefe241dac14b7796baa2aaa22aad..24a4e75a79ba5f8b13fbbf3192a618d2 } diff --git a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java -index d457978c0345aa51c03880cf87a08494b2e117c5..51aaacb529c052e3e9b96a1f6db454d87c088c35 100644 +index 9581dccfd671d89d296d3b07fb45a0234d110395..1e646078c4522aaad4e298172af6972a940cdf5c 100644 --- a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java +++ b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java @@ -49,6 +49,7 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM @@ -93,7 +93,7 @@ index d457978c0345aa51c03880cf87a08494b2e117c5..51aaacb529c052e3e9b96a1f6db454d8 } diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java -index b6f1ad54cdacafb0995a992ff3990a5517380ab3..2943342e6dddc3b89411b7a6548d56b69a201d25 100644 +index 5ef45fe1dac1df779727f9c441f7e6515185e507..46b8886b6b17fa145db42aeb380f22ec0ae99ec0 100644 --- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java +++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java @@ -86,6 +86,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob diff --git a/patches/server/0212-Customizable-sleeping-actionbar-messages.patch b/patches/server/0213-Customizable-sleeping-actionbar-messages.patch similarity index 100% rename from patches/server/0212-Customizable-sleeping-actionbar-messages.patch rename to patches/server/0213-Customizable-sleeping-actionbar-messages.patch diff --git a/patches/server/0213-option-to-disable-shulker-box-items-from-dropping-co.patch b/patches/server/0214-option-to-disable-shulker-box-items-from-dropping-co.patch similarity index 96% rename from patches/server/0213-option-to-disable-shulker-box-items-from-dropping-co.patch rename to patches/server/0214-option-to-disable-shulker-box-items-from-dropping-co.patch index 3657cbf2f..5f6973139 100644 --- a/patches/server/0213-option-to-disable-shulker-box-items-from-dropping-co.patch +++ b/patches/server/0214-option-to-disable-shulker-box-items-from-dropping-co.patch @@ -19,7 +19,7 @@ index 8175bb6331727440da2232998bdad068a1c47ae8..be47543240bd573cd2cc08f84b7eab1c CompoundTag nbttagcompound = BlockItem.getBlockEntityData(itemstack); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 7c945107ada60079ddf9cb9d51390b5a11b21e98..c867e1e9aff703f54cfa614c6ad4ac0eadfc9dc9 100644 +index c5c0fb7bceddb1c1bb689bf67ed815fe361ae2ba..43b5dd1392a08a11cdd5c095582f60f7322fa729 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -175,6 +175,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0214-Silk-touchable-budding-amethyst.patch b/patches/server/0215-Silk-touchable-budding-amethyst.patch similarity index 96% rename from patches/server/0214-Silk-touchable-budding-amethyst.patch rename to patches/server/0215-Silk-touchable-budding-amethyst.patch index 2da069d01..2e7031b9d 100644 --- a/patches/server/0214-Silk-touchable-budding-amethyst.patch +++ b/patches/server/0215-Silk-touchable-budding-amethyst.patch @@ -24,7 +24,7 @@ index 02fc3ede12eadbf72e26e31b1c475c7f5b2ad73a..2288e727929ffb3a3bca138fb0289408 + // Purpur end } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index c867e1e9aff703f54cfa614c6ad4ac0eadfc9dc9..21c80f579ba9826a330bc3a4ac0136862626d8ca 100644 +index 43b5dd1392a08a11cdd5c095582f60f7322fa729..8012730d0f82b9ecdee59241c87c9ed56f7f3c67 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -696,6 +696,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0215-Big-dripleaf-tilt-delay.patch b/patches/server/0216-Big-dripleaf-tilt-delay.patch similarity index 96% rename from patches/server/0215-Big-dripleaf-tilt-delay.patch rename to patches/server/0216-Big-dripleaf-tilt-delay.patch index b09839fd9..553fd8b63 100644 --- a/patches/server/0215-Big-dripleaf-tilt-delay.patch +++ b/patches/server/0216-Big-dripleaf-tilt-delay.patch @@ -24,7 +24,7 @@ index 3f434ac77611a81889b15c118a0fca57cc10a6bb..36d65d85d3cc030551fc0957c1ebbff6 if (i != -1) { world.scheduleTick(blockposition, (Block) this, i); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 21c80f579ba9826a330bc3a4ac0136862626d8ca..df502d2a8c5bfacceec410441c193e77e2c97d8e 100644 +index 8012730d0f82b9ecdee59241c87c9ed56f7f3c67..76e599962983c840e3db08f77e54a62b48999d43 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -696,6 +696,22 @@ public class PurpurWorldConfig { diff --git a/patches/server/0216-Player-ridable-in-water-option.patch b/patches/server/0217-Player-ridable-in-water-option.patch similarity index 92% rename from patches/server/0216-Player-ridable-in-water-option.patch rename to patches/server/0217-Player-ridable-in-water-option.patch index 15749b8c3..6d2db4064 100644 --- a/patches/server/0216-Player-ridable-in-water-option.patch +++ b/patches/server/0217-Player-ridable-in-water-option.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Player ridable in water option diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index f9247644e528415388911f22ac1833c678947d37..0aec0e4760f0ea0188a0b5c90a9c5526e253b2cc 100644 +index a527b048e2fe4716609778f03060e13b8b88c544..4f3bd5847143692a611e5785b9d1fe3493b4f778 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -2061,6 +2061,11 @@ public abstract class Player extends LivingEntity { @@ -21,7 +21,7 @@ index f9247644e528415388911f22ac1833c678947d37..0aec0e4760f0ea0188a0b5c90a9c5526 if (!this.isPassenger() && this.onGround && !this.isInWater() && !this.isInPowderSnow) { if (this.getShoulderEntityLeft().isEmpty()) { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index df502d2a8c5bfacceec410441c193e77e2c97d8e..b28c15180fff218381fbeccc505ed9f04d08e03f 100644 +index 76e599962983c840e3db08f77e54a62b48999d43..ab59d6ed968ddcf33677447ee0584443a15d0c79 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -349,6 +349,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0217-Config-to-disable-Enderman-teleport-on-projectile-hi.patch b/patches/server/0218-Config-to-disable-Enderman-teleport-on-projectile-hi.patch similarity index 100% rename from patches/server/0217-Config-to-disable-Enderman-teleport-on-projectile-hi.patch rename to patches/server/0218-Config-to-disable-Enderman-teleport-on-projectile-hi.patch diff --git a/patches/server/0218-Add-compass-command.patch b/patches/server/0219-Add-compass-command.patch similarity index 100% rename from patches/server/0218-Add-compass-command.patch rename to patches/server/0219-Add-compass-command.patch diff --git a/patches/server/0219-Config-to-prevent-horses-from-standing-with-riders.patch b/patches/server/0220-Config-to-prevent-horses-from-standing-with-riders.patch similarity index 92% rename from patches/server/0219-Config-to-prevent-horses-from-standing-with-riders.patch rename to patches/server/0220-Config-to-prevent-horses-from-standing-with-riders.patch index b8b241953..b26f1da31 100644 --- a/patches/server/0219-Config-to-prevent-horses-from-standing-with-riders.patch +++ b/patches/server/0220-Config-to-prevent-horses-from-standing-with-riders.patch @@ -7,7 +7,7 @@ Horses have a chance to stand (rear) when their ambient noise is played. This can happen while the horse is moving with a rider, which will cause the horse to suddenly stop for a moment. diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java b/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java -index 56694c9918ab2e8d0ff5cfda6d60360b0cd16674..c9daf65ce500e29ce8f73d1ec6379fc2e172ae64 100644 +index 0be0c81f2b0a58eba75eb8559f78d8a58014d0ae..f7088aaf65ee5725e928845a634852119b403cef 100644 --- a/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java +++ b/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java @@ -396,7 +396,7 @@ public abstract class AbstractHorse extends Animal implements ContainerListener, @@ -20,7 +20,7 @@ index 56694c9918ab2e8d0ff5cfda6d60360b0cd16674..c9daf65ce500e29ce8f73d1ec6379fc2 } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 37c96672f890b32892ba8eeac25baab714a3d095..1543d6e375246190777e85f1e097e93b187c3edc 100644 +index 97cb7b68186b1379efce1d855adc4d4be1dadfe4..42a9f68ffc4f9a6d55266b935b93de2c68a01e66 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1484,6 +1484,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0220-Toggle-for-kinetic-damage.patch b/patches/server/0221-Toggle-for-kinetic-damage.patch similarity index 92% rename from patches/server/0220-Toggle-for-kinetic-damage.patch rename to patches/server/0221-Toggle-for-kinetic-damage.patch index 88bd4c3b6..987aa861e 100644 --- a/patches/server/0220-Toggle-for-kinetic-damage.patch +++ b/patches/server/0221-Toggle-for-kinetic-damage.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Toggle for kinetic damage diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 8f15148dc81c5370f19edb77b6412c3f97741a0a..0f395aa8e471f724617b391501cdd2f3357ab894 100644 +index c4fe33b1c7aa979f7bea21e091db393f61fc07ad..748f5fb6977eb4208332e3e75b84fd1b7d888cb1 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -2791,7 +2791,11 @@ public abstract class LivingEntity extends Entity { @@ -22,7 +22,7 @@ index 8f15148dc81c5370f19edb77b6412c3f97741a0a..0f395aa8e471f724617b391501cdd2f3 } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 1543d6e375246190777e85f1e097e93b187c3edc..f12c97db301e3f5e9fc32232657a99b67e37c53b 100644 +index 42a9f68ffc4f9a6d55266b935b93de2c68a01e66..6f63f25885fd22c71aa8f3e307b7d04fac40c2d4 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -138,12 +138,14 @@ public class PurpurWorldConfig { diff --git a/patches/server/0221-Add-Option-for-disable-observer-clocks.patch b/patches/server/0222-Add-Option-for-disable-observer-clocks.patch similarity index 95% rename from patches/server/0221-Add-Option-for-disable-observer-clocks.patch rename to patches/server/0222-Add-Option-for-disable-observer-clocks.patch index d9b776f4c..2aa84fe02 100644 --- a/patches/server/0221-Add-Option-for-disable-observer-clocks.patch +++ b/patches/server/0222-Add-Option-for-disable-observer-clocks.patch @@ -18,7 +18,7 @@ index 4a34a08a1d46e4d3020644a51d9e30a36a18791a..be28b5aba28383058548cfb68f982664 } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index f12c97db301e3f5e9fc32232657a99b67e37c53b..e75dea055def35968285ab258729c387d427771d 100644 +index 6f63f25885fd22c71aa8f3e307b7d04fac40c2d4..c2b7c09adf13ae555361770c01fa1fc84a0c1dc5 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -321,6 +321,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0222-Customizeable-Zombie-Villager-curing-times.patch b/patches/server/0223-Customizeable-Zombie-Villager-curing-times.patch similarity index 96% rename from patches/server/0222-Customizeable-Zombie-Villager-curing-times.patch rename to patches/server/0223-Customizeable-Zombie-Villager-curing-times.patch index d4167b2d6..7e7556b76 100644 --- a/patches/server/0222-Customizeable-Zombie-Villager-curing-times.patch +++ b/patches/server/0223-Customizeable-Zombie-Villager-curing-times.patch @@ -18,7 +18,7 @@ index 96e5d1210e27b0bca7a354366e5c805709ae4fec..c6ba41c2b4cc96bc97ed2e2220c0f3fa this.gameEvent(GameEvent.MOB_INTERACT, this.eyeBlockPosition()); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index e75dea055def35968285ab258729c387d427771d..9e9ab8f2a93bba600f5dede7502835e521d33c8c 100644 +index c2b7c09adf13ae555361770c01fa1fc84a0c1dc5..b010ad0acb2a54d91c666068b275650135e44410 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -2545,6 +2545,8 @@ public class PurpurWorldConfig { diff --git a/patches/server/0223-Option-for-sponges-to-work-on-lava.patch b/patches/server/0224-Option-for-sponges-to-work-on-lava.patch similarity index 95% rename from patches/server/0223-Option-for-sponges-to-work-on-lava.patch rename to patches/server/0224-Option-for-sponges-to-work-on-lava.patch index 1db433d8d..c9c4ab2dd 100644 --- a/patches/server/0223-Option-for-sponges-to-work-on-lava.patch +++ b/patches/server/0224-Option-for-sponges-to-work-on-lava.patch @@ -18,7 +18,7 @@ index 97b4e3c0d2b1bbde77b135b8595c3bfa190a14cb..02b98cfe47d5d2f3c362a84c6b05e734 ++i; if (j < world.purpurConfig.spongeAbsorptionRadius) { // Purpur diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 9e9ab8f2a93bba600f5dede7502835e521d33c8c..f34480af918082f692038c051a713fda62d7faeb 100644 +index b010ad0acb2a54d91c666068b275650135e44410..aacdc7b7bec37bf319af6f068f5343c3f3e10291 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -924,9 +924,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0224-Toggle-for-Wither-s-spawn-sound.patch b/patches/server/0225-Toggle-for-Wither-s-spawn-sound.patch similarity index 92% rename from patches/server/0224-Toggle-for-Wither-s-spawn-sound.patch rename to patches/server/0225-Toggle-for-Wither-s-spawn-sound.patch index 82a1a2840..578011e12 100644 --- a/patches/server/0224-Toggle-for-Wither-s-spawn-sound.patch +++ b/patches/server/0225-Toggle-for-Wither-s-spawn-sound.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Toggle for Wither's spawn sound diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java -index 2943342e6dddc3b89411b7a6548d56b69a201d25..5ca3d7dfadb213530739863571fa6cafb819d82d 100644 +index 46b8886b6b17fa145db42aeb380f22ec0ae99ec0..1cab4c037c99babf4e35480de7ffc02be0c28583 100644 --- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java +++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java @@ -414,7 +414,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob @@ -18,7 +18,7 @@ index 2943342e6dddc3b89411b7a6548d56b69a201d25..5ca3d7dfadb213530739863571fa6caf // this.world.globalLevelEvent(1023, new BlockPosition(this), 0); //int viewDistance = ((ServerLevel) this.level).getCraftServer().getViewDistance() * 16; // Paper - updated to use worlds actual view distance incase we have to uncomment this due to removal of player view distance API diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index f34480af918082f692038c051a713fda62d7faeb..2b65e68b5b0fdbe73a5d9082a1d6b9e6093adbcf 100644 +index aacdc7b7bec37bf319af6f068f5343c3f3e10291..db2071fdd068c00a81be179290b5b970ceaf3386 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -2400,6 +2400,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0225-Cactus-breaks-from-solid-neighbors-config.patch b/patches/server/0226-Cactus-breaks-from-solid-neighbors-config.patch similarity index 95% rename from patches/server/0225-Cactus-breaks-from-solid-neighbors-config.patch rename to patches/server/0226-Cactus-breaks-from-solid-neighbors-config.patch index 467a2b879..b2f832330 100644 --- a/patches/server/0225-Cactus-breaks-from-solid-neighbors-config.patch +++ b/patches/server/0226-Cactus-breaks-from-solid-neighbors-config.patch @@ -18,7 +18,7 @@ index fa36ad3bb63764778aa7201d90e331e64292c7b4..dfa06b3c7323aeb12b1e234ca27c924a return false; } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 2b65e68b5b0fdbe73a5d9082a1d6b9e6093adbcf..2bef007da942d045fa6b2a424c5d0b780ecff2b7 100644 +index db2071fdd068c00a81be179290b5b970ceaf3386..a0304c89411a1226457747eb1f142676367958dc 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -728,6 +728,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0226-Config-to-remove-curse-of-binding-with-weakness.patch b/patches/server/0227-Config-to-remove-curse-of-binding-with-weakness.patch similarity index 96% rename from patches/server/0226-Config-to-remove-curse-of-binding-with-weakness.patch rename to patches/server/0227-Config-to-remove-curse-of-binding-with-weakness.patch index a82b49046..b3159c9b9 100644 --- a/patches/server/0226-Config-to-remove-curse-of-binding-with-weakness.patch +++ b/patches/server/0227-Config-to-remove-curse-of-binding-with-weakness.patch @@ -26,7 +26,7 @@ index 111da6398bb561e58571e47743088ce80416234d..0a2c776b9b1da7d0d4481dd527e0068b @Override diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 2bef007da942d045fa6b2a424c5d0b780ecff2b7..85ced4d3abf220dd625349356da2a075503ea037 100644 +index a0304c89411a1226457747eb1f142676367958dc..2d81bb200943a2e11679babf680705374f81e7c3 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -359,6 +359,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0227-Conduit-behavior-configuration.patch b/patches/server/0228-Conduit-behavior-configuration.patch similarity index 97% rename from patches/server/0227-Conduit-behavior-configuration.patch rename to patches/server/0228-Conduit-behavior-configuration.patch index 4112b0084..24cbd3379 100644 --- a/patches/server/0227-Conduit-behavior-configuration.patch +++ b/patches/server/0228-Conduit-behavior-configuration.patch @@ -44,7 +44,7 @@ index 96b6e914441ee1faa059aa5ddcf77ffb74e76ae9..31af7d8111e73169d3e02aa52799a018 } CraftEventFactory.blockDamage = null; diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 85ced4d3abf220dd625349356da2a075503ea037..cb43d8724a3b0324668d415c47df57e93a82b6a5 100644 +index 2d81bb200943a2e11679babf680705374f81e7c3..15810fe4ae2dda94d339352d6c263a3753cd274f 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -2606,4 +2606,27 @@ public class PurpurWorldConfig { diff --git a/patches/server/0228-Cauldron-fill-chances.patch b/patches/server/0229-Cauldron-fill-chances.patch similarity index 95% rename from patches/server/0228-Cauldron-fill-chances.patch rename to patches/server/0229-Cauldron-fill-chances.patch index 34d293f14..48fef5f87 100644 --- a/patches/server/0228-Cauldron-fill-chances.patch +++ b/patches/server/0229-Cauldron-fill-chances.patch @@ -18,7 +18,7 @@ index dbae4f3b56d0290c6d28b9beaaa3b459754d43e3..676184c48c3abd8e2fb9a04ae3e165dc @Override diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index cb43d8724a3b0324668d415c47df57e93a82b6a5..2ce74212c5c4f251fba659e8182c43346c98d375 100644 +index 15810fe4ae2dda94d339352d6c263a3753cd274f..18099116b059c54922e103aa918b100288beb1f2 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -2629,4 +2629,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0229-Config-to-allow-mobs-to-pathfind-over-rails.patch b/patches/server/0230-Config-to-allow-mobs-to-pathfind-over-rails.patch similarity index 96% rename from patches/server/0229-Config-to-allow-mobs-to-pathfind-over-rails.patch rename to patches/server/0230-Config-to-allow-mobs-to-pathfind-over-rails.patch index 47cdca232..b36614b88 100644 --- a/patches/server/0229-Config-to-allow-mobs-to-pathfind-over-rails.patch +++ b/patches/server/0230-Config-to-allow-mobs-to-pathfind-over-rails.patch @@ -18,7 +18,7 @@ index ce891b7d8e5cbc956c28b8bb8c5c9976b7377039..8ecc9099515e38bfe38a5f9ca034cd81 if (node != null && (node.type == BlockPathTypes.OPEN || node.type == BlockPathTypes.WALKABLE) && this.mob.getBbWidth() < 1.0F) { double g = (double)(x - direction.getStepX()) + 0.5D; diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 2ce74212c5c4f251fba659e8182c43346c98d375..0b3ba0c4135229f93473bcdfe837db338e01cb4f 100644 +index 18099116b059c54922e103aa918b100288beb1f2..187de951768274826a1e42611a559aa1face952d 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -654,6 +654,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0230-Add-force-and-prompt-parameters-to-resource-pack-api.patch b/patches/server/0231-Add-force-and-prompt-parameters-to-resource-pack-api.patch similarity index 95% rename from patches/server/0230-Add-force-and-prompt-parameters-to-resource-pack-api.patch rename to patches/server/0231-Add-force-and-prompt-parameters-to-resource-pack-api.patch index 06f96f139..b98d347b0 100644 --- a/patches/server/0230-Add-force-and-prompt-parameters-to-resource-pack-api.patch +++ b/patches/server/0231-Add-force-and-prompt-parameters-to-resource-pack-api.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add force and prompt parameters to resource pack api diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 7e59cad26627286bdba07399177cc8bef74a0c6d..85ae66b06a7915bb1c91b3962c916fc24e9aefb8 100644 +index c1404be359c9f21bb7ae94b9cf69b6a01ba75392..544d2fee9835d6c7313ed1a1d085e4d73be63dd1 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -27,6 +27,8 @@ import java.util.WeakHashMap; diff --git a/patches/server/0231-Shulker-change-color-with-dye.patch b/patches/server/0232-Shulker-change-color-with-dye.patch similarity index 94% rename from patches/server/0231-Shulker-change-color-with-dye.patch rename to patches/server/0232-Shulker-change-color-with-dye.patch index 7c9d53c03..44eb5b515 100644 --- a/patches/server/0231-Shulker-change-color-with-dye.patch +++ b/patches/server/0232-Shulker-change-color-with-dye.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Shulker change color with dye diff --git a/src/main/java/net/minecraft/world/entity/monster/Shulker.java b/src/main/java/net/minecraft/world/entity/monster/Shulker.java -index 73750ec94993fba1d4e7cf7927bb60166757805a..4739f1e29a748cf69d37e616e067810812bb9964 100644 +index ec7c5f638573ee331112d91cdfaa8511801c6891..e9f4a1de40ab4d7a82d4f222b4aba0aaaef05c88 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Shulker.java +++ b/src/main/java/net/minecraft/world/entity/monster/Shulker.java @@ -22,6 +22,8 @@ import net.minecraft.sounds.SoundSource; @@ -47,7 +47,7 @@ index 73750ec94993fba1d4e7cf7927bb60166757805a..4739f1e29a748cf69d37e616e0678108 @Override diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 0b3ba0c4135229f93473bcdfe837db338e01cb4f..18a41bb6d8828ae2b3245588b60bb15cd97d68d5 100644 +index 187de951768274826a1e42611a559aa1face952d..f89ac855d5205752c6af462fa6dd58c4611c1559 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -2017,6 +2017,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0232-Extended-OfflinePlayer-API.patch b/patches/server/0233-Extended-OfflinePlayer-API.patch similarity index 99% rename from patches/server/0232-Extended-OfflinePlayer-API.patch rename to patches/server/0233-Extended-OfflinePlayer-API.patch index eaf9dcaf2..ad253f769 100644 --- a/patches/server/0232-Extended-OfflinePlayer-API.patch +++ b/patches/server/0233-Extended-OfflinePlayer-API.patch @@ -223,7 +223,7 @@ index 88bc0807e8bf66a65422f85f1112336334eb3de2..d0e822b329085b9d0a42276c3cacd6cb + // Purpur end - OfflinePlayer API } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 85ae66b06a7915bb1c91b3962c916fc24e9aefb8..8c6791195812a1fc955a249c88d746d66f9bd962 100644 +index 544d2fee9835d6c7313ed1a1d085e4d73be63dd1..dda9705e2deee15383ba0412f6e17077286308ce 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1904,6 +1904,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0233-Added-the-ability-to-add-combustible-items.patch b/patches/server/0234-Added-the-ability-to-add-combustible-items.patch similarity index 97% rename from patches/server/0233-Added-the-ability-to-add-combustible-items.patch rename to patches/server/0234-Added-the-ability-to-add-combustible-items.patch index bad1cb74e..5968e1d91 100644 --- a/patches/server/0233-Added-the-ability-to-add-combustible-items.patch +++ b/patches/server/0234-Added-the-ability-to-add-combustible-items.patch @@ -51,7 +51,7 @@ index 600a71b8da335ddfc70f782cbbb08647ae98a89c..e7387a287ac84dcf8f39c547538432e5 private int maxStack = MAX_STACK; public List transaction = new java.util.ArrayList(); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 78c8b7684ff18c00e27d27c31226b8daaf5cd17b..4b3ba26f585cf7bc18c6be8d8a3a4aebf717adbf 100644 +index c3c6dc82565b5edcc975bc5d951a8b20767bc346..e6e5cc640e690b4e8dc980948d4977ca9a6d4de1 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1421,6 +1421,19 @@ public final class CraftServer implements Server { diff --git a/patches/server/0234-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch b/patches/server/0235-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch similarity index 94% rename from patches/server/0234-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch rename to patches/server/0235-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch index 72a5e9217..1c1f630f7 100644 --- a/patches/server/0234-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch +++ b/patches/server/0235-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Option for if rain and thunder should stop on sleep diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index dfbab7b451656db88e1a7d3a6bf407637da41ff9..1a25629380b29bd919dce1fde0f69fea0b31ee25 100644 +index 593906beaeb9c9c30fe4e9a092b2494b248905ae..06c338cd7e931383718a9e3e83f29ce8467b11e5 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1103,6 +1103,7 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -25,7 +25,7 @@ index dfbab7b451656db88e1a7d3a6bf407637da41ff9..1a25629380b29bd919dce1fde0f69fea // CraftBukkit start // If we stop due to everyone sleeping we should reset the weather duration to some other random value. diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 18a41bb6d8828ae2b3245588b60bb15cd97d68d5..eb1e2e4327075df3bc680171ddd84ac6594f9db0 100644 +index f89ac855d5205752c6af462fa6dd58c4611c1559..78f548b0ddfeaa472b13837bcb5331024a03d605 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -655,6 +655,8 @@ public class PurpurWorldConfig { diff --git a/patches/server/0235-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch b/patches/server/0236-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch similarity index 98% rename from patches/server/0235-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch rename to patches/server/0236-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch index 0855f0333..58cae4f03 100644 --- a/patches/server/0235-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch +++ b/patches/server/0236-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch @@ -45,7 +45,7 @@ index 71e494b949541284b0642dae4b20a6b3ec459828..625ad12e43cc651c986a3b45ce9a7c5b public static final Block MOSS_BLOCK = register("moss_block", new MossBlock(BlockBehaviour.Properties.of(Material.MOSS, MaterialColor.COLOR_GREEN).strength(0.1F).sound(SoundType.MOSS))); public static final Block BIG_DRIPLEAF = register("big_dripleaf", new BigDripleafBlock(BlockBehaviour.Properties.of(Material.PLANT).strength(0.1F).sound(SoundType.BIG_DRIPLEAF))); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index eb1e2e4327075df3bc680171ddd84ac6594f9db0..ca4bc68542c96b93f3aa410b21248af8e136d911 100644 +index 78f548b0ddfeaa472b13837bcb5331024a03d605..64a00b41491814478746b1d759f818f3c7c1e456 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -688,6 +688,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0236-Shift-right-click-to-use-exp-for-mending.patch b/patches/server/0237-Shift-right-click-to-use-exp-for-mending.patch similarity index 96% rename from patches/server/0236-Shift-right-click-to-use-exp-for-mending.patch rename to patches/server/0237-Shift-right-click-to-use-exp-for-mending.patch index c144bf8fa..cc368d748 100644 --- a/patches/server/0236-Shift-right-click-to-use-exp-for-mending.patch +++ b/patches/server/0237-Shift-right-click-to-use-exp-for-mending.patch @@ -36,7 +36,7 @@ index ff159296b0d8acef3af74cd578b00a93fba08f36..ff025406e5755aa3654509bd98363f09 + // Purpur end } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index a196c669891b09c42751004bd76d9c40ed6924ee..0a3bb5c385a3d7d4e938fe45c295faf031d2d5bf 100644 +index 982e04ba9f2b0cd2640a639052e871d0c41ef058..28e90810f2d9fa1894b45c070731d815cd28cdea 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1875,6 +1875,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser @@ -48,7 +48,7 @@ index a196c669891b09c42751004bd76d9c40ed6924ee..0a3bb5c385a3d7d4e938fe45c295faf0 cancelled = event.useItemInHand() == Event.Result.DENY; } else { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index ca4bc68542c96b93f3aa410b21248af8e136d911..b3be28a08fb4296e43db47737bbd3379f1798599 100644 +index 64a00b41491814478746b1d759f818f3c7c1e456..708823c9688c9d4b1121c10c28f24b21abd89656 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -360,6 +360,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0237-Dolphins-naturally-aggressive-to-players-chance.patch b/patches/server/0238-Dolphins-naturally-aggressive-to-players-chance.patch similarity index 100% rename from patches/server/0237-Dolphins-naturally-aggressive-to-players-chance.patch rename to patches/server/0238-Dolphins-naturally-aggressive-to-players-chance.patch diff --git a/patches/server/0238-Cows-naturally-aggressive-to-players-chance.patch b/patches/server/0239-Cows-naturally-aggressive-to-players-chance.patch similarity index 100% rename from patches/server/0238-Cows-naturally-aggressive-to-players-chance.patch rename to patches/server/0239-Cows-naturally-aggressive-to-players-chance.patch diff --git a/patches/server/0239-Option-for-beds-to-explode-on-villager-sleep.patch b/patches/server/0240-Option-for-beds-to-explode-on-villager-sleep.patch similarity index 92% rename from patches/server/0239-Option-for-beds-to-explode-on-villager-sleep.patch rename to patches/server/0240-Option-for-beds-to-explode-on-villager-sleep.patch index e5883161c..7e5525e68 100644 --- a/patches/server/0239-Option-for-beds-to-explode-on-villager-sleep.patch +++ b/patches/server/0240-Option-for-beds-to-explode-on-villager-sleep.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Option for beds to explode on villager sleep diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java -index 779e0e0ee72cd2835cda69b49b769c1882a55a66..bd279875de63517ce276592835f3d37321f12116 100644 +index aceb5dff85779983473962cd8cb016811560d0a6..91ad382535b9ee4a734dae07a21e3ee1e3b91523 100644 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java @@ -1156,6 +1156,12 @@ public class Villager extends AbstractVillager implements ReputationEventHandler @@ -22,7 +22,7 @@ index 779e0e0ee72cd2835cda69b49b769c1882a55a66..bd279875de63517ce276592835f3d373 this.brain.setMemory(MemoryModuleType.LAST_SLEPT, this.level.getGameTime()); // CraftBukkit - decompile error this.brain.eraseMemory(MemoryModuleType.WALK_TARGET); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 41bc2abe5b50041c9ec180ee56c9318009655d88..d8cea2024ef8c9a5305d80b233f932449744a599 100644 +index ce1b9c19881709b0b2b5edb065251d4401241085..7ebdcb088b49785f47402adfd47b857caa135384 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -707,11 +707,13 @@ public class PurpurWorldConfig { diff --git a/patches/server/0240-Halloween-options-and-optimizations.patch b/patches/server/0241-Halloween-options-and-optimizations.patch similarity index 92% rename from patches/server/0240-Halloween-options-and-optimizations.patch rename to patches/server/0241-Halloween-options-and-optimizations.patch index a832cf8da..48c90fb85 100644 --- a/patches/server/0240-Halloween-options-and-optimizations.patch +++ b/patches/server/0241-Halloween-options-and-optimizations.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Halloween options and optimizations diff --git a/src/main/java/net/minecraft/world/entity/ambient/Bat.java b/src/main/java/net/minecraft/world/entity/ambient/Bat.java -index 518080c1ebb5847081036dbf32d994cea0d95bb3..34fee30442d31fc15415635dd63d7dfaac49d408 100644 +index a97038d02d2edeb52c555457469467efa77d13df..0d90c90bf20d127f410de2aad2ca3c2d989e9576 100644 --- a/src/main/java/net/minecraft/world/entity/ambient/Bat.java +++ b/src/main/java/net/minecraft/world/entity/ambient/Bat.java @@ -309,7 +309,7 @@ public class Bat extends AmbientCreature { @@ -26,7 +26,7 @@ index 518080c1ebb5847081036dbf32d994cea0d95bb3..34fee30442d31fc15415635dd63d7dfa LocalDate localdate = LocalDate.now(); int i = localdate.get(ChronoField.DAY_OF_MONTH); diff --git a/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java b/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java -index aa8a972479cea5d806959cf23df3101f0ea1ab2f..09f784e909ebc08ebf03f114126e9463ea65cd82 100644 +index 193622015c6d3dbff787061e13fa098a287bce0c..1c48ac2f0b6cfee952ce5e76d7d886034ef871c0 100644 --- a/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java +++ b/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java @@ -137,11 +137,7 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo @@ -43,7 +43,7 @@ index aa8a972479cea5d806959cf23df3101f0ea1ab2f..09f784e909ebc08ebf03f114126e9463 this.armorDropChances[EquipmentSlot.HEAD.getIndex()] = 0.0F; } diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java -index 2bd8dc3f5c0b28fb4ea380b4b4a8672d5ede2a38..52eda2e110839c0845de6cd60445f9a084ad0c04 100644 +index 735ecd9d768b9e579142810d5f03093dafad0fa3..cb5a04aacf5e9f0f024f3a1c3a38dd88b49d86ee 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java +++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java @@ -565,11 +565,7 @@ public class Zombie extends Monster { @@ -60,7 +60,7 @@ index 2bd8dc3f5c0b28fb4ea380b4b4a8672d5ede2a38..52eda2e110839c0845de6cd60445f9a0 this.armorDropChances[EquipmentSlot.HEAD.getIndex()] = 0.0F; } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index d8cea2024ef8c9a5305d80b233f932449744a599..4aaf32fb25ea736d1c489bc14fa1479f00bb77e1 100644 +index 7ebdcb088b49785f47402adfd47b857caa135384..bde4cfd510b80df544f24d70982ff52b58c3e2e0 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1504,6 +1504,13 @@ public class PurpurWorldConfig { diff --git a/patches/server/0241-Config-for-Grindstones-ignoring-curses.patch b/patches/server/0242-Config-for-Grindstones-ignoring-curses.patch similarity index 100% rename from patches/server/0241-Config-for-Grindstones-ignoring-curses.patch rename to patches/server/0242-Config-for-Grindstones-ignoring-curses.patch diff --git a/patches/server/0242-UPnP-Port-Forwarding.patch b/patches/server/0243-UPnP-Port-Forwarding.patch similarity index 100% rename from patches/server/0242-UPnP-Port-Forwarding.patch rename to patches/server/0243-UPnP-Port-Forwarding.patch diff --git a/patches/server/0243-Campfire-option-for-lit-when-placed.patch b/patches/server/0244-Campfire-option-for-lit-when-placed.patch similarity index 96% rename from patches/server/0243-Campfire-option-for-lit-when-placed.patch rename to patches/server/0244-Campfire-option-for-lit-when-placed.patch index 15cd8a973..72052e53b 100644 --- a/patches/server/0243-Campfire-option-for-lit-when-placed.patch +++ b/patches/server/0244-Campfire-option-for-lit-when-placed.patch @@ -18,7 +18,7 @@ index 0b60b545271e62df86a0eb3c1f0f315a014b24cd..44df9e5034887c756c00bdcfb3ea04d4 @Override diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 4aaf32fb25ea736d1c489bc14fa1479f00bb77e1..b2f3b50250dd6efada888416e5ea5a17cfd2d7f8 100644 +index bde4cfd510b80df544f24d70982ff52b58c3e2e0..f8a55d9705b1ea5000bbfe96b50a6d5e900e4e62 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -982,6 +982,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0244-options-to-extinguish-fire-blocks-with-snowballs.patch b/patches/server/0245-options-to-extinguish-fire-blocks-with-snowballs.patch similarity index 98% rename from patches/server/0244-options-to-extinguish-fire-blocks-with-snowballs.patch rename to patches/server/0245-options-to-extinguish-fire-blocks-with-snowballs.patch index d517ae521..88ae043d7 100644 --- a/patches/server/0244-options-to-extinguish-fire-blocks-with-snowballs.patch +++ b/patches/server/0245-options-to-extinguish-fire-blocks-with-snowballs.patch @@ -46,7 +46,7 @@ index d5d84893c77b4e60a19032d765d76bfd24cbbb2b..ef265cec066ef3b84c2b3a4929af5183 protected void onHit(HitResult hitResult) { super.onHit(hitResult); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index b2f3b50250dd6efada888416e5ea5a17cfd2d7f8..7bf38e7b8d95d7e6fb8b2fe32d630382c90cf121 100644 +index f8a55d9705b1ea5000bbfe96b50a6d5e900e4e62..88f722093ce3df084037169cea60f95906edeed2 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -179,6 +179,9 @@ public class PurpurWorldConfig { diff --git a/patches/server/0245-Add-option-to-disable-zombie-villagers-cure.patch b/patches/server/0246-Add-option-to-disable-zombie-villagers-cure.patch similarity index 96% rename from patches/server/0245-Add-option-to-disable-zombie-villagers-cure.patch rename to patches/server/0246-Add-option-to-disable-zombie-villagers-cure.patch index eef8a9a5c..f6001d2e7 100644 --- a/patches/server/0245-Add-option-to-disable-zombie-villagers-cure.patch +++ b/patches/server/0246-Add-option-to-disable-zombie-villagers-cure.patch @@ -18,7 +18,7 @@ index c6ba41c2b4cc96bc97ed2e2220c0f3fa4f31dbe3..22a5d2f0de4bdd4432d1beff840f448a itemstack.shrink(1); } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 7bf38e7b8d95d7e6fb8b2fe32d630382c90cf121..c9eb43cbc0478c55cb2cab0d5473805c85ddcce7 100644 +index 88f722093ce3df084037169cea60f95906edeed2..5379c6418869373c6b52f6e835abcf297e6f2f56 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -2609,6 +2609,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0246-Persistent-BlockEntity-Lore-and-DisplayName.patch b/patches/server/0247-Persistent-BlockEntity-Lore-and-DisplayName.patch similarity index 100% rename from patches/server/0246-Persistent-BlockEntity-Lore-and-DisplayName.patch rename to patches/server/0247-Persistent-BlockEntity-Lore-and-DisplayName.patch diff --git a/patches/server/0247-Signs-allow-color-codes.patch b/patches/server/0248-Signs-allow-color-codes.patch similarity index 100% rename from patches/server/0247-Signs-allow-color-codes.patch rename to patches/server/0248-Signs-allow-color-codes.patch