diff --git a/gradle.properties b/gradle.properties index edfed10fc..99edc8975 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ version = 1.17.1-R0.1-SNAPSHOT mcVersion = 1.17.1 packageVersion = 1_17_R1 -paperCommit = 871f30038e07e9d290f706724f3b3bb0423942e0 +paperCommit = d985976b3e152f21f5b11b8edbc265a80c07c202 org.gradle.parallel = true org.gradle.vfs.watch = false diff --git a/patches/server/0001-Tuinity-Server-Changes.patch b/patches/server/0001-Tuinity-Server-Changes.patch index a5306fa4c..1e9d8d904 100644 --- a/patches/server/0001-Tuinity-Server-Changes.patch +++ b/patches/server/0001-Tuinity-Server-Changes.patch @@ -7028,7 +7028,7 @@ index 0000000000000000000000000000000000000000..d2c7d2c7920324d7207225ed19484e80 +} diff --git a/src/main/java/com/tuinity/tuinity/util/PoiAccess.java b/src/main/java/com/tuinity/tuinity/util/PoiAccess.java new file mode 100644 -index 0000000000000000000000000000000000000000..e99583529a2cbdf8b764be3dff4373ec0ffaecd7 +index 0000000000000000000000000000000000000000..a7ae9f0f4e56138465b0d8913d3cea9d5e9b56f2 --- /dev/null +++ b/src/main/java/com/tuinity/tuinity/util/PoiAccess.java @@ -0,0 +1,748 @@ @@ -7199,7 +7199,7 @@ index 0000000000000000000000000000000000000000..e99583529a2cbdf8b764be3dff4373ec + final int upperZ = Mth.floor(sourcePosition.getZ() + range) >> 4; + + final int centerX = sourcePosition.getX() >> 4; -+ final int centerY = sourcePosition.getY() >> 4; ++ final int centerY = Mth.clamp(sourcePosition.getY() >> 4, lowerY, upperY); + final int centerZ = sourcePosition.getZ() >> 4; + + final LongArrayFIFOQueue queue = new LongArrayFIFOQueue(); @@ -7441,7 +7441,7 @@ index 0000000000000000000000000000000000000000..e99583529a2cbdf8b764be3dff4373ec + final int upperZ = Mth.floor(sourcePosition.getZ() + range) >> 4; + + final int centerX = sourcePosition.getX() >> 4; -+ final int centerY = sourcePosition.getY() >> 4; ++ final int centerY = Mth.clamp(sourcePosition.getY() >> 4, lowerY, upperY); + final int centerZ = sourcePosition.getZ() >> 4; + + final LongArrayFIFOQueue queue = new LongArrayFIFOQueue(); diff --git a/patches/server/0056-Add-wither-skeleton-takes-wither-damage-option.patch b/patches/server/0056-Add-wither-skeleton-takes-wither-damage-option.patch deleted file mode 100644 index 5b126253d..000000000 --- a/patches/server/0056-Add-wither-skeleton-takes-wither-damage-option.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: William Blake Galbreath -Date: Tue, 14 Jan 2020 19:43:40 -0600 -Subject: [PATCH] Add wither skeleton takes wither damage option - - -diff --git a/src/main/java/net/minecraft/world/entity/monster/WitherSkeleton.java b/src/main/java/net/minecraft/world/entity/monster/WitherSkeleton.java -index 8212ee2cc1242c0a3626f3643c455f3be0de18c2..aaf6f43c0f37a51a7b2db57b8da4336530664afe 100644 ---- a/src/main/java/net/minecraft/world/entity/monster/WitherSkeleton.java -+++ b/src/main/java/net/minecraft/world/entity/monster/WitherSkeleton.java -@@ -139,6 +139,6 @@ public class WitherSkeleton extends AbstractSkeleton { - - @Override - public boolean canBeAffected(MobEffectInstance effect) { -- return effect.getEffect() == MobEffects.WITHER ? false : super.canBeAffected(effect); -+ return (level.purpurConfig.witherSkeletonTakesWitherDamage || effect.getEffect() != MobEffects.WITHER) && super.canBeAffected(effect); // Purpur - } - } -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index c612eaaef7072e6d737b52bcb9dc425e5af6154c..b72963171098778793b4f12fe37deb8b271db4b7 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -1306,6 +1306,7 @@ public class PurpurWorldConfig { - public boolean witherSkeletonRidable = false; - public boolean witherSkeletonRidableInWater = false; - public double witherSkeletonMaxHealth = 20.0D; -+ public boolean witherSkeletonTakesWitherDamage = false; - private void witherSkeletonSettings() { - witherSkeletonRidable = getBoolean("mobs.wither_skeleton.ridable", witherSkeletonRidable); - witherSkeletonRidableInWater = getBoolean("mobs.wither_skeleton.ridable-in-water", witherSkeletonRidableInWater); -@@ -1315,6 +1316,7 @@ public class PurpurWorldConfig { - set("mobs.wither_skeleton.attributes.max_health", oldValue); - } - witherSkeletonMaxHealth = getDouble("mobs.wither_skeleton.attributes.max_health", witherSkeletonMaxHealth); -+ witherSkeletonTakesWitherDamage = getBoolean("mobs.wither_skeleton.takes-wither-damage", witherSkeletonTakesWitherDamage); - } - - public boolean wolfRidable = false; diff --git a/patches/server/0057-Configurable-TPS-Catchup.patch b/patches/server/0056-Configurable-TPS-Catchup.patch similarity index 100% rename from patches/server/0057-Configurable-TPS-Catchup.patch rename to patches/server/0056-Configurable-TPS-Catchup.patch diff --git a/patches/server/0058-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch b/patches/server/0057-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch similarity index 96% rename from patches/server/0058-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch rename to patches/server/0057-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch index 53fbd1061..4e942beb4 100644 --- a/patches/server/0058-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch +++ b/patches/server/0057-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch @@ -18,7 +18,7 @@ index c95eef8596fe3e1ca83e620a6c54b164c797cbe1..1e6a5404d767318de29184b3e3a2bc41 if (!this.level.isClientSide && this.pickup == AbstractArrow.Pickup.ALLOWED) { this.spawnAtLocation(this.getPickupItem(), 0.1F); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index b72963171098778793b4f12fe37deb8b271db4b7..187aa9977951171fb75be176ef8f4a9eb19686ff 100644 +index c612eaaef7072e6d737b52bcb9dc425e5af6154c..f390aec2afc030a7de92b5be1c21ee751ea686f7 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -203,9 +203,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0059-Add-enderman-and-creeper-griefing-controls.patch b/patches/server/0058-Add-enderman-and-creeper-griefing-controls.patch similarity index 97% rename from patches/server/0059-Add-enderman-and-creeper-griefing-controls.patch rename to patches/server/0058-Add-enderman-and-creeper-griefing-controls.patch index 054fe0783..d09290482 100644 --- a/patches/server/0059-Add-enderman-and-creeper-griefing-controls.patch +++ b/patches/server/0058-Add-enderman-and-creeper-griefing-controls.patch @@ -38,7 +38,7 @@ index b061ecc42122ef66fbf87fe017023abca5728a01..6e0b5fbf5b0d216b6b7c647d45ef37cd } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 187aa9977951171fb75be176ef8f4a9eb19686ff..20cafa733409f3fe404f9705fcfd8e79ca00c4f5 100644 +index f390aec2afc030a7de92b5be1c21ee751ea686f7..b1f0d9f958fa414fff40725575f852af42c83161 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -375,6 +375,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0060-Villagers-follow-emerald-blocks.patch b/patches/server/0059-Villagers-follow-emerald-blocks.patch similarity index 96% rename from patches/server/0060-Villagers-follow-emerald-blocks.patch rename to patches/server/0059-Villagers-follow-emerald-blocks.patch index 0ca5145c5..a9213e425 100644 --- a/patches/server/0060-Villagers-follow-emerald-blocks.patch +++ b/patches/server/0059-Villagers-follow-emerald-blocks.patch @@ -17,7 +17,7 @@ index e59a77c80a1bbe62aaa61bd4792d21b12c895a5c..44e9d6d0b80203b152957efef953c2fa // CraftBukkit start private CraftMerchant craftMerchant; 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 ed96780ededea9ae98bc0fb60d250587e6bc9854..9e13eda42c781b6f95b63d58d775bb22cbd87a96 100644 +index 311b6c0ff37ce217af9391b50208fdc63e3fe420..44831fb0697ba949ccbf8024f0a35867425e190c 100644 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java @@ -171,6 +171,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler @@ -41,7 +41,7 @@ index d2588a91b55aebdecf8e1644498111ccf84a9dc9..393061e13375bf7a7ee57973b4abac83 this.goalSelector.addGoal(8, new WaterAvoidingRandomStrollGoal(this, 0.35D)); this.goalSelector.addGoal(9, new InteractGoal(this, Player.class, 3.0F, 1.0F)); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 20cafa733409f3fe404f9705fcfd8e79ca00c4f5..9f1156d4e16b85167a14438fcce007600be21660 100644 +index b1f0d9f958fa414fff40725575f852af42c83161..2894dad132d9ede51314dc035975a208af711012 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -1234,6 +1234,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0061-Allow-leashing-villagers.patch b/patches/server/0060-Allow-leashing-villagers.patch similarity index 96% rename from patches/server/0061-Allow-leashing-villagers.patch rename to patches/server/0060-Allow-leashing-villagers.patch index 6e22ee467..9904ad458 100644 --- a/patches/server/0061-Allow-leashing-villagers.patch +++ b/patches/server/0060-Allow-leashing-villagers.patch @@ -17,7 +17,7 @@ index 2a310cb6cc1bfbf0c8d65c96b6bdbe8450d7c3ce..6848b8a21a4ad3e7dc4cfdb4a73045bf // Paper start - drop leash variable org.bukkit.event.player.PlayerUnleashEntityEvent event = CraftEventFactory.callPlayerUnleashEntityEvent(this, player, !player.getAbilities().instabuild); 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 9e13eda42c781b6f95b63d58d775bb22cbd87a96..e903fe670e50ff34187994d36a2d875d5f51bdb6 100644 +index 44831fb0697ba949ccbf8024f0a35867425e190c..0c6583751e75d175338aaf411fb26baa1946a9b4 100644 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java @@ -178,6 +178,11 @@ public class Villager extends AbstractVillager implements ReputationEventHandler @@ -49,7 +49,7 @@ index 393061e13375bf7a7ee57973b4abac83ffa15fa3..c48935d35a6141c41db22e3ec172d599 @Override diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 9f1156d4e16b85167a14438fcce007600be21660..11e0a19bbf1c4ed88e95e15aa82b12a6d601ebed 100644 +index 2894dad132d9ede51314dc035975a208af711012..f6edfcd18ee077525554978bc2600e95cc0b66c2 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -1235,6 +1235,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0062-Implement-configurable-search-radius-for-villagers-t.patch b/patches/server/0061-Implement-configurable-search-radius-for-villagers-t.patch similarity index 96% rename from patches/server/0062-Implement-configurable-search-radius-for-villagers-t.patch rename to patches/server/0061-Implement-configurable-search-radius-for-villagers-t.patch index c7bfac7fd..4f760d96a 100644 --- a/patches/server/0062-Implement-configurable-search-radius-for-villagers-t.patch +++ b/patches/server/0061-Implement-configurable-search-radius-for-villagers-t.patch @@ -18,7 +18,7 @@ index 0c6583751e75d175338aaf411fb26baa1946a9b4..bad3b9eb0ab8612f9c80c52caff38ffe for (int i = 0; i < 10; ++i) { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 11e0a19bbf1c4ed88e95e15aa82b12a6d601ebed..6b5b2f30f7c5dc38b6e190f45f29ab5578b9a8c4 100644 +index f6edfcd18ee077525554978bc2600e95cc0b66c2..9509cbc44413353c621a1469a320a7a4e531c1c8 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -1236,6 +1236,8 @@ public class PurpurWorldConfig { diff --git a/patches/server/0063-Implement-infinite-lava.patch b/patches/server/0062-Implement-infinite-lava.patch similarity index 97% rename from patches/server/0063-Implement-infinite-lava.patch rename to patches/server/0062-Implement-infinite-lava.patch index 1844d555e..6d1295406 100644 --- a/patches/server/0063-Implement-infinite-lava.patch +++ b/patches/server/0062-Implement-infinite-lava.patch @@ -58,7 +58,7 @@ index 695783e64564b1d2a178d57a89737d2a97ab9014..cd1a33a1f10d04a91358f51d736bda34 protected boolean canConvertToSource() { return false; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 6b5b2f30f7c5dc38b6e190f45f29ab5578b9a8c4..ca60ae312600ea01308659f333d9c8e7ed3de0b3 100644 +index 9509cbc44413353c621a1469a320a7a4e531c1c8..e16e4d59d51bfd7c5dbffe690c0d4d4064e4130a 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -215,6 +215,13 @@ public class PurpurWorldConfig { diff --git a/patches/server/0064-Make-lava-flow-speed-configurable.patch b/patches/server/0063-Make-lava-flow-speed-configurable.patch similarity index 95% rename from patches/server/0064-Make-lava-flow-speed-configurable.patch rename to patches/server/0063-Make-lava-flow-speed-configurable.patch index c40b9f50d..2fbe24621 100644 --- a/patches/server/0064-Make-lava-flow-speed-configurable.patch +++ b/patches/server/0063-Make-lava-flow-speed-configurable.patch @@ -18,7 +18,7 @@ index cd1a33a1f10d04a91358f51d736bda34110324c4..b0d671ba015d1ad37fdf600b8e70def2 @Override diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index ca60ae312600ea01308659f333d9c8e7ed3de0b3..0c02205712c7fbc8fe584b99dbc37ce023e09a3c 100644 +index e16e4d59d51bfd7c5dbffe690c0d4d4064e4130a..da467704ad57edb2baa0471a483efd709ba44724 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -217,9 +217,13 @@ public class PurpurWorldConfig { diff --git a/patches/server/0065-Add-player-death-exp-control-options.patch b/patches/server/0064-Add-player-death-exp-control-options.patch similarity index 97% rename from patches/server/0065-Add-player-death-exp-control-options.patch rename to patches/server/0064-Add-player-death-exp-control-options.patch index ff3f64e80..eb3ee118d 100644 --- a/patches/server/0065-Add-player-death-exp-control-options.patch +++ b/patches/server/0064-Add-player-death-exp-control-options.patch @@ -31,7 +31,7 @@ index d6b610a848f37db24af9b219be2f22aeaf892388..52d43c2bf1fa1bfa97aab02a9837c6b1 return 0; } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 0c02205712c7fbc8fe584b99dbc37ce023e09a3c..de7efcad4d0db0d14f60ce76f0ee2d1cdbb77e11 100644 +index da467704ad57edb2baa0471a483efd709ba44724..6985134eacf932b349a3a436ea7a14268314a8ea 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -166,6 +166,8 @@ public class PurpurWorldConfig { diff --git a/patches/server/0066-Configurable-void-damage-height-and-damage.patch b/patches/server/0065-Configurable-void-damage-height-and-damage.patch similarity index 91% rename from patches/server/0066-Configurable-void-damage-height-and-damage.patch rename to patches/server/0065-Configurable-void-damage-height-and-damage.patch index c7f7ae9a1..8df367e8a 100644 --- a/patches/server/0066-Configurable-void-damage-height-and-damage.patch +++ b/patches/server/0065-Configurable-void-damage-height-and-damage.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configurable void damage height and damage diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 8197ad7db6ec1a750b732e597af75f41ab056778..b4d0df32fb9e8357ee87c779ff1228fb4f0009f5 100644 +index 46b6e0fcf662472b7fcccc33f859c5e33340d7bb..5a23bc98f38e715ee16abe9a370b044e928b2d03 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -767,7 +767,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n @@ -18,7 +18,7 @@ index 8197ad7db6ec1a750b732e597af75f41ab056778..b4d0df32fb9e8357ee87c779ff1228fb && this.getY() >= this.level.paperConfig.netherVoidTopDamageHeight)) { // Paper end diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index df6e71ee5b151b0b319defb4b9fd10858ff03bbd..5e9040f72bea00d1011ebb0936ca2e26e42a44bb 100644 +index 31f3767c7d9e9fc5f3bd91c7ec163bce8ada64db..8f550154b12521662889bbc91f5cd8e20523a90f 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -2388,7 +2388,7 @@ public abstract class LivingEntity extends Entity { @@ -31,7 +31,7 @@ index df6e71ee5b151b0b319defb4b9fd10858ff03bbd..5e9040f72bea00d1011ebb0936ca2e26 protected void updateSwingTime() { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index de7efcad4d0db0d14f60ce76f0ee2d1cdbb77e11..622a73529972ff9906e0fdea43c43ee3d123f418 100644 +index 6985134eacf932b349a3a436ea7a14268314a8ea..5a74d39198c03771aaf810e20fb47ca6f352bbd0 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -208,10 +208,14 @@ public class PurpurWorldConfig { diff --git a/patches/server/0067-Add-canSaveToDisk-to-Entity.patch b/patches/server/0066-Add-canSaveToDisk-to-Entity.patch similarity index 97% rename from patches/server/0067-Add-canSaveToDisk-to-Entity.patch rename to patches/server/0066-Add-canSaveToDisk-to-Entity.patch index db81c35df..0aea78cad 100644 --- a/patches/server/0067-Add-canSaveToDisk-to-Entity.patch +++ b/patches/server/0066-Add-canSaveToDisk-to-Entity.patch @@ -19,7 +19,7 @@ index 5a23bc98f38e715ee16abe9a370b044e928b2d03..6db330cf388ef80f3acb84e41f02063c // Purpur end } 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 2f33897a74ff2bd629b4ffacc4a1e1e0cd6b7987..4527fdd2c2001767c225574e1610ddfaa7bb4f34 100644 +index f52420f27f51d9dbf214f96a0530c0f17f2bc5fc..12cd1b453150e098975c34e00ec9277ff9730c75 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 @@ -192,6 +192,11 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob diff --git a/patches/server/0068-Dispenser-curse-of-binding-protection.patch b/patches/server/0067-Dispenser-curse-of-binding-protection.patch similarity index 97% rename from patches/server/0068-Dispenser-curse-of-binding-protection.patch rename to patches/server/0067-Dispenser-curse-of-binding-protection.patch index cd7d47de7..c7354f107 100644 --- a/patches/server/0068-Dispenser-curse-of-binding-protection.patch +++ b/patches/server/0067-Dispenser-curse-of-binding-protection.patch @@ -43,7 +43,7 @@ index aab4a63e61aced51b1b6c885fd8b8426a4f14408..ad095c6bc7e00d286c83e37f84d8ed5d // CraftBukkit start Level world = pointer.getLevel(); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 622a73529972ff9906e0fdea43c43ee3d123f418..af4bf306c118fa109b8745e7ac8a0bcaa38a0fbc 100644 +index 5a74d39198c03771aaf810e20fb47ca6f352bbd0..ce5b48ce8bd412a11ccc5428cfdee0b152570fd9 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -218,6 +218,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0069-Add-option-for-boats-to-eject-players-on-land.patch b/patches/server/0068-Add-option-for-boats-to-eject-players-on-land.patch similarity index 95% rename from patches/server/0069-Add-option-for-boats-to-eject-players-on-land.patch rename to patches/server/0068-Add-option-for-boats-to-eject-players-on-land.patch index 8782b3321..6446ce34b 100644 --- a/patches/server/0069-Add-option-for-boats-to-eject-players-on-land.patch +++ b/patches/server/0068-Add-option-for-boats-to-eject-players-on-land.patch @@ -17,7 +17,7 @@ index aa7c022c4faade23bd9061311d4152cf845d3331..d4a19fc38027717e43353bc62ef23e56 } else { return Boat.Status.IN_AIR; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index af4bf306c118fa109b8745e7ac8a0bcaa38a0fbc..be285a9c50893a8bb0a305eb7dde4953b81be768 100644 +index ce5b48ce8bd412a11ccc5428cfdee0b152570fd9..fd49391f0050e5943e51dc69deec174082518868 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -205,12 +205,14 @@ public class PurpurWorldConfig { diff --git a/patches/server/0070-Mending-mends-most-damages-equipment-first.patch b/patches/server/0069-Mending-mends-most-damages-equipment-first.patch similarity index 98% rename from patches/server/0070-Mending-mends-most-damages-equipment-first.patch rename to patches/server/0069-Mending-mends-most-damages-equipment-first.patch index 80428dfe2..00ad40abc 100644 --- a/patches/server/0070-Mending-mends-most-damages-equipment-first.patch +++ b/patches/server/0069-Mending-mends-most-damages-equipment-first.patch @@ -73,7 +73,7 @@ index d439e8ce87bf7da03683a336941c7673b8b166e4..955e482e4bc83f2b777cd2e4254c40be Entry entry = getRandomItemWith(enchantment, entityliving); return entry != null ? entry.getValue() : ItemStack.EMPTY; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index be285a9c50893a8bb0a305eb7dde4953b81be768..580871c876a4b115968856c9d99b0442778f8063 100644 +index fd49391f0050e5943e51dc69deec174082518868..1a74ed951699b71af64caa087bb5375caba82051 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -205,6 +205,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0071-Add-5-second-tps-average-in-tps.patch b/patches/server/0070-Add-5-second-tps-average-in-tps.patch similarity index 100% rename from patches/server/0071-Add-5-second-tps-average-in-tps.patch rename to patches/server/0070-Add-5-second-tps-average-in-tps.patch diff --git a/patches/server/0072-Implement-elytra-settings.patch b/patches/server/0071-Implement-elytra-settings.patch similarity index 97% rename from patches/server/0072-Implement-elytra-settings.patch rename to patches/server/0071-Implement-elytra-settings.patch index 4a3a23bae..b553ec9a8 100644 --- a/patches/server/0072-Implement-elytra-settings.patch +++ b/patches/server/0071-Implement-elytra-settings.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Implement elytra settings diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 5e9040f72bea00d1011ebb0936ca2e26e42a44bb..adca4ca2d13612503d36776ea4998cba9b038c10 100644 +index 8f550154b12521662889bbc91f5cd8e20523a90f..f1a8b91f620152a3da3c11769c3c2353ccdba3cf 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3284,7 +3284,16 @@ public abstract class LivingEntity extends Entity { @@ -99,7 +99,7 @@ index 510ed67a7de2b503ab8b01db57ed09ee33b0d825..3f53dc8f250ad3f7616ce7ef0a2353ca entityhuman.startAutoSpinAttack(20); if (entityhuman.isOnGround()) { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 580871c876a4b115968856c9d99b0442778f8063..6b5f7f895a9e53582bd2dee373b8b2eb1899e2da 100644 +index 1a74ed951699b71af64caa087bb5375caba82051..217de624c94e6cc6f6ede013e281cdbf28d63338 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -97,6 +97,19 @@ public class PurpurWorldConfig { diff --git a/patches/server/0073-Item-entity-immunities.patch b/patches/server/0072-Item-entity-immunities.patch similarity index 98% rename from patches/server/0073-Item-entity-immunities.patch rename to patches/server/0072-Item-entity-immunities.patch index 36e4f33e6..c77685524 100644 --- a/patches/server/0073-Item-entity-immunities.patch +++ b/patches/server/0072-Item-entity-immunities.patch @@ -94,7 +94,7 @@ index 158719d46c96bb733a00e08c8285f41a48406abf..5201e59c7ce9e92790c185279ba69d7f + // Purpur end } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 6b5f7f895a9e53582bd2dee373b8b2eb1899e2da..180d1c9a552b6d96dd7a30f991bb375c299e4ddb 100644 +index 217de624c94e6cc6f6ede013e281cdbf28d63338..98e42d551427a6fa8c8ed59e3191be4dd162db01 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -110,6 +110,49 @@ public class PurpurWorldConfig { diff --git a/patches/server/0074-Add-ping-command.patch b/patches/server/0073-Add-ping-command.patch similarity index 97% rename from patches/server/0074-Add-ping-command.patch rename to patches/server/0073-Add-ping-command.patch index e56041ab4..27495d9d3 100644 --- a/patches/server/0074-Add-ping-command.patch +++ b/patches/server/0073-Add-ping-command.patch @@ -17,7 +17,7 @@ index d478627dcd2b6e3d3d95b3fa224a25d44e6bbafb..158fc5748f175708a0c3415a2217663f if (environment.includeIntegrated) { diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index db9c33cc36099fb6b203a5526b6399ca3a067d83..ce6ae54b8739d699b756bb8b46180cebd6fe353e 100644 +index 0ae18dfbd6ea05737cd456762da32efe3a51aef8..a8c969b1a88df7f4c3cbee4df1d8f581ae2a549d 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -160,12 +160,14 @@ public class PurpurConfig { diff --git a/patches/server/0075-Add-demo-command.patch b/patches/server/0074-Add-demo-command.patch similarity index 97% rename from patches/server/0075-Add-demo-command.patch rename to patches/server/0074-Add-demo-command.patch index 5c67b9287..2e7859383 100644 --- a/patches/server/0075-Add-demo-command.patch +++ b/patches/server/0074-Add-demo-command.patch @@ -17,7 +17,7 @@ index 158fc5748f175708a0c3415a2217663f77271bc7..9cbaaf4cd138e6c1d2d51afcef24a81a } diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index ce6ae54b8739d699b756bb8b46180cebd6fe353e..e831b4dbf5dd702acc531a2ca7ee7068dff91408 100644 +index a8c969b1a88df7f4c3cbee4df1d8f581ae2a549d..5bd68aed7f5d31bbdc057e4b63026b37061a7983 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -160,6 +160,7 @@ public class PurpurConfig { diff --git a/patches/server/0076-Add-credits-command.patch b/patches/server/0075-Add-credits-command.patch similarity index 97% rename from patches/server/0076-Add-credits-command.patch rename to patches/server/0075-Add-credits-command.patch index fd5139433..4a69cca8b 100644 --- a/patches/server/0076-Add-credits-command.patch +++ b/patches/server/0075-Add-credits-command.patch @@ -17,7 +17,7 @@ index 9cbaaf4cd138e6c1d2d51afcef24a81a3f2973c5..f164106a957c24bdb71bde85d82948a6 net.pl3x.purpur.command.PingCommand.register(this.dispatcher); // Purpur } diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index e831b4dbf5dd702acc531a2ca7ee7068dff91408..fa58d301da334cf901b7c2d4a747ef6da96db69d 100644 +index 5bd68aed7f5d31bbdc057e4b63026b37061a7983..d7f43f4be2e38febb9ff7b67a319316c40929416 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -160,6 +160,7 @@ public class PurpurConfig { diff --git a/patches/server/0077-Configurable-jockey-options.patch b/patches/server/0076-Configurable-jockey-options.patch similarity index 97% rename from patches/server/0077-Configurable-jockey-options.patch rename to patches/server/0076-Configurable-jockey-options.patch index 81bff06b7..a5ed6a8aa 100644 --- a/patches/server/0077-Configurable-jockey-options.patch +++ b/patches/server/0076-Configurable-jockey-options.patch @@ -167,7 +167,7 @@ index 8464026df1b46ad30301fed4944aa1d3cd39bd9e..5b5958e37918b97fa994500fe94cd0e5 @Override diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 180d1c9a552b6d96dd7a30f991bb375c299e4ddb..2dd3b0701cacd4948690a5cc7f79cb0ddbc89d99 100644 +index 98e42d551427a6fa8c8ed59e3191be4dd162db01..38f07a1ca300bd78baeec8bbe50cae2f73359762 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -519,6 +519,9 @@ public class PurpurWorldConfig { @@ -210,7 +210,7 @@ index 180d1c9a552b6d96dd7a30f991bb375c299e4ddb..2dd3b0701cacd4948690a5cc7f79cb0d } public boolean illusionerRidable = false; -@@ -1453,6 +1465,9 @@ public class PurpurWorldConfig { +@@ -1451,6 +1463,9 @@ public class PurpurWorldConfig { public boolean zombieRidableInWater = false; public double zombieMaxHealth = 20.0D; public double zombieSpawnReinforcements = 0.1D; @@ -220,7 +220,7 @@ index 180d1c9a552b6d96dd7a30f991bb375c299e4ddb..2dd3b0701cacd4948690a5cc7f79cb0d private void zombieSettings() { zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable); zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater); -@@ -1463,6 +1478,9 @@ public class PurpurWorldConfig { +@@ -1461,6 +1476,9 @@ public class PurpurWorldConfig { } zombieMaxHealth = getDouble("mobs.zombie.attributes.max_health", zombieMaxHealth); zombieSpawnReinforcements = getDouble("mobs.zombie.attributes.spawn_reinforcements", zombieSpawnReinforcements); @@ -230,7 +230,7 @@ index 180d1c9a552b6d96dd7a30f991bb375c299e4ddb..2dd3b0701cacd4948690a5cc7f79cb0d } public boolean zombieHorseRidableInWater = false; -@@ -1496,6 +1514,9 @@ public class PurpurWorldConfig { +@@ -1494,6 +1512,9 @@ public class PurpurWorldConfig { public boolean zombieVillagerRidableInWater = false; public double zombieVillagerMaxHealth = 20.0D; public double zombieVillagerSpawnReinforcements = 0.1D; @@ -240,7 +240,7 @@ index 180d1c9a552b6d96dd7a30f991bb375c299e4ddb..2dd3b0701cacd4948690a5cc7f79cb0d private void zombieVillagerSettings() { zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable); zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater); -@@ -1506,12 +1527,18 @@ public class PurpurWorldConfig { +@@ -1504,12 +1525,18 @@ public class PurpurWorldConfig { } zombieVillagerMaxHealth = getDouble("mobs.zombie_villager.attributes.max_health", zombieVillagerMaxHealth); zombieVillagerSpawnReinforcements = getDouble("mobs.zombie_villager.attributes.spawn_reinforcements", zombieVillagerSpawnReinforcements); @@ -259,7 +259,7 @@ index 180d1c9a552b6d96dd7a30f991bb375c299e4ddb..2dd3b0701cacd4948690a5cc7f79cb0d private void zombifiedPiglinSettings() { zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable); zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater); -@@ -1522,5 +1549,8 @@ public class PurpurWorldConfig { +@@ -1520,5 +1547,8 @@ public class PurpurWorldConfig { } zombifiedPiglinMaxHealth = getDouble("mobs.zombified_piglin.attributes.max_health", zombifiedPiglinMaxHealth); zombifiedPiglinSpawnReinforcements = getDouble("mobs.zombified_piglin.attributes.spawn_reinforcements", zombifiedPiglinSpawnReinforcements); diff --git a/patches/server/0078-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch b/patches/server/0077-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch similarity index 99% rename from patches/server/0078-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch rename to patches/server/0077-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch index e63451293..0a40b7ecf 100644 --- a/patches/server/0078-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch +++ b/patches/server/0077-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch @@ -258,7 +258,7 @@ index 5e069ac0c57d2a3a23f6e4483d12ce298d172691..916c29d08fbcf245ad6f50f8e8cc1736 private float speed = 0.1F; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 2dd3b0701cacd4948690a5cc7f79cb0ddbc89d99..99a7d9e598678a7deeff694b5e050b72a40a9fe8 100644 +index 38f07a1ca300bd78baeec8bbe50cae2f73359762..9e57a48a53e5435ef358749482174f1bb9aff7a2 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -932,6 +932,9 @@ public class PurpurWorldConfig { diff --git a/patches/server/0079-Add-phantom-spawning-options.patch b/patches/server/0078-Add-phantom-spawning-options.patch similarity index 98% rename from patches/server/0079-Add-phantom-spawning-options.patch rename to patches/server/0078-Add-phantom-spawning-options.patch index 38900bb2f..334a7fc6b 100644 --- a/patches/server/0079-Add-phantom-spawning-options.patch +++ b/patches/server/0078-Add-phantom-spawning-options.patch @@ -48,7 +48,7 @@ index 79504dc3448402e73b09c4232b1fd0488872cf68..300c9f136edace2babea4a574090b184 for (int l = 0; l < k; ++l) { // Paper start diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 99a7d9e598678a7deeff694b5e050b72a40a9fe8..05a24c0fc9330359aaff8052f0066cc4ddd14191 100644 +index 9e57a48a53e5435ef358749482174f1bb9aff7a2..8e0b9b3117c0d88fe5988d7fe1b7c5bb5be7d28e 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -935,6 +935,18 @@ public class PurpurWorldConfig { diff --git a/patches/server/0080-Implement-bed-explosion-options.patch b/patches/server/0079-Implement-bed-explosion-options.patch similarity index 97% rename from patches/server/0080-Implement-bed-explosion-options.patch rename to patches/server/0079-Implement-bed-explosion-options.patch index 9575f25ca..326afb972 100644 --- a/patches/server/0080-Implement-bed-explosion-options.patch +++ b/patches/server/0079-Implement-bed-explosion-options.patch @@ -27,7 +27,7 @@ index 163a7861f987c3832aac51cc6df950c768546731..bf5765b6af9c7807d50f7daaacb5d524 } } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 05a24c0fc9330359aaff8052f0066cc4ddd14191..2bd7dea57c0e0005be2b4fbe98de10fd167186a6 100644 +index 8e0b9b3117c0d88fe5988d7fe1b7c5bb5be7d28e..9759d5ba2d7bf0ccc86b7a109ae115952031371c 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -278,6 +278,22 @@ public class PurpurWorldConfig { diff --git a/patches/server/0081-Implement-respawn-anchor-explosion-options.patch b/patches/server/0080-Implement-respawn-anchor-explosion-options.patch similarity index 97% rename from patches/server/0081-Implement-respawn-anchor-explosion-options.patch rename to patches/server/0080-Implement-respawn-anchor-explosion-options.patch index 4c10d9821..eaa7105f1 100644 --- a/patches/server/0081-Implement-respawn-anchor-explosion-options.patch +++ b/patches/server/0080-Implement-respawn-anchor-explosion-options.patch @@ -18,7 +18,7 @@ index af4eb4a8814491afef449a2874521636957d7557..365c28300ecfbe0161716972adf22a8a public static boolean canSetSpawn(Level world) { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 2bd7dea57c0e0005be2b4fbe98de10fd167186a6..e7c816cbb0817239a1575a2328af23e32352e5a5 100644 +index 9759d5ba2d7bf0ccc86b7a109ae115952031371c..e96302393e76bbd20fe4245d978ae1a6086b5164 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -315,6 +315,22 @@ public class PurpurWorldConfig { diff --git a/patches/server/0082-Add-allow-water-in-end-world-option.patch b/patches/server/0081-Add-allow-water-in-end-world-option.patch similarity index 100% rename from patches/server/0082-Add-allow-water-in-end-world-option.patch rename to patches/server/0081-Add-allow-water-in-end-world-option.patch diff --git a/patches/server/0083-Allow-color-codes-in-books.patch b/patches/server/0082-Allow-color-codes-in-books.patch similarity index 97% rename from patches/server/0083-Allow-color-codes-in-books.patch rename to patches/server/0082-Allow-color-codes-in-books.patch index 9030dd548..2e20d5c43 100644 --- a/patches/server/0083-Allow-color-codes-in-books.patch +++ b/patches/server/0082-Allow-color-codes-in-books.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Allow color codes in books diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index c19b708cd7c6ec18ea44a5afa3b7e1c4ac4ddcb6..c1f322910d66c6d7961b33840a761a2e8f7a0424 100644 +index 0be0d27e2534fccf0f8ff828476e2a0612c60d71..a1687fe41480048a1d98fda8c5b704d874c47708 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1200,13 +1200,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0084-Entity-lifespan.patch b/patches/server/0083-Entity-lifespan.patch similarity index 97% rename from patches/server/0084-Entity-lifespan.patch rename to patches/server/0083-Entity-lifespan.patch index 91d2556fe..cad5d42ed 100644 --- a/patches/server/0084-Entity-lifespan.patch +++ b/patches/server/0083-Entity-lifespan.patch @@ -89,7 +89,7 @@ index f7c915ababdacd0901787d6dd1c08accacadabe5..df79f95ab2c8b9106cac889787b840b1 } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index e7c816cbb0817239a1575a2328af23e32352e5a5..5040f2c1ac73888fe3334742e096a237d1ae1ebb 100644 +index e96302393e76bbd20fe4245d978ae1a6086b5164..41678daa4765aa01ec91cdbe554fc1dd7316e292 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -110,6 +110,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0085-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch b/patches/server/0084-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch similarity index 95% rename from patches/server/0085-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch rename to patches/server/0084-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch index 7d9d32a0e..a1fa406aa 100644 --- a/patches/server/0085-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch +++ b/patches/server/0084-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch @@ -35,7 +35,7 @@ index 116fdc97069071c84912f2b9b045d0e22c1b6ba3..39493db2f716fe165431d9f8b3566c07 + // 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 cb1ed54aa49a93fff15a0d72d459fd7adc037f6c..a9767676a2e84984374cc7d7d012477c60be5a7f 100644 +index f1a8b91f620152a3da3c11769c3c2353ccdba3cf..0c14ccc74abcc68ecc5422b38bc729dc659b9b8b 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -45,6 +45,7 @@ import net.minecraft.network.syncher.EntityDataAccessor; @@ -55,7 +55,7 @@ index cb1ed54aa49a93fff15a0d72d459fd7adc037f6c..a9767676a2e84984374cc7d7d012477c } } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 5040f2c1ac73888fe3334742e096a237d1ae1ebb..b9e6082a7f15b83a6121684177516a4f0478d5a6 100644 +index 41678daa4765aa01ec91cdbe554fc1dd7316e292..6d453f43651cec45bb0099d8fa8ee14bd20b3de9 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -229,6 +229,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0086-Squid-EAR-immunity.patch b/patches/server/0085-Squid-EAR-immunity.patch similarity index 95% rename from patches/server/0086-Squid-EAR-immunity.patch rename to patches/server/0085-Squid-EAR-immunity.patch index 1571c5071..6fed58821 100644 --- a/patches/server/0086-Squid-EAR-immunity.patch +++ b/patches/server/0085-Squid-EAR-immunity.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Squid EAR immunity diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index b9e6082a7f15b83a6121684177516a4f0478d5a6..50de6f8b6a18ddd330ae1bb6ba8f58b73e17d7da 100644 +index 6d453f43651cec45bb0099d8fa8ee14bd20b3de9..378eda35a9f60412f36007320b7a86457dd95846 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -1268,6 +1268,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0087-Configurable-feature-seed-settings.patch b/patches/server/0086-Configurable-feature-seed-settings.patch similarity index 100% rename from patches/server/0087-Configurable-feature-seed-settings.patch rename to patches/server/0086-Configurable-feature-seed-settings.patch diff --git a/patches/server/0088-Phantoms-burn-in-light.patch b/patches/server/0087-Phantoms-burn-in-light.patch similarity index 98% rename from patches/server/0088-Phantoms-burn-in-light.patch rename to patches/server/0087-Phantoms-burn-in-light.patch index f26b096c5..b1501e1f6 100644 --- a/patches/server/0088-Phantoms-burn-in-light.patch +++ b/patches/server/0087-Phantoms-burn-in-light.patch @@ -47,7 +47,7 @@ index 916c29d08fbcf245ad6f50f8e8cc173677b01081..c55aba456aa144e58fc35877c61eff30 list.sort(Comparator.comparing(Entity::getY).reversed()); // Paper - remap fix Iterator iterator = list.iterator(); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 50de6f8b6a18ddd330ae1bb6ba8f58b73e17d7da..58b0b17167a5248acc9f0ebfac2d357f49688d79 100644 +index 378eda35a9f60412f36007320b7a86457dd95846..e74ea145d561b4cfef3310061dbc38a7252637ea 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -986,6 +986,9 @@ public class PurpurWorldConfig { diff --git a/patches/server/0089-Configurable-villager-breeding.patch b/patches/server/0088-Configurable-villager-breeding.patch similarity index 91% rename from patches/server/0089-Configurable-villager-breeding.patch rename to patches/server/0088-Configurable-villager-breeding.patch index 8c03a7961..890e6efc2 100644 --- a/patches/server/0089-Configurable-villager-breeding.patch +++ b/patches/server/0088-Configurable-villager-breeding.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configurable villager breeding diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java -index 3865f16e027307f5b8b2a5617b66ffd8b9f85c60..bb3572370a86519a92b7b3dab0482cd1527de19d 100644 +index bad3b9eb0ab8612f9c80c52caff38ffe791d112c..4752205ab570ab8f6ae7f0a15ae610b603ade2ea 100644 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java @@ -751,7 +751,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler @@ -18,7 +18,7 @@ index 3865f16e027307f5b8b2a5617b66ffd8b9f85c60..bb3572370a86519a92b7b3dab0482cd1 private boolean hungry() { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 58b0b17167a5248acc9f0ebfac2d357f49688d79..2a8435b39afc16d3ca862d17bb40fe3cc9d5e494 100644 +index e74ea145d561b4cfef3310061dbc38a7252637ea..d9412405c5eaee5c342ecbbf481f695d3fa308b0 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -1411,6 +1411,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0090-Redstone-deactivates-spawners.patch b/patches/server/0089-Redstone-deactivates-spawners.patch similarity index 89% rename from patches/server/0090-Redstone-deactivates-spawners.patch rename to patches/server/0089-Redstone-deactivates-spawners.patch index 49ff6f3c1..7ae98e203 100644 --- a/patches/server/0090-Redstone-deactivates-spawners.patch +++ b/patches/server/0089-Redstone-deactivates-spawners.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Redstone deactivates spawners diff --git a/src/main/java/net/minecraft/world/level/BaseSpawner.java b/src/main/java/net/minecraft/world/level/BaseSpawner.java -index 9228c0bc797fb95c8ac949bdc568eadafee84a80..f2c9f841d397f445cd3d0420f19e765c28e5598d 100644 +index c601b8b12756682a4cb300be8ebed4319902c5b5..eec88d3947d435559d8ce175f72c5efb02d25826 100644 --- a/src/main/java/net/minecraft/world/level/BaseSpawner.java +++ b/src/main/java/net/minecraft/world/level/BaseSpawner.java @@ -78,6 +78,7 @@ public abstract class BaseSpawner { @@ -17,7 +17,7 @@ index 9228c0bc797fb95c8ac949bdc568eadafee84a80..f2c9f841d397f445cd3d0420f19e765c } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 2a8435b39afc16d3ca862d17bb40fe3cc9d5e494..584757245d2703e69659746c3d382af456cb3f89 100644 +index d9412405c5eaee5c342ecbbf481f695d3fa308b0..7687900ab8a057f5b8c88ab24b05094b4407fede 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -345,6 +345,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0091-Totems-work-in-inventory.patch b/patches/server/0090-Totems-work-in-inventory.patch similarity index 93% rename from patches/server/0091-Totems-work-in-inventory.patch rename to patches/server/0090-Totems-work-in-inventory.patch index 30013e287..b7def77d9 100644 --- a/patches/server/0091-Totems-work-in-inventory.patch +++ b/patches/server/0090-Totems-work-in-inventory.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Totems work in inventory diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index a9767676a2e84984374cc7d7d012477c60be5a7f..3bda2f895612cb5bfd6205a675c03edc6a2270d6 100644 +index 0c14ccc74abcc68ecc5422b38bc729dc659b9b8b..b909eeba0539ab133e274a15b0b479b5546fc903 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1516,6 +1516,19 @@ public abstract class LivingEntity extends Entity { @@ -29,7 +29,7 @@ index a9767676a2e84984374cc7d7d012477c60be5a7f..3bda2f895612cb5bfd6205a675c03edc event.setCancelled(itemstack == null); this.level.getCraftServer().getPluginManager().callEvent(event); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 584757245d2703e69659746c3d382af456cb3f89..31ccb922343d971f8669147abffa97547df54e4d 100644 +index 7687900ab8a057f5b8c88ab24b05094b4407fede..c0a8bd071cfd87d1c156e1c1a6866357cc3e107c 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -230,6 +230,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0092-Add-vindicator-johnny-spawn-chance.patch b/patches/server/0091-Add-vindicator-johnny-spawn-chance.patch similarity index 96% rename from patches/server/0092-Add-vindicator-johnny-spawn-chance.patch rename to patches/server/0091-Add-vindicator-johnny-spawn-chance.patch index 16a3d9938..39ef6b257 100644 --- a/patches/server/0092-Add-vindicator-johnny-spawn-chance.patch +++ b/patches/server/0091-Add-vindicator-johnny-spawn-chance.patch @@ -30,7 +30,7 @@ index 76e6ea34db3942e9dd7646ad7ca1259f4387a4d8..9096c40ad5784d9097e889f0f43b6cf1 } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 31ccb922343d971f8669147abffa97547df54e4d..e28c5973ec4642fc729bcfa47aabade4afed4765 100644 +index c0a8bd071cfd87d1c156e1c1a6866357cc3e107c..8a5b7b852fc29d049c13160bd97b4f16176b1a11 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -1440,6 +1440,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0093-Add-option-to-disable-certain-block-updates.patch b/patches/server/0092-Add-option-to-disable-certain-block-updates.patch similarity index 99% rename from patches/server/0093-Add-option-to-disable-certain-block-updates.patch rename to patches/server/0092-Add-option-to-disable-certain-block-updates.patch index 09e29f513..47e9bb1e1 100644 --- a/patches/server/0093-Add-option-to-disable-certain-block-updates.patch +++ b/patches/server/0092-Add-option-to-disable-certain-block-updates.patch @@ -117,7 +117,7 @@ index f8e58d9f71703139a736d93e7f1996e027a29444..d3c8fd8399629efb8bcbaf7d9a0c4334 } diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 44286c661943cb147372b7864709485e747545c1..96dc811c655672e6fdb23865d63b564331ec7d88 100644 +index 4e928dd1efdd7e1f71a5c5adb3a287eb0463e077..23d1352ae9d740ab02c5020802ef56a3a11cf832 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -346,6 +346,15 @@ public class PurpurConfig { diff --git a/patches/server/0094-Dispensers-place-anvils-option.patch b/patches/server/0093-Dispensers-place-anvils-option.patch similarity index 96% rename from patches/server/0094-Dispensers-place-anvils-option.patch rename to patches/server/0093-Dispensers-place-anvils-option.patch index 6949b274f..7c81de097 100644 --- a/patches/server/0094-Dispensers-place-anvils-option.patch +++ b/patches/server/0093-Dispensers-place-anvils-option.patch @@ -41,7 +41,7 @@ index 92623ae25249d63efb92be8bd6c95228f9155ad2..20bf6d01046488eff53a109f5239351a static void setEntityPokingOutOfBlock(BlockSource pointer, Entity entity, Direction direction) { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index e28c5973ec4642fc729bcfa47aabade4afed4765..cce72e2574486fb178caa3bc1a89cbf39d66e4d1 100644 +index 8a5b7b852fc29d049c13160bd97b4f16176b1a11..9cd23e80ddf1cda60e1c342c11025145846b11f3 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -304,8 +304,10 @@ public class PurpurWorldConfig { diff --git a/patches/server/0095-Allow-anvil-colors.patch b/patches/server/0094-Allow-anvil-colors.patch similarity index 96% rename from patches/server/0095-Allow-anvil-colors.patch rename to patches/server/0094-Allow-anvil-colors.patch index 1299d0bf7..5f0dcc9c9 100644 --- a/patches/server/0095-Allow-anvil-colors.patch +++ b/patches/server/0094-Allow-anvil-colors.patch @@ -37,7 +37,7 @@ index ddfb89d62d2ec316683e9f0f5550e298ab26d137..410ac71efff92dfa1f1e11895d0f5bf3 } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index cce72e2574486fb178caa3bc1a89cbf39d66e4d1..f2e4cd773a3a3145d7a67245e23534fc77fadb72 100644 +index 9cd23e80ddf1cda60e1c342c11025145846b11f3..d051f003711a61f194e848ccf4f476de0ac5ec49 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -287,6 +287,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0096-Add-no-random-tick-block-list.patch b/patches/server/0095-Add-no-random-tick-block-list.patch similarity index 97% rename from patches/server/0096-Add-no-random-tick-block-list.patch rename to patches/server/0095-Add-no-random-tick-block-list.patch index f5cee97f7..918ead713 100644 --- a/patches/server/0096-Add-no-random-tick-block-list.patch +++ b/patches/server/0095-Add-no-random-tick-block-list.patch @@ -35,7 +35,7 @@ index 7538262e14c86e4da9cd4cb887b76f649bfef2e6..f34973be478de4f088a0593b45bd89e5 } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index f2e4cd773a3a3145d7a67245e23534fc77fadb72..b2c28f97ceb6c8c18332a56f9d2042dc9301ce3e 100644 +index d051f003711a61f194e848ccf4f476de0ac5ec49..e53c175340aa8bcab04a75348c29cef6209ba285 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -287,6 +287,28 @@ public class PurpurWorldConfig { diff --git a/patches/server/0097-Add-option-to-disable-dolphin-treasure-searching.patch b/patches/server/0096-Add-option-to-disable-dolphin-treasure-searching.patch similarity index 95% rename from patches/server/0097-Add-option-to-disable-dolphin-treasure-searching.patch rename to patches/server/0096-Add-option-to-disable-dolphin-treasure-searching.patch index 768d67299..32d3cecd2 100644 --- a/patches/server/0097-Add-option-to-disable-dolphin-treasure-searching.patch +++ b/patches/server/0096-Add-option-to-disable-dolphin-treasure-searching.patch @@ -17,7 +17,7 @@ index c372d47a929e06c8cfb0df86cf4e9bfee4d4b300..2aead13e8f879b614445715fb1912a20 } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index b2c28f97ceb6c8c18332a56f9d2042dc9301ce3e..d46484ca99fac9751db3ab8cae430f7167733a2e 100644 +index e53c175340aa8bcab04a75348c29cef6209ba285..b12f3a1a88033af6e041549064b50d24493c53eb 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -553,6 +553,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0098-Short-enderman-height.patch b/patches/server/0097-Short-enderman-height.patch similarity index 97% rename from patches/server/0098-Short-enderman-height.patch rename to patches/server/0097-Short-enderman-height.patch index 8316db07d..f1dae6b3f 100644 --- a/patches/server/0098-Short-enderman-height.patch +++ b/patches/server/0097-Short-enderman-height.patch @@ -31,7 +31,7 @@ index 6e0b5fbf5b0d216b6b7c647d45ef37cd6b591717..5ebedd6a156b06e98aded57c817f6342 if (this.tryEscape(com.destroystokyo.paper.event.entity.EndermanEscapeEvent.Reason.INDIRECT)) { // Paper start for (int i = 0; i < 64; ++i) { diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 96dc811c655672e6fdb23865d63b564331ec7d88..c283926d05fa60c576b8018bcaee465a03a699a5 100644 +index 23d1352ae9d740ab02c5020802ef56a3a11cf832..f1b349454cb78e5e49061bf26fc2f801802a5526 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -336,6 +336,12 @@ public class PurpurConfig { diff --git a/patches/server/0099-Stop-squids-floating-on-top-of-water.patch b/patches/server/0098-Stop-squids-floating-on-top-of-water.patch similarity index 95% rename from patches/server/0099-Stop-squids-floating-on-top-of-water.patch rename to patches/server/0098-Stop-squids-floating-on-top-of-water.patch index a60125b51..f9cfeb609 100644 --- a/patches/server/0099-Stop-squids-floating-on-top-of-water.patch +++ b/patches/server/0098-Stop-squids-floating-on-top-of-water.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Stop squids floating on top of water diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index d4f1984fcf965cb5b9bb9f2e10d790286d25c613..3d947ba3719d494f202f28c5d93d28944a6860c9 100644 +index 6db330cf388ef80f3acb84e41f02063c36f9aaf2..c5a1e46cc01e0f296a02536e70dc1443bb23a26f 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -3829,11 +3829,17 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n @@ -60,7 +60,7 @@ index 6f7e6429c35eea346517cbf08cf223fc6d838a8c..6a77112180556675af38cb1b3ce0b38a + // Purpur } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index d46484ca99fac9751db3ab8cae430f7167733a2e..298b246a383100a9860afad156ed9e9219d61bf6 100644 +index b12f3a1a88033af6e041549064b50d24493c53eb..5fcfb4867cb60295b2100c5179deeefcc6adaf54 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -1313,6 +1313,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0100-Use-configured-height-for-nether-surface-builders.patch b/patches/server/0099-Use-configured-height-for-nether-surface-builders.patch similarity index 93% rename from patches/server/0100-Use-configured-height-for-nether-surface-builders.patch rename to patches/server/0099-Use-configured-height-for-nether-surface-builders.patch index ffd803135..60f7e2108 100644 --- a/patches/server/0100-Use-configured-height-for-nether-surface-builders.patch +++ b/patches/server/0099-Use-configured-height-for-nether-surface-builders.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Use configured height for nether surface builders diff --git a/src/main/java/net/minecraft/world/level/levelgen/surfacebuilders/NetherCappedSurfaceBuilder.java b/src/main/java/net/minecraft/world/level/levelgen/surfacebuilders/NetherCappedSurfaceBuilder.java -index 7c3386b37aae7d10629e0a256102967f69b68a7e..0cfb34557eb52988681868ad772ca3b113ef5dc2 100644 +index cdfbdb411eacf5f8c6ced2dbc5789e0d49b93e1f..e4013f241a5e9aeb334dadde8b55c7e6ca32233c 100644 --- a/src/main/java/net/minecraft/world/level/levelgen/surfacebuilders/NetherCappedSurfaceBuilder.java +++ b/src/main/java/net/minecraft/world/level/levelgen/surfacebuilders/NetherCappedSurfaceBuilder.java @@ -40,7 +40,7 @@ public abstract class NetherCappedSurfaceBuilder extends SurfaceBuilder(this, Turtle.class, 10, true, false, Turtle.BABY_ON_LAND_SELECTOR)); } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index d207aa7ae9ece4959831f9e7c606b16a55e6b76f..050f2d8325d8b5a18e534027662fcbfff06a4c68 100644 +index 8a7b456397d278b61a8ef1f21aad498bf0afe64c..f6ae1959d600fe6955e8d9a72cde2df4d229a2cc 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -1647,6 +1647,7 @@ public class PurpurWorldConfig { +@@ -1645,6 +1645,7 @@ public class PurpurWorldConfig { public boolean zombieJockeyOnlyBaby = true; public double zombieJockeyChance = 0.05D; public boolean zombieJockeyTryExistingChickens = true; @@ -82,7 +82,7 @@ index d207aa7ae9ece4959831f9e7c606b16a55e6b76f..050f2d8325d8b5a18e534027662fcbff private void zombieSettings() { zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable); zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater); -@@ -1660,6 +1661,7 @@ public class PurpurWorldConfig { +@@ -1658,6 +1659,7 @@ public class PurpurWorldConfig { zombieJockeyOnlyBaby = getBoolean("mobs.zombie.jockey.only-babies", zombieJockeyOnlyBaby); zombieJockeyChance = getDouble("mobs.zombie.jockey.chance", zombieJockeyChance); zombieJockeyTryExistingChickens = getBoolean("mobs.zombie.jockey.try-existing-chickens", zombieJockeyTryExistingChickens); diff --git a/patches/server/0109-Persistent-TileEntity-Lore-and-DisplayName.patch b/patches/server/0108-Persistent-TileEntity-Lore-and-DisplayName.patch similarity index 99% rename from patches/server/0109-Persistent-TileEntity-Lore-and-DisplayName.patch rename to patches/server/0108-Persistent-TileEntity-Lore-and-DisplayName.patch index 446fe3d80..c594fcaf1 100644 --- a/patches/server/0109-Persistent-TileEntity-Lore-and-DisplayName.patch +++ b/patches/server/0108-Persistent-TileEntity-Lore-and-DisplayName.patch @@ -189,7 +189,7 @@ index c3a07ccccd5cc38552363c82398f432c8d624288..132c9e6a643995d9fde535a78d9edc9e + // Purpur end } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 050f2d8325d8b5a18e534027662fcbfff06a4c68..2086377305f800980d436b606c72ddba447694f1 100644 +index f6ae1959d600fe6955e8d9a72cde2df4d229a2cc..821a9103156dc8d3ea498af394bc414016c5eced 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -325,6 +325,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0110-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch b/patches/server/0109-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch similarity index 100% rename from patches/server/0110-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch rename to patches/server/0109-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch diff --git a/patches/server/0111-Flying-squids-Oh-my.patch b/patches/server/0110-Flying-squids-Oh-my.patch similarity index 97% rename from patches/server/0111-Flying-squids-Oh-my.patch rename to patches/server/0110-Flying-squids-Oh-my.patch index 587b377d8..ae3be48b6 100644 --- a/patches/server/0111-Flying-squids-Oh-my.patch +++ b/patches/server/0110-Flying-squids-Oh-my.patch @@ -58,7 +58,7 @@ index 2affff346a7fe81480e86cb61996039df0569853..12be4a2f25a7def8341acda47d10a256 float f1 = Mth.cos(f) * 0.2F; float f2 = -0.1F + this.squid.getRandom().nextFloat() * 0.2F; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 2086377305f800980d436b606c72ddba447694f1..f9da36aa9aead8f8ec7ec33469a1d95009e3a297 100644 +index 821a9103156dc8d3ea498af394bc414016c5eced..212c5bded10587ee7cca5c9bc89e7f355b485b13 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -812,9 +812,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0112-Infinity-bow-settings.patch b/patches/server/0111-Infinity-bow-settings.patch similarity index 97% rename from patches/server/0112-Infinity-bow-settings.patch rename to patches/server/0111-Infinity-bow-settings.patch index 50a195fa5..fafb4bcd5 100644 --- a/patches/server/0112-Infinity-bow-settings.patch +++ b/patches/server/0111-Infinity-bow-settings.patch @@ -27,7 +27,7 @@ index afe33f20578177cb517e1c116e6319481642e66c..fe4695adbb506733b4029ecfabcfda3d } else { user.startUsingItem(hand); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index f9da36aa9aead8f8ec7ec33469a1d95009e3a297..d5799c1084095eda3d3fd2d5bd2ae307ddad996b 100644 +index 212c5bded10587ee7cca5c9bc89e7f355b485b13..0821a3b8a4a8d36ed31f44c58d305cf7f37a0c19 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -121,6 +121,17 @@ public class PurpurWorldConfig { diff --git a/patches/server/0113-Stonecutter-damage.patch b/patches/server/0112-Stonecutter-damage.patch similarity index 95% rename from patches/server/0113-Stonecutter-damage.patch rename to patches/server/0112-Stonecutter-damage.patch index 64706cb18..9245cf910 100644 --- a/patches/server/0113-Stonecutter-damage.patch +++ b/patches/server/0112-Stonecutter-damage.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Stonecutter damage diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 721fd382ac1a024fea3360c100f5f7ad665e73bb..260a2d8616030c0f5619eb357719b980f93570c8 100644 +index 63ab08c00048feba74e4b3c25308ee75d2aa8474..ad691bd5c17ef7a8ecb394d620e02b28ac08f5a4 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1001,7 +1001,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n @@ -61,7 +61,7 @@ index 2ad5ff9a1d7de54e75436e99da8a73db9dc91bde..60605a8a021cc56f9c3ba22bc43c43c3 } else if (blockState.is(Blocks.HONEY_BLOCK)) { return BlockPathTypes.STICKY_HONEY; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index d5799c1084095eda3d3fd2d5bd2ae307ddad996b..21d3acb8a69fffd372af6cd1fc667feb91a3a4dc 100644 +index 0821a3b8a4a8d36ed31f44c58d305cf7f37a0c19..6fc344bacb5943971a49e5ae6ceb22443525eeb1 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -448,6 +448,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0114-Configurable-daylight-cycle.patch b/patches/server/0113-Configurable-daylight-cycle.patch similarity index 98% rename from patches/server/0114-Configurable-daylight-cycle.patch rename to patches/server/0113-Configurable-daylight-cycle.patch index 9892e112c..775dceb31 100644 --- a/patches/server/0114-Configurable-daylight-cycle.patch +++ b/patches/server/0113-Configurable-daylight-cycle.patch @@ -70,7 +70,7 @@ index 98af132fd4a03afb016a05fd004ffe3e1d5cd957..f15da84c0e5f9ab67c4d9ec59ee37de3 public void tickCustomSpawners(boolean spawnMonsters, boolean spawnAnimals) { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 21d3acb8a69fffd372af6cd1fc667feb91a3a4dc..a2e9ed180930e3f20b4973f2082d4b336e2719a1 100644 +index 6fc344bacb5943971a49e5ae6ceb22443525eeb1..0d924990f60019c6a6b9d1ac37e176af43cae93c 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -103,6 +103,13 @@ public class PurpurWorldConfig { diff --git a/patches/server/0115-Allow-infinite-and-mending-enchantments-together.patch b/patches/server/0114-Allow-infinite-and-mending-enchantments-together.patch similarity index 95% rename from patches/server/0115-Allow-infinite-and-mending-enchantments-together.patch rename to patches/server/0114-Allow-infinite-and-mending-enchantments-together.patch index ccbc91021..458187dbd 100644 --- a/patches/server/0115-Allow-infinite-and-mending-enchantments-together.patch +++ b/patches/server/0114-Allow-infinite-and-mending-enchantments-together.patch @@ -17,7 +17,7 @@ index 3aece8245060dd1ba269c08d226c84247a6f0a83..6763d0b96c83d1b462999f525bf1f31c } } diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 380bb11ea7cabd9513397dec5eb171f4269418bb..1d9fa061b0a109296a1bcc7d06a7786ddc76d1b9 100644 +index ab10cade5e290fc479f7a6b5905a639bc24ef596..e17c0c2dd3dc2f21cd039a37302e2c103efba2e0 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -338,6 +338,16 @@ public class PurpurConfig { diff --git a/patches/server/0116-Furnace-uses-lava-from-underneath.patch b/patches/server/0115-Furnace-uses-lava-from-underneath.patch similarity index 97% rename from patches/server/0116-Furnace-uses-lava-from-underneath.patch rename to patches/server/0115-Furnace-uses-lava-from-underneath.patch index baa1b558c..f4987a889 100644 --- a/patches/server/0116-Furnace-uses-lava-from-underneath.patch +++ b/patches/server/0115-Furnace-uses-lava-from-underneath.patch @@ -48,7 +48,7 @@ index 348e485897c34cca19113cc35f055a58778ca38b..fb3f7e821224889b08c0f424d79e122c private static boolean canBurn(@Nullable Recipe recipe, NonNullList slots, int count) { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index a2e9ed180930e3f20b4973f2082d4b336e2719a1..e2e7dafa46f16c8b3fcc68ff8a56b4183ca51e09 100644 +index 0d924990f60019c6a6b9d1ac37e176af43cae93c..47ef898f0581dceccd1d33c9b13bcb3908e17a3d 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -416,6 +416,17 @@ public class PurpurWorldConfig { diff --git a/patches/server/0117-Arrows-should-not-reset-despawn-counter.patch b/patches/server/0116-Arrows-should-not-reset-despawn-counter.patch similarity index 100% rename from patches/server/0117-Arrows-should-not-reset-despawn-counter.patch rename to patches/server/0116-Arrows-should-not-reset-despawn-counter.patch diff --git a/patches/server/0118-Ability-to-re-add-farmland-mechanics-from-Alpha.patch b/patches/server/0117-Ability-to-re-add-farmland-mechanics-from-Alpha.patch similarity index 90% rename from patches/server/0118-Ability-to-re-add-farmland-mechanics-from-Alpha.patch rename to patches/server/0117-Ability-to-re-add-farmland-mechanics-from-Alpha.patch index 5f4eaa5cc..986b683ae 100644 --- a/patches/server/0118-Ability-to-re-add-farmland-mechanics-from-Alpha.patch +++ b/patches/server/0117-Ability-to-re-add-farmland-mechanics-from-Alpha.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Ability to re-add farmland mechanics from Alpha diff --git a/src/main/java/net/minecraft/world/level/block/FarmBlock.java b/src/main/java/net/minecraft/world/level/block/FarmBlock.java -index e59861e0feb20b66735a76c19fd4e48bf13443e2..9fb0464f74bcbb757171290ae44f4a4c7ea4d499 100644 +index 5d9d77cb382c8075af2713a0ce26c28a35a0aaa8..2d4d59eb5a534e4c283933b734c44776b674b2eb 100644 --- a/src/main/java/net/minecraft/world/level/block/FarmBlock.java +++ b/src/main/java/net/minecraft/world/level/block/FarmBlock.java @@ -96,6 +96,14 @@ public class FarmBlock extends Block { @@ -24,7 +24,7 @@ index e59861e0feb20b66735a76c19fd4e48bf13443e2..9fb0464f74bcbb757171290ae44f4a4c return; } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index e2e7dafa46f16c8b3fcc68ff8a56b4183ca51e09..5ba0878c35606d7b980105a3c4f12c7d885203d3 100644 +index 47ef898f0581dceccd1d33c9b13bcb3908e17a3d..61116813f0f798f8f90467541bf5cde55714a053 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -412,8 +412,10 @@ public class PurpurWorldConfig { diff --git a/patches/server/0119-Add-adjustable-breeding-cooldown-to-config.patch b/patches/server/0118-Add-adjustable-breeding-cooldown-to-config.patch similarity index 98% rename from patches/server/0119-Add-adjustable-breeding-cooldown-to-config.patch rename to patches/server/0118-Add-adjustable-breeding-cooldown-to-config.patch index aeb33dab5..1df0eb0bb 100644 --- a/patches/server/0119-Add-adjustable-breeding-cooldown-to-config.patch +++ b/patches/server/0118-Add-adjustable-breeding-cooldown-to-config.patch @@ -95,7 +95,7 @@ index e52a708904d7c7d8d19e9def3bc915a9141c2bed..42c9952ee868fa54d9b6f2db8e08e3bc this.world = new CraftWorld((ServerLevel) this, gen, env); this.ticksPerAnimalSpawns = this.getCraftServer().getTicksPerAnimalSpawns(); // CraftBukkit diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 5ba0878c35606d7b980105a3c4f12c7d885203d3..f7a73173585239c90ae55f49eed3cd40e0f8e1e8 100644 +index 61116813f0f798f8f90467541bf5cde55714a053..914d3a6ac675d9b2e348af281db22768cc5ee616 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -348,6 +348,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0120-Make-entity-breeding-times-configurable.patch b/patches/server/0119-Make-entity-breeding-times-configurable.patch similarity index 99% rename from patches/server/0120-Make-entity-breeding-times-configurable.patch rename to patches/server/0119-Make-entity-breeding-times-configurable.patch index 8c18da363..07939399a 100644 --- a/patches/server/0120-Make-entity-breeding-times-configurable.patch +++ b/patches/server/0119-Make-entity-breeding-times-configurable.patch @@ -266,7 +266,7 @@ index 497be3182c72b5a0f3bc42088c4168702119b527..607823661ba942ec03b1f61dac5a786b @Override 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 31568adcf4a89b11e61f455a15326c7f72bf487e..c1202540383ef991d7b8c3767132c4fc54d4c570 100644 +index 66c01b8300bc09ace27e4d1a30ee9274c69fcc9a..3e8c90c2d44d906fae3dfc068a30c81a494a3268 100644 --- a/src/main/java/net/minecraft/world/entity/animal/Turtle.java +++ b/src/main/java/net/minecraft/world/entity/animal/Turtle.java @@ -105,6 +105,11 @@ public class Turtle extends Animal { @@ -474,7 +474,7 @@ index 5d289be8f0ef003abbce992e7662f6ddce4f4a99..5e3d7321a73144c3e4c43c18c5b748b2 @Override diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index f7a73173585239c90ae55f49eed3cd40e0f8e1e8..a1e135e7813c31dbb0508ebb0bee1a2c453e5b4e 100644 +index 914d3a6ac675d9b2e348af281db22768cc5ee616..b86fdb60e693d3ad1016d10d3f3559daa81fab1b 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -486,9 +486,11 @@ public class PurpurWorldConfig { @@ -834,7 +834,7 @@ index f7a73173585239c90ae55f49eed3cd40e0f8e1e8..a1e135e7813c31dbb0508ebb0bee1a2c } public boolean vindicatorRidable = false; -@@ -1659,6 +1705,7 @@ public class PurpurWorldConfig { +@@ -1657,6 +1703,7 @@ public class PurpurWorldConfig { public boolean wolfRidable = false; public boolean wolfRidableInWater = false; public double wolfMaxHealth = 8.0D; @@ -842,7 +842,7 @@ index f7a73173585239c90ae55f49eed3cd40e0f8e1e8..a1e135e7813c31dbb0508ebb0bee1a2c private void wolfSettings() { wolfRidable = getBoolean("mobs.wolf.ridable", wolfRidable); wolfRidableInWater = getBoolean("mobs.wolf.ridable-in-water", wolfRidableInWater); -@@ -1668,6 +1715,7 @@ public class PurpurWorldConfig { +@@ -1666,6 +1713,7 @@ public class PurpurWorldConfig { set("mobs.wolf.attributes.max_health", oldValue); } wolfMaxHealth = getDouble("mobs.wolf.attributes.max_health", wolfMaxHealth); diff --git a/patches/server/0121-Apply-display-names-from-item-forms-of-entities-to-e.patch b/patches/server/0120-Apply-display-names-from-item-forms-of-entities-to-e.patch similarity index 99% rename from patches/server/0121-Apply-display-names-from-item-forms-of-entities-to-e.patch rename to patches/server/0120-Apply-display-names-from-item-forms-of-entities-to-e.patch index bd31aed7f..0536ba28a 100644 --- a/patches/server/0121-Apply-display-names-from-item-forms-of-entities-to-e.patch +++ b/patches/server/0120-Apply-display-names-from-item-forms-of-entities-to-e.patch @@ -142,7 +142,7 @@ index 282bfe4904637aaff1bd29e30ed18ba843c07cab..ddd50db8bb92c147d7c1eef4d1df3ac5 if (((HangingEntity) object).survives()) { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index a1e135e7813c31dbb0508ebb0bee1a2c453e5b4e..396091bd1a72cac5cc07815f7ca1c68b5cec87c2 100644 +index b86fdb60e693d3ad1016d10d3f3559daa81fab1b..5f68883f98fb9f3b8db7944627607970619c2d6c 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -99,8 +99,10 @@ public class PurpurWorldConfig { diff --git a/patches/server/0122-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch b/patches/server/0121-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch similarity index 95% rename from patches/server/0122-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch rename to patches/server/0121-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch index 076a80d46..1f1b3e12d 100644 --- a/patches/server/0122-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch +++ b/patches/server/0121-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch @@ -17,7 +17,7 @@ index 623f78c078fb3aa2665d7e8a37672438227bce6b..500c69e555c7247e20ef8cc59d834155 ((Mob) newEntityLiving).setPersistenceRequired(); // Paper end diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 396091bd1a72cac5cc07815f7ca1c68b5cec87c2..53d0ec1e89b05d798ebfc620ada0d95bcf61cb21 100644 +index 5f68883f98fb9f3b8db7944627607970619c2d6c..a2547df37f58b67776da9b5eeba73b0ca6acbc87 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -100,9 +100,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0123-Add-twisting-and-weeping-vines-growth-rates.patch b/patches/server/0122-Add-twisting-and-weeping-vines-growth-rates.patch similarity index 98% rename from patches/server/0123-Add-twisting-and-weeping-vines-growth-rates.patch rename to patches/server/0122-Add-twisting-and-weeping-vines-growth-rates.patch index 69484df77..8848ce1a1 100644 --- a/patches/server/0123-Add-twisting-and-weeping-vines-growth-rates.patch +++ b/patches/server/0122-Add-twisting-and-weeping-vines-growth-rates.patch @@ -82,7 +82,7 @@ index 35b2bad76c45b5a94ba7f2e9c7a8cfeb8c3f498b..d2cb1a7e7ea364cb8e2af4c4e756d8e4 + // Purpur end } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 53d0ec1e89b05d798ebfc620ada0d95bcf61cb21..646fceecfe7c626d0a2cec671c1f12be743c7805 100644 +index a2547df37f58b67776da9b5eeba73b0ca6acbc87..06a639b5b20e4c1e4cef7263bae8d9e328342b55 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -412,6 +412,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0124-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch b/patches/server/0123-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch similarity index 98% rename from patches/server/0124-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch rename to patches/server/0123-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch index cd84f9d14..b38b6eb2c 100644 --- a/patches/server/0124-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch +++ b/patches/server/0123-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch @@ -103,7 +103,7 @@ index d2cb1a7e7ea364cb8e2af4c4e756d8e45bc0ca10..bb99dda3c5167f23b2500a1f37cbc1ca // Purpur end } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 646fceecfe7c626d0a2cec671c1f12be743c7805..3895f0f0f096adbefd806f60a86cd2ea40c288b7 100644 +index 06a639b5b20e4c1e4cef7263bae8d9e328342b55..d2699241f5c01e33e13ed2ceac9a828d3cf87f41 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -413,8 +413,10 @@ public class PurpurWorldConfig { diff --git a/patches/server/0125-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch b/patches/server/0124-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch similarity index 96% rename from patches/server/0125-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch rename to patches/server/0124-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch index 7c8447aa1..19dd06623 100644 --- a/patches/server/0125-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch +++ b/patches/server/0124-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch @@ -21,7 +21,7 @@ index 5ebedd6a156b06e98aded57c817f63429a1ae380..c99d295b999a28dd1eb504179250445d private static class EndermanFreezeWhenLookedAt extends Goal { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 3895f0f0f096adbefd806f60a86cd2ea40c288b7..38cb6bb3f0f45a257614ce26c40ca6b259af626d 100644 +index d2699241f5c01e33e13ed2ceac9a828d3cf87f41..4d43cd955ba4e46a1149075591139a8ace262282 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -790,6 +790,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0126-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch b/patches/server/0125-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch similarity index 100% rename from patches/server/0126-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch rename to patches/server/0125-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch diff --git a/patches/server/0127-Add-configurable-snowball-damage.patch b/patches/server/0126-Add-configurable-snowball-damage.patch similarity index 95% rename from patches/server/0127-Add-configurable-snowball-damage.patch rename to patches/server/0126-Add-configurable-snowball-damage.patch index 08b4a9a1b..2ac9b9617 100644 --- a/patches/server/0127-Add-configurable-snowball-damage.patch +++ b/patches/server/0126-Add-configurable-snowball-damage.patch @@ -18,7 +18,7 @@ index ed2f039c4042861bcfa2e41d8281eefd37daa9fa..d5d84893c77b4e60a19032d765d76bfd } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 38cb6bb3f0f45a257614ce26c40ca6b259af626d..0e30b578748c2c6f2231ec1a526cbfef9edabf9f 100644 +index 4d43cd955ba4e46a1149075591139a8ace262282..b49e7d4c21449ad6ccfe24c837fb7ea619b539b4 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -288,6 +288,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0128-Zombie-break-door-minimum-difficulty-option.patch b/patches/server/0127-Zombie-break-door-minimum-difficulty-option.patch similarity index 94% rename from patches/server/0128-Zombie-break-door-minimum-difficulty-option.patch rename to patches/server/0127-Zombie-break-door-minimum-difficulty-option.patch index 3aa2ad44a..789b9c206 100644 --- a/patches/server/0128-Zombie-break-door-minimum-difficulty-option.patch +++ b/patches/server/0127-Zombie-break-door-minimum-difficulty-option.patch @@ -44,10 +44,10 @@ index fe045f8e35fe2aac51032a67ce52b27a53a8eff0..03bc86c776596ca5964c22adb757115d + // Purpur end } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 0e30b578748c2c6f2231ec1a526cbfef9edabf9f..1000177563e5681a8caa745f1cd40af37723e8bc 100644 +index b49e7d4c21449ad6ccfe24c837fb7ea619b539b4..72592ed2f2fc83974b9adcff7406bb84a77ed62a 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -1779,6 +1779,7 @@ public class PurpurWorldConfig { +@@ -1777,6 +1777,7 @@ public class PurpurWorldConfig { public double zombieJockeyChance = 0.05D; public boolean zombieJockeyTryExistingChickens = true; public boolean zombieAggressiveTowardsVillagerWhenLagging = true; @@ -55,7 +55,7 @@ index 0e30b578748c2c6f2231ec1a526cbfef9edabf9f..1000177563e5681a8caa745f1cd40af3 private void zombieSettings() { zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable); zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater); -@@ -1793,6 +1794,11 @@ public class PurpurWorldConfig { +@@ -1791,6 +1792,11 @@ public class PurpurWorldConfig { zombieJockeyChance = getDouble("mobs.zombie.jockey.chance", zombieJockeyChance); zombieJockeyTryExistingChickens = getBoolean("mobs.zombie.jockey.try-existing-chickens", zombieJockeyTryExistingChickens); zombieAggressiveTowardsVillagerWhenLagging = getBoolean("mobs.zombie.aggressive-towards-villager-when-lagging", zombieAggressiveTowardsVillagerWhenLagging); diff --git a/patches/server/0129-Left-handed-API.patch b/patches/server/0128-Left-handed-API.patch similarity index 100% rename from patches/server/0129-Left-handed-API.patch rename to patches/server/0128-Left-handed-API.patch diff --git a/patches/server/0130-Changeable-Mob-Left-Handed-Chance.patch b/patches/server/0129-Changeable-Mob-Left-Handed-Chance.patch similarity index 95% rename from patches/server/0130-Changeable-Mob-Left-Handed-Chance.patch rename to patches/server/0129-Changeable-Mob-Left-Handed-Chance.patch index 35353cd91..d8e1370a9 100644 --- a/patches/server/0130-Changeable-Mob-Left-Handed-Chance.patch +++ b/patches/server/0129-Changeable-Mob-Left-Handed-Chance.patch @@ -18,7 +18,7 @@ index df79f95ab2c8b9106cac889787b840b166ff0a9c..2f061e2825127e4a38e261ccacf56926 } else { this.setLeftHanded(false); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 1000177563e5681a8caa745f1cd40af37723e8bc..27f9e9e65b7773190af12513085136709cf18d44 100644 +index 72592ed2f2fc83974b9adcff7406bb84a77ed62a..adf2d5b31a5e15cd0afb7bea2c9016f6857358e9 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -128,8 +128,10 @@ public class PurpurWorldConfig { diff --git a/patches/server/0131-Add-boat-fall-damage-config.patch b/patches/server/0130-Add-boat-fall-damage-config.patch similarity index 94% rename from patches/server/0131-Add-boat-fall-damage-config.patch rename to patches/server/0130-Add-boat-fall-damage-config.patch index ccaee732e..d583654e7 100644 --- a/patches/server/0131-Add-boat-fall-damage-config.patch +++ b/patches/server/0130-Add-boat-fall-damage-config.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add boat fall damage config diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 4b74790581b0f629507e5d00c0882bad0f0e168e..85d2fda86638075130def6a47912682637186d84 100644 +index 39493db2f716fe165431d9f8b3566c07e3657c8d..b52cea07a77bd5124881e144483e148cbf5ad54d 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -987,7 +987,16 @@ public class ServerPlayer extends Player { @@ -27,7 +27,7 @@ index 4b74790581b0f629507e5d00c0882bad0f0e168e..85d2fda86638075130def6a479126826 if (!flag && isSpawnInvulnerable() && source != DamageSource.OUT_OF_WORLD) { // Purpur diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 27f9e9e65b7773190af12513085136709cf18d44..89bb1405ca28456bc0bd0ad6b3828d39b33c0264 100644 +index adf2d5b31a5e15cd0afb7bea2c9016f6857358e9..6207b9accb2971d6ff8c69c9a665aa35b53ef0d9 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -351,6 +351,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0132-Snow-Golem-rate-of-fire-config.patch b/patches/server/0131-Snow-Golem-rate-of-fire-config.patch similarity index 97% rename from patches/server/0132-Snow-Golem-rate-of-fire-config.patch rename to patches/server/0131-Snow-Golem-rate-of-fire-config.patch index 92038737c..92cfd0560 100644 --- a/patches/server/0132-Snow-Golem-rate-of-fire-config.patch +++ b/patches/server/0131-Snow-Golem-rate-of-fire-config.patch @@ -23,7 +23,7 @@ index 0733f9c057fef17fd79a4769f19b78f4c83a7784..1697b573ffd0c5d17d2d538c40f5ce4b this.goalSelector.addGoal(3, new LookAtPlayerGoal(this, Player.class, 6.0F)); this.goalSelector.addGoal(4, new RandomLookAroundGoal(this)); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 89bb1405ca28456bc0bd0ad6b3828d39b33c0264..09e9d82db853b865192d0c420b80b4dc784e6f46 100644 +index 6207b9accb2971d6ff8c69c9a665aa35b53ef0d9..42961f8d61204798ad4942dfa87d66d72eb62ae5 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -1473,6 +1473,10 @@ public class PurpurWorldConfig { diff --git a/patches/server/0133-PaperPR-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0132-PaperPR-Config-option-for-Piglins-guarding-chests.patch similarity index 90% rename from patches/server/0133-PaperPR-Config-option-for-Piglins-guarding-chests.patch rename to patches/server/0132-PaperPR-Config-option-for-Piglins-guarding-chests.patch index 1f56c9300..416c298ab 100644 --- a/patches/server/0133-PaperPR-Config-option-for-Piglins-guarding-chests.patch +++ b/patches/server/0132-PaperPR-Config-option-for-Piglins-guarding-chests.patch @@ -5,7 +5,7 @@ Subject: [PATCH] PaperPR - Config option for Piglins guarding chests diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 26e18a08a7f0bd704ff3055ce3a7814191450c85..197756f89b7d4d0e20e2ba48ab42b0ac59ded47f 100644 +index b07368ed5b8fcacd617988d09d5d27904315cf27..11576c89a4d7a6a29b1d17a6126fcba8154a6a4b 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -49,6 +49,11 @@ public class PaperWorldConfig { @@ -21,7 +21,7 @@ index 26e18a08a7f0bd704ff3055ce3a7814191450c85..197756f89b7d4d0e20e2ba48ab42b0ac private void useEigencraftRedstone() { useEigencraftRedstone = this.getBoolean("use-faster-eigencraft-redstone", false); diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinAi.java b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinAi.java -index 7606254a83975f4052565efbf52d37df31b37bca..c8194aed379d97613b99a7c697110bbc333420ed 100644 +index 01d307e0022656509bc8fd02d6bac78a6af3a7be..2366735f571113a543fd15607b5ff74c09cd0d24 100644 --- a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinAi.java +++ b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinAi.java @@ -468,6 +468,7 @@ public class PiglinAi { diff --git a/patches/server/0134-EMC-Configurable-disable-give-dropping.patch b/patches/server/0133-EMC-Configurable-disable-give-dropping.patch similarity index 95% rename from patches/server/0134-EMC-Configurable-disable-give-dropping.patch rename to patches/server/0133-EMC-Configurable-disable-give-dropping.patch index 6f904fb73..8ee9af3d8 100644 --- a/patches/server/0134-EMC-Configurable-disable-give-dropping.patch +++ b/patches/server/0133-EMC-Configurable-disable-give-dropping.patch @@ -20,7 +20,7 @@ index a0dc380e90415de9068ea408d62a1605c82631df..60fd566f7e1499ecf2ad91216a667f12 itemStack.setCount(1); ItemEntity itemEntity2 = serverPlayer.drop(itemStack, false, false, true); // Paper - Fix duplicating /give items on item drop cancel diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 1d9fa061b0a109296a1bcc7d06a7786ddc76d1b9..9d2b3f57779b1bc9732636a4618ef58ce7f6f722 100644 +index e17c0c2dd3dc2f21cd039a37302e2c103efba2e0..00a5c65439a30499156a10b1822760fe48ee7776 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -317,6 +317,11 @@ public class PurpurConfig { diff --git a/patches/server/0135-Lobotomize-stuck-villagers.patch b/patches/server/0134-Lobotomize-stuck-villagers.patch similarity index 95% rename from patches/server/0135-Lobotomize-stuck-villagers.patch rename to patches/server/0134-Lobotomize-stuck-villagers.patch index 6d3440694..6f9520df1 100644 --- a/patches/server/0135-Lobotomize-stuck-villagers.patch +++ b/patches/server/0134-Lobotomize-stuck-villagers.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Lobotomize stuck villagers diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java -index bb3572370a86519a92b7b3dab0482cd1527de19d..9a460eeb48c14590d28d071cfa5a925157e837c5 100644 +index 4752205ab570ab8f6ae7f0a15ae610b603ade2ea..9ee0acdd5b3ce1eb5c78bd85c6732ad7f92655e2 100644 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java @@ -142,6 +142,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler @@ -53,7 +53,7 @@ index bb3572370a86519a92b7b3dab0482cd1527de19d..9a460eeb48c14590d28d071cfa5a9251 if (this.assignProfessionWhenSpawned) { this.assignProfessionWhenSpawned = false; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 09e9d82db853b865192d0c420b80b4dc784e6f46..58924239d28b1c0e5ae7d2ed719f617cb1eee184 100644 +index 42961f8d61204798ad4942dfa87d66d72eb62ae5..1ea67f92a3d3c09751df0f9e3b6a3cf64f2590e8 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -1646,6 +1646,8 @@ public class PurpurWorldConfig { diff --git a/patches/server/0136-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch b/patches/server/0135-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch similarity index 99% rename from patches/server/0136-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch rename to patches/server/0135-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch index 09b4f54ed..c0b17d54c 100644 --- a/patches/server/0136-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch +++ b/patches/server/0135-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch @@ -185,7 +185,7 @@ index 901fc6520d58a5fa5f2cf1b4fa78fec6008aa409..9050cd25663c71197c597aac0ab2e612 public static final VillagerProfession FISHERMAN = register("fisherman", PoiType.FISHERMAN, SoundEvents.VILLAGER_WORK_FISHERMAN); public static final VillagerProfession FLETCHER = register("fletcher", PoiType.FLETCHER, SoundEvents.VILLAGER_WORK_FLETCHER); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 58924239d28b1c0e5ae7d2ed719f617cb1eee184..92d76fa843c846906d8f54114d7d24df3e4050d9 100644 +index 1ea67f92a3d3c09751df0f9e3b6a3cf64f2590e8..5d043e559a190a70d6a3e53e00ad060a43bc37f9 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -1648,6 +1648,8 @@ public class PurpurWorldConfig { diff --git a/patches/server/0137-Toggle-for-Zombified-Piglin-death-always-counting-as.patch b/patches/server/0136-Toggle-for-Zombified-Piglin-death-always-counting-as.patch similarity index 93% rename from patches/server/0137-Toggle-for-Zombified-Piglin-death-always-counting-as.patch rename to patches/server/0136-Toggle-for-Zombified-Piglin-death-always-counting-as.patch index 8ba788e8f..3ec01f13d 100644 --- a/patches/server/0137-Toggle-for-Zombified-Piglin-death-always-counting-as.patch +++ b/patches/server/0136-Toggle-for-Zombified-Piglin-death-always-counting-as.patch @@ -35,10 +35,10 @@ index 5b5958e37918b97fa994500fe94cd0e57faa1948..64216c9d76ce5ec6a845915ca078b0c0 } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 92d76fa843c846906d8f54114d7d24df3e4050d9..cc12e27ebf60f92ce46c86055ee8559d0027ab3b 100644 +index 5d043e559a190a70d6a3e53e00ad060a43bc37f9..faa45f7be455fcc101523b452fc09ea9f42cfa51 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -1882,6 +1882,7 @@ public class PurpurWorldConfig { +@@ -1880,6 +1880,7 @@ public class PurpurWorldConfig { public boolean zombifiedPiglinJockeyOnlyBaby = true; public double zombifiedPiglinJockeyChance = 0.05D; public boolean zombifiedPiglinJockeyTryExistingChickens = true; @@ -46,7 +46,7 @@ index 92d76fa843c846906d8f54114d7d24df3e4050d9..cc12e27ebf60f92ce46c86055ee8559d private void zombifiedPiglinSettings() { zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable); zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater); -@@ -1895,5 +1896,6 @@ public class PurpurWorldConfig { +@@ -1893,5 +1894,6 @@ public class PurpurWorldConfig { zombifiedPiglinJockeyOnlyBaby = getBoolean("mobs.zombified_piglin.jockey.only-babies", zombifiedPiglinJockeyOnlyBaby); zombifiedPiglinJockeyChance = getDouble("mobs.zombified_piglin.jockey.chance", zombifiedPiglinJockeyChance); zombifiedPiglinJockeyTryExistingChickens = getBoolean("mobs.zombified_piglin.jockey.try-existing-chickens", zombifiedPiglinJockeyTryExistingChickens); diff --git a/patches/server/0138-Spread-out-and-optimise-player-list-ticksSpread-out-.patch b/patches/server/0137-Spread-out-and-optimise-player-list-ticksSpread-out-.patch similarity index 100% rename from patches/server/0138-Spread-out-and-optimise-player-list-ticksSpread-out-.patch rename to patches/server/0137-Spread-out-and-optimise-player-list-ticksSpread-out-.patch diff --git a/patches/server/0139-Configurable-chance-for-wolves-to-spawn-rabid.patch b/patches/server/0138-Configurable-chance-for-wolves-to-spawn-rabid.patch similarity index 98% rename from patches/server/0139-Configurable-chance-for-wolves-to-spawn-rabid.patch rename to patches/server/0138-Configurable-chance-for-wolves-to-spawn-rabid.patch index 1929f894f..48e4ef921 100644 --- a/patches/server/0139-Configurable-chance-for-wolves-to-spawn-rabid.patch +++ b/patches/server/0138-Configurable-chance-for-wolves-to-spawn-rabid.patch @@ -201,10 +201,10 @@ index ef4abaf68de01b0879f7d0b330d2d57cc6bd10f9..3e7409ebf1f94b9cf55f2d0b0fe17ca8 return super.mobInteract(player, hand); } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index cc12e27ebf60f92ce46c86055ee8559d0027ab3b..5c189d221dddd9e550770418361e7a5965d7ddf7 100644 +index faa45f7be455fcc101523b452fc09ea9f42cfa51..43376091a2596af66772e5a3a967d945d5b8a32b 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -1769,6 +1769,8 @@ public class PurpurWorldConfig { +@@ -1767,6 +1767,8 @@ public class PurpurWorldConfig { public boolean wolfRidable = false; public boolean wolfRidableInWater = false; public double wolfMaxHealth = 8.0D; @@ -213,7 +213,7 @@ index cc12e27ebf60f92ce46c86055ee8559d0027ab3b..5c189d221dddd9e550770418361e7a59 public int wolfBreedingTicks = 6000; private void wolfSettings() { wolfRidable = getBoolean("mobs.wolf.ridable", wolfRidable); -@@ -1779,6 +1781,8 @@ public class PurpurWorldConfig { +@@ -1777,6 +1779,8 @@ public class PurpurWorldConfig { set("mobs.wolf.attributes.max_health", oldValue); } wolfMaxHealth = getDouble("mobs.wolf.attributes.max_health", wolfMaxHealth); diff --git a/patches/server/0140-Configurable-default-wolf-collar-color.patch b/patches/server/0139-Configurable-default-wolf-collar-color.patch similarity index 91% rename from patches/server/0140-Configurable-default-wolf-collar-color.patch rename to patches/server/0139-Configurable-default-wolf-collar-color.patch index 25d7bc513..a37845ade 100644 --- a/patches/server/0140-Configurable-default-wolf-collar-color.patch +++ b/patches/server/0139-Configurable-default-wolf-collar-color.patch @@ -24,10 +24,10 @@ index 3e7409ebf1f94b9cf55f2d0b0fe17ca8ec44659f..518dd0e6b4889c049e438b393baa795a @Override diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 5c189d221dddd9e550770418361e7a5965d7ddf7..ca7596a6531dbc9ac0e1769764518e7e9d7eeeec 100644 +index 43376091a2596af66772e5a3a967d945d5b8a32b..294c83b75d43132b58421e927e5359e874158b42 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -1769,6 +1769,7 @@ public class PurpurWorldConfig { +@@ -1767,6 +1767,7 @@ public class PurpurWorldConfig { public boolean wolfRidable = false; public boolean wolfRidableInWater = false; public double wolfMaxHealth = 8.0D; @@ -35,7 +35,7 @@ index 5c189d221dddd9e550770418361e7a5965d7ddf7..ca7596a6531dbc9ac0e1769764518e7e public boolean wolfMilkCuresRabies = true; public double wolfNaturalRabid = 0.0D; public int wolfBreedingTicks = 6000; -@@ -1781,6 +1782,11 @@ public class PurpurWorldConfig { +@@ -1779,6 +1780,11 @@ public class PurpurWorldConfig { set("mobs.wolf.attributes.max_health", oldValue); } wolfMaxHealth = getDouble("mobs.wolf.attributes.max_health", wolfMaxHealth); diff --git a/patches/server/0141-Phantom-flames-on-swoop.patch b/patches/server/0140-Phantom-flames-on-swoop.patch similarity index 95% rename from patches/server/0141-Phantom-flames-on-swoop.patch rename to patches/server/0140-Phantom-flames-on-swoop.patch index 07556a5b2..713f5c1a9 100644 --- a/patches/server/0141-Phantom-flames-on-swoop.patch +++ b/patches/server/0140-Phantom-flames-on-swoop.patch @@ -17,7 +17,7 @@ index c55aba456aa144e58fc35877c61eff309eaa391f..c39e2d05fa81279a684532ee796880b1 @Override diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index ca7596a6531dbc9ac0e1769764518e7e9d7eeeec..e44328d3ac04512e79f1b1363e72bf5e82426782 100644 +index 294c83b75d43132b58421e927e5359e874158b42..316b0499c49924771d1361e35f3a4d2ce46a739b 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -1177,6 +1177,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0142-Option-for-chests-to-open-even-with-a-solid-block-on.patch b/patches/server/0141-Option-for-chests-to-open-even-with-a-solid-block-on.patch similarity index 95% rename from patches/server/0142-Option-for-chests-to-open-even-with-a-solid-block-on.patch rename to patches/server/0141-Option-for-chests-to-open-even-with-a-solid-block-on.patch index ddf27856b..aebc97114 100644 --- a/patches/server/0142-Option-for-chests-to-open-even-with-a-solid-block-on.patch +++ b/patches/server/0141-Option-for-chests-to-open-even-with-a-solid-block-on.patch @@ -17,7 +17,7 @@ index d980a556785b52fe827310b83638139df0816b11..3c8c02fc92374def12254f7ffad604b2 return world.getBlockState(blockposition1).isRedstoneConductor(world, blockposition1); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index e44328d3ac04512e79f1b1363e72bf5e82426782..aec89025473b9de9c5460cd4dc0bceeb24dcf345 100644 +index 316b0499c49924771d1361e35f3a4d2ce46a739b..b3fd2b88b84c16c77dd2dc7ca2331126c9174624 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -428,6 +428,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0143-Implement-TPSBar.patch b/patches/server/0142-Implement-TPSBar.patch similarity index 100% rename from patches/server/0143-Implement-TPSBar.patch rename to patches/server/0142-Implement-TPSBar.patch diff --git a/patches/server/0144-Striders-give-saddle-back.patch b/patches/server/0143-Striders-give-saddle-back.patch similarity index 96% rename from patches/server/0144-Striders-give-saddle-back.patch rename to patches/server/0143-Striders-give-saddle-back.patch index e5fd21ed5..f412ba1ac 100644 --- a/patches/server/0144-Striders-give-saddle-back.patch +++ b/patches/server/0143-Striders-give-saddle-back.patch @@ -28,7 +28,7 @@ index 9d314470361b2e17afdadc355c084254e5b03aff..66dab9b4e5ae05deeae11c8588a0b855 } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index aec89025473b9de9c5460cd4dc0bceeb24dcf345..4d978502c426c177a75b92a38b0ee03f38eeb697 100644 +index b3fd2b88b84c16c77dd2dc7ca2331126c9174624..8cdc3f0ff720aeb613b32e03b910aeda06ea916e 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -1552,6 +1552,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0145-PlayerBookTooLargeEvent.patch b/patches/server/0144-PlayerBookTooLargeEvent.patch similarity index 96% rename from patches/server/0145-PlayerBookTooLargeEvent.patch rename to patches/server/0144-PlayerBookTooLargeEvent.patch index c472ab3a9..a019ee8fb 100644 --- a/patches/server/0145-PlayerBookTooLargeEvent.patch +++ b/patches/server/0144-PlayerBookTooLargeEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] PlayerBookTooLargeEvent diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index c1f322910d66c6d7961b33840a761a2e8f7a0424..844f76a712bec16fb7dea19fa27f45970bc61773 100644 +index a1687fe41480048a1d98fda8c5b704d874c47708..76c6b0c9b585879d63a232f6633ffd7c72656d0a 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1122,10 +1122,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0146-Full-netherite-armor-grants-fire-resistance.patch b/patches/server/0145-Full-netherite-armor-grants-fire-resistance.patch similarity index 94% rename from patches/server/0146-Full-netherite-armor-grants-fire-resistance.patch rename to patches/server/0145-Full-netherite-armor-grants-fire-resistance.patch index 1369425a6..2e818ff16 100644 --- a/patches/server/0146-Full-netherite-armor-grants-fire-resistance.patch +++ b/patches/server/0145-Full-netherite-armor-grants-fire-resistance.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Full netherite armor grants fire resistance diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index fab14cd3148cb81a343b7b1fb4f94da977dba763..6301f71df9573f91040934c85a8530f2cf2bfdad 100644 +index d57a1984328750f5a6db748ef2db21fb3e2dff00..656b62c93dcbe15a79ebe684c18f4dc31ddc0dbe 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -360,6 +360,16 @@ public abstract class Player extends LivingEntity { @@ -26,7 +26,7 @@ index fab14cd3148cb81a343b7b1fb4f94da977dba763..6301f71df9573f91040934c85a8530f2 protected ItemCooldowns createItemCooldowns() { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 4d978502c426c177a75b92a38b0ee03f38eeb697..5aa1ecf7f9ae3b3ef6157e925bf8e0c750fedea4 100644 +index 8cdc3f0ff720aeb613b32e03b910aeda06ea916e..18142fa6aa364fa228d3b5baa4b36a07db44deff 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -265,6 +265,19 @@ public class PurpurWorldConfig { diff --git a/patches/server/0147-Fix-rotating-UP-DOWN-CW-and-CCW.patch b/patches/server/0146-Fix-rotating-UP-DOWN-CW-and-CCW.patch similarity index 100% rename from patches/server/0147-Fix-rotating-UP-DOWN-CW-and-CCW.patch rename to patches/server/0146-Fix-rotating-UP-DOWN-CW-and-CCW.patch diff --git a/patches/server/0148-Add-MC-4-fix-back.patch b/patches/server/0147-Add-MC-4-fix-back.patch similarity index 100% rename from patches/server/0148-Add-MC-4-fix-back.patch rename to patches/server/0147-Add-MC-4-fix-back.patch diff --git a/patches/server/0149-Add-mobGriefing-bypass-to-everything-affected.patch b/patches/server/0148-Add-mobGriefing-bypass-to-everything-affected.patch similarity index 99% rename from patches/server/0149-Add-mobGriefing-bypass-to-everything-affected.patch rename to patches/server/0148-Add-mobGriefing-bypass-to-everything-affected.patch index 656d098b4..4298f7e89 100644 --- a/patches/server/0149-Add-mobGriefing-bypass-to-everything-affected.patch +++ b/patches/server/0148-Add-mobGriefing-bypass-to-everything-affected.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add mobGriefing bypass to everything affected diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 49ecb743320aa3bfba2cd38f25ca5a37b38efe1f..9b6cfd16a15c176b144302b5c38408b88969fa50 100644 +index b909eeba0539ab133e274a15b0b479b5546fc903..11abf0df677a9d609d82cbcb8e3967fc4b613362 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1681,7 +1681,7 @@ public abstract class LivingEntity extends Entity { @@ -144,7 +144,7 @@ index f637cd740ec3801ce1c387473b5c4ff6080e76ec..3247f3f3c9d53953f8268c8f95752751 // flag1 = this.level.a(blockposition, false) || flag1; flag1 = true; 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 5f24fb3fc4ffb2e032cf755d984716d1c3a3e965..232fe770b9befacc4d436a01139fe5fe46f92879 100644 +index ee13bdfb5cfc9992d26126804c0a0bb512c2eb1e..bdcbe92cbe431727f5879a04bf734811ffd03c3d 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 @@ -375,7 +375,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob @@ -393,7 +393,7 @@ index e98fc3c235f9160f1928a8afb0d7991a6d3430cb..db35f756b7adb6b113659ae13b08ab89 return true; // Purpur end diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 5aa1ecf7f9ae3b3ef6157e925bf8e0c750fedea4..315e24bc0ef9950f68260e2f5aefbe0b7d421a1b 100644 +index 18142fa6aa364fa228d3b5baa4b36a07db44deff..affb6ce2c48b3bfbf3ded132b794908660d55ebb 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -367,9 +367,12 @@ public class PurpurWorldConfig { @@ -680,7 +680,7 @@ index 5aa1ecf7f9ae3b3ef6157e925bf8e0c750fedea4..315e24bc0ef9950f68260e2f5aefbe0b } public boolean witherSkeletonRidable = false; -@@ -1837,6 +1883,7 @@ public class PurpurWorldConfig { +@@ -1835,6 +1881,7 @@ public class PurpurWorldConfig { public boolean zombieJockeyTryExistingChickens = true; public boolean zombieAggressiveTowardsVillagerWhenLagging = true; public Difficulty zombieBreakDoorMinDifficulty = Difficulty.HARD; @@ -688,7 +688,7 @@ index 5aa1ecf7f9ae3b3ef6157e925bf8e0c750fedea4..315e24bc0ef9950f68260e2f5aefbe0b private void zombieSettings() { zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable); zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater); -@@ -1856,6 +1903,7 @@ public class PurpurWorldConfig { +@@ -1854,6 +1901,7 @@ public class PurpurWorldConfig { } catch (IllegalArgumentException ignore) { zombieBreakDoorMinDifficulty = Difficulty.HARD; } diff --git a/patches/server/0150-Config-to-allow-Note-Block-sounds-when-blocked.patch b/patches/server/0149-Config-to-allow-Note-Block-sounds-when-blocked.patch similarity index 97% rename from patches/server/0150-Config-to-allow-Note-Block-sounds-when-blocked.patch rename to patches/server/0149-Config-to-allow-Note-Block-sounds-when-blocked.patch index a187bde0d..888508513 100644 --- a/patches/server/0150-Config-to-allow-Note-Block-sounds-when-blocked.patch +++ b/patches/server/0149-Config-to-allow-Note-Block-sounds-when-blocked.patch @@ -22,7 +22,7 @@ index d3c8fd8399629efb8bcbaf7d9a0c43340fcdfeda..c74df3b5c2a25469ad3fb6a853438bbc org.bukkit.event.block.NotePlayEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callNotePlayEvent(world, blockposition, data.getValue(NoteBlock.INSTRUMENT), data.getValue(NoteBlock.NOTE)); if (!event.isCancelled()) { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 315e24bc0ef9950f68260e2f5aefbe0b7d421a1b..393d3ce76b833044daa3f18670780b848b95e5c9 100644 +index affb6ce2c48b3bfbf3ded132b794908660d55ebb..d1ad1f384ae289dd516cbe27e611c66d70ba4853 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -370,6 +370,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0151-Add-EntityTeleportHinderedEvent.patch b/patches/server/0150-Add-EntityTeleportHinderedEvent.patch similarity index 99% rename from patches/server/0151-Add-EntityTeleportHinderedEvent.patch rename to patches/server/0150-Add-EntityTeleportHinderedEvent.patch index b0a3759b2..591b94159 100644 --- a/patches/server/0151-Add-EntityTeleportHinderedEvent.patch +++ b/patches/server/0150-Add-EntityTeleportHinderedEvent.patch @@ -78,7 +78,7 @@ index 09cbce5aec6eabfa220f7de81b492a180cb8ca1e..265770975ad1190283103b04cdd52a07 blockEntity.teleportCooldown = 100; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 393d3ce76b833044daa3f18670780b848b95e5c9..b967dfd7d675ed53a76fa743df0d3fbac1f414e8 100644 +index d1ad1f384ae289dd516cbe27e611c66d70ba4853..e1b8d150f952d2b80ad37caeb273f60c3553aa11 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -369,6 +369,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0152-Add-StructureGenerateEvent.patch b/patches/server/0151-Add-StructureGenerateEvent.patch similarity index 95% rename from patches/server/0152-Add-StructureGenerateEvent.patch rename to patches/server/0151-Add-StructureGenerateEvent.patch index 0f476504e..fa377a7f6 100644 --- a/patches/server/0152-Add-StructureGenerateEvent.patch +++ b/patches/server/0151-Add-StructureGenerateEvent.patch @@ -19,7 +19,7 @@ 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 c7636191fa2ba92db95a7f779d0e5a1bd45198aa..6cd66a4edbe2010d2a34506baf1ba6fe3de38bb9 100644 +index a5d7fdd9ec0342e000e467a002846873a10d75fc..f71cc1f5e5d594e82a4e6132d438bae74b9370a7 100644 --- a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java +++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java @@ -311,7 +311,14 @@ public abstract class ChunkGenerator { diff --git a/patches/server/0153-Farmland-trampling-changes.patch b/patches/server/0152-Farmland-trampling-changes.patch similarity index 94% rename from patches/server/0153-Farmland-trampling-changes.patch rename to patches/server/0152-Farmland-trampling-changes.patch index 1925ee554..a2f7f0aeb 100644 --- a/patches/server/0153-Farmland-trampling-changes.patch +++ b/patches/server/0152-Farmland-trampling-changes.patch @@ -12,7 +12,7 @@ necessary to trample in the first place. Feather Falling 1 requires you to fall over 3+ blocks to trample. FF 2 requires 4+, etc. diff --git a/src/main/java/net/minecraft/world/level/block/FarmBlock.java b/src/main/java/net/minecraft/world/level/block/FarmBlock.java -index 668724cfaf9f34fe057171b69213782a22f8013b..1d662162fbf8cf7afa5fac167f8bfee41a0060c0 100644 +index aad204181c4f54ee533bfe3fc04a8705b847e371..16eb80e7926cf4fe421c17d7d851d457a2bc0f5d 100644 --- a/src/main/java/net/minecraft/world/level/block/FarmBlock.java +++ b/src/main/java/net/minecraft/world/level/block/FarmBlock.java @@ -97,12 +97,20 @@ public class FarmBlock extends Block { @@ -37,7 +37,7 @@ index 668724cfaf9f34fe057171b69213782a22f8013b..1d662162fbf8cf7afa5fac167f8bfee4 if (CraftEventFactory.callEntityChangeBlockEvent(entity, pos, Blocks.DIRT.defaultBlockState()).isCancelled()) { return; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index b967dfd7d675ed53a76fa743df0d3fbac1f414e8..0e8af1daaffd7deaceb58d2298e5c0d027959822 100644 +index e1b8d150f952d2b80ad37caeb273f60c3553aa11..5c021c6aef21ff3534a4b6a95fd1c0d5ac2ea2c1 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -466,10 +466,16 @@ public class PurpurWorldConfig { diff --git a/patches/server/0154-Movement-options-for-armor-stands.patch b/patches/server/0153-Movement-options-for-armor-stands.patch similarity index 96% rename from patches/server/0154-Movement-options-for-armor-stands.patch rename to patches/server/0153-Movement-options-for-armor-stands.patch index 02cf934db..392ffc1ab 100644 --- a/patches/server/0154-Movement-options-for-armor-stands.patch +++ b/patches/server/0153-Movement-options-for-armor-stands.patch @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index b7b00d28f60350958dd0e92b755237c1f15040ec..60986fbef5d31ae59187d51b5686126f797d3970 100644 +index b106801e08d5a87eaaf115653cf57f58f45f5869..1ffbcac353fcb604ab41e3b4ed4f6555833c25ff 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1588,7 +1588,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n @@ -66,7 +66,7 @@ index 796ab61f4513c02b0d55d34044d2f7084c447796..d119f8ab447bc17deabc494463de4961 + // Purpur end } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 0e8af1daaffd7deaceb58d2298e5c0d027959822..b9a3df20b454699c3643b717ccc07de08366cba5 100644 +index 5c021c6aef21ff3534a4b6a95fd1c0d5ac2ea2c1..f4ce54d4078afc7c3a598dcdc8e4a19b3c68e246 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -101,10 +101,16 @@ public class PurpurWorldConfig { diff --git a/patches/server/0155-Fix-stuck-in-portals.patch b/patches/server/0154-Fix-stuck-in-portals.patch similarity index 94% rename from patches/server/0155-Fix-stuck-in-portals.patch rename to patches/server/0154-Fix-stuck-in-portals.patch index 5e4be70e8..42dbe33df 100644 --- a/patches/server/0155-Fix-stuck-in-portals.patch +++ b/patches/server/0154-Fix-stuck-in-portals.patch @@ -17,7 +17,7 @@ index b52cea07a77bd5124881e144483e148cbf5ad54d..4e8333d134b05bdf45356d14b974b8de // CraftBukkit end this.setLevel(worldserver); diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 60986fbef5d31ae59187d51b5686126f797d3970..3c0979e7031fb33257b5ec1efcb68882ab96efcd 100644 +index 1ffbcac353fcb604ab41e3b4ed4f6555833c25ff..7d7d5db8c8206a68ae3c241e2106af4582105f1a 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2698,12 +2698,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n @@ -37,7 +37,7 @@ index 60986fbef5d31ae59187d51b5686126f797d3970..3c0979e7031fb33257b5ec1efcb68882 this.isInsidePortal = true; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index b9a3df20b454699c3643b717ccc07de08366cba5..26f6b0f31cbbedb20ac7660726c5244c33685954 100644 +index f4ce54d4078afc7c3a598dcdc8e4a19b3c68e246..996f56d8b82fb35fec5c38da6fb99b171159ac7d 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -295,6 +295,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0156-Toggle-for-water-sensitive-mob-damage.patch b/patches/server/0155-Toggle-for-water-sensitive-mob-damage.patch similarity index 98% rename from patches/server/0156-Toggle-for-water-sensitive-mob-damage.patch rename to patches/server/0155-Toggle-for-water-sensitive-mob-damage.patch index 9c97b8819..fd4060aaf 100644 --- a/patches/server/0156-Toggle-for-water-sensitive-mob-damage.patch +++ b/patches/server/0155-Toggle-for-water-sensitive-mob-damage.patch @@ -70,7 +70,7 @@ index 66dab9b4e5ae05deeae11c8588a0b855d8847bdc..19753a1855b11f8cdc9fb77e8d9079bb @Override diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 26f6b0f31cbbedb20ac7660726c5244c33685954..157ebb6cb3bcaed9303dd1919d2335cca3df3b48 100644 +index 996f56d8b82fb35fec5c38da6fb99b171159ac7d..ffd709328dfeac55e7afde6f48d391a616d94ec3 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -633,6 +633,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0157-Config-to-always-tame-in-Creative.patch b/patches/server/0156-Config-to-always-tame-in-Creative.patch similarity index 98% rename from patches/server/0157-Config-to-always-tame-in-Creative.patch rename to patches/server/0156-Config-to-always-tame-in-Creative.patch index 3f9eae99e..b8e7c3ad4 100644 --- a/patches/server/0157-Config-to-always-tame-in-Creative.patch +++ b/patches/server/0156-Config-to-always-tame-in-Creative.patch @@ -59,7 +59,7 @@ index 518dd0e6b4889c049e438b393baa795a5eac3e7d..21e154c4e7fe261a41c891b481072fbd this.navigation.stop(); this.setTarget((LivingEntity) null); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 157ebb6cb3bcaed9303dd1919d2335cca3df3b48..7efc52e632fb578b0f8f6fa57d45ad7619033e6e 100644 +index ffd709328dfeac55e7afde6f48d391a616d94ec3..7caf038c6465b5a7fb87eeb93df572f4ff7f0032 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -371,6 +371,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0158-End-crystal-explosion-options.patch b/patches/server/0157-End-crystal-explosion-options.patch similarity index 98% rename from patches/server/0158-End-crystal-explosion-options.patch rename to patches/server/0157-End-crystal-explosion-options.patch index 4624c8903..ccbe58167 100644 --- a/patches/server/0158-End-crystal-explosion-options.patch +++ b/patches/server/0157-End-crystal-explosion-options.patch @@ -52,7 +52,7 @@ index 92e65f3fbc8f5d77bb8cc31e7a7780c2589f4227..0c46507ab0b904fb1f79bc5421c88c03 this.onDestroyedBy(source); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 7efc52e632fb578b0f8f6fa57d45ad7619033e6e..e750f39abaed75443004208a9c48b7d4a08901c1 100644 +index 7caf038c6465b5a7fb87eeb93df572f4ff7f0032..085c3cb53b2a2fb9de748f0516ddc5e64f586537 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -473,6 +473,35 @@ public class PurpurWorldConfig { diff --git a/patches/server/0159-Add-unsafe-Entity-serialization-API.patch b/patches/server/0158-Add-unsafe-Entity-serialization-API.patch similarity index 100% rename from patches/server/0159-Add-unsafe-Entity-serialization-API.patch rename to patches/server/0158-Add-unsafe-Entity-serialization-API.patch diff --git a/patches/server/0160-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch b/patches/server/0159-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch similarity index 95% rename from patches/server/0160-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch rename to patches/server/0159-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch index 331eb0828..92cb4d5d0 100644 --- a/patches/server/0160-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch +++ b/patches/server/0159-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch @@ -17,7 +17,7 @@ index 3247f3f3c9d53953f8268c8f9575275126cf33a3..dd9655f29c397d3df15685f2901e1f23 } 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 232fe770b9befacc4d436a01139fe5fe46f92879..e8c9e5dc96658f2c3028da58eb3982e98cb1f28c 100644 +index bdcbe92cbe431727f5879a04bf734811ffd03c3d..257a1b91c65d9f66173cfe8a31f598a0adfd04a8 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 @@ -717,6 +717,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob @@ -29,7 +29,7 @@ index 232fe770b9befacc4d436a01139fe5fe46f92879..e8c9e5dc96658f2c3028da58eb3982e9 } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index e750f39abaed75443004208a9c48b7d4a08901c1..0b1f0a4530ffda4fd4e2b7f7b4487f7c0e466476 100644 +index 085c3cb53b2a2fb9de748f0516ddc5e64f586537..5662726d87e6a13f36afc161a7f98bbefb12c91c 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -868,6 +868,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0161-Dont-run-with-scissors.patch b/patches/server/0160-Dont-run-with-scissors.patch similarity index 95% rename from patches/server/0161-Dont-run-with-scissors.patch rename to patches/server/0160-Dont-run-with-scissors.patch index 9779e17ca..e7d66d0fe 100644 --- a/patches/server/0161-Dont-run-with-scissors.patch +++ b/patches/server/0160-Dont-run-with-scissors.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Dont run with scissors! diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 844f76a712bec16fb7dea19fa27f45970bc61773..8581edaa5512c6b85229308761d5930aeafc3386 100644 +index 76c6b0c9b585879d63a232f6633ffd7c72656d0a..600950663c20a096e0923341dbd733babf941ba0 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1555,6 +1555,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser @@ -43,7 +43,7 @@ index 00a5c65439a30499156a10b1822760fe48ee7776..3b68981645eb70df8828d437411564e8 public static int seedFeatureBamboo = -1; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 0b1f0a4530ffda4fd4e2b7f7b4487f7c0e466476..eb536735310a3d2fe8adb65b0aed543a5d6f6add 100644 +index 5662726d87e6a13f36afc161a7f98bbefb12c91c..75c093efea8f0c8188722065421abb702691a214 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -155,6 +155,8 @@ public class PurpurWorldConfig { diff --git a/patches/server/0162-One-Punch-Man.patch b/patches/server/0161-One-Punch-Man.patch similarity index 93% rename from patches/server/0162-One-Punch-Man.patch rename to patches/server/0161-One-Punch-Man.patch index e74469096..3de7455f2 100644 --- a/patches/server/0162-One-Punch-Man.patch +++ b/patches/server/0161-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 9b6cfd16a15c176b144302b5c38408b88969fa50..9bf5d9c2ff3a5d3383f604151895f6182366c940 100644 +index 11abf0df677a9d609d82cbcb8e3967fc4b613362..59e4e240420a11b19b6da199092590ebe9096383 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 9b6cfd16a15c176b144302b5c38408b88969fa50..9bf5d9c2ff3a5d3383f604151895f618 if (human) { // PAIL: Be sure to drag all this code from the EntityHuman subclass each update. diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index eb536735310a3d2fe8adb65b0aed543a5d6f6add..32c1fc2af8aeccf9683daf776e33b09fa8fe1a28 100644 +index 75c093efea8f0c8188722065421abb702691a214..871b37dba9ee7c77977e1ac5f00404d9b0b78149 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -300,6 +300,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0163-Add-config-for-snow-on-blue-ice.patch b/patches/server/0162-Add-config-for-snow-on-blue-ice.patch similarity index 96% rename from patches/server/0163-Add-config-for-snow-on-blue-ice.patch rename to patches/server/0162-Add-config-for-snow-on-blue-ice.patch index 83405583b..86a2cb8d7 100644 --- a/patches/server/0163-Add-config-for-snow-on-blue-ice.patch +++ b/patches/server/0162-Add-config-for-snow-on-blue-ice.patch @@ -29,7 +29,7 @@ index 0169d874247a96c2e10a65ecb9c0c093f5a6ecfb..b760e2d014b3ae70671878082bb853b7 @Override diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 32c1fc2af8aeccf9683daf776e33b09fa8fe1a28..ec3fe1fabf1a6b07f3bfe95628702b7fb12185ad 100644 +index 871b37dba9ee7c77977e1ac5f00404d9b0b78149..7422229fbe1acd1401b423cd05a2e2d17638386f 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -534,6 +534,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0164-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch b/patches/server/0163-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch similarity index 98% rename from patches/server/0164-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch rename to patches/server/0163-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch index 2e18316f1..3ece01097 100644 --- a/patches/server/0164-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch +++ b/patches/server/0163-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/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index ec3fe1fabf1a6b07f3bfe95628702b7fb12185ad..53a9ee123387c0ce33d49c3ebcc366088a61fb2f 100644 +index 7422229fbe1acd1401b423cd05a2e2d17638386f..decb199d59c0e364ead5c13103dc9d74351eea72 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -157,6 +157,10 @@ public class PurpurWorldConfig { diff --git a/patches/server/0165-Config-to-ignore-nearby-mobs-when-sleeping.patch b/patches/server/0164-Config-to-ignore-nearby-mobs-when-sleeping.patch similarity index 92% rename from patches/server/0165-Config-to-ignore-nearby-mobs-when-sleeping.patch rename to patches/server/0164-Config-to-ignore-nearby-mobs-when-sleeping.patch index 6c8a05c55..fc588fda0 100644 --- a/patches/server/0165-Config-to-ignore-nearby-mobs-when-sleeping.patch +++ b/patches/server/0164-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 6e9d011dd855a5fcb9fb603751a1dff434db7fe0..9ce5a27dabb59104d35e7dffb9950b2dfd98611e 100644 +index 4e8333d134b05bdf45356d14b974b8de013cb6d2..19b60f312e5e843964e9549b67109d1b285908ad 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1300,7 +1300,7 @@ public class ServerPlayer extends Player { @@ -18,7 +18,7 @@ index 6e9d011dd855a5fcb9fb603751a1dff434db7fe0..9ce5a27dabb59104d35e7dffb9950b2d } } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 53a9ee123387c0ce33d49c3ebcc366088a61fb2f..5d3b592ea596717101f791222ca2520e0dd4cf06 100644 +index decb199d59c0e364ead5c13103dc9d74351eea72..b0ed6ce12254c9a0b71f9fe0cb2ed4edbe662376 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -309,6 +309,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0166-Add-back-player-spawned-endermite-API.patch b/patches/server/0165-Add-back-player-spawned-endermite-API.patch similarity index 100% rename from patches/server/0166-Add-back-player-spawned-endermite-API.patch rename to patches/server/0165-Add-back-player-spawned-endermite-API.patch diff --git a/patches/server/0167-Config-Enderman-aggressiveness-towards-Endermites.patch b/patches/server/0166-Config-Enderman-aggressiveness-towards-Endermites.patch similarity index 97% rename from patches/server/0167-Config-Enderman-aggressiveness-towards-Endermites.patch rename to patches/server/0166-Config-Enderman-aggressiveness-towards-Endermites.patch index 8615efb43..bb5a26cda 100644 --- a/patches/server/0167-Config-Enderman-aggressiveness-towards-Endermites.patch +++ b/patches/server/0166-Config-Enderman-aggressiveness-towards-Endermites.patch @@ -18,7 +18,7 @@ index 3907b7cb559dabdd3cc347678d42071215c66a6c..e8779b23b5e1a399dde19fc66d820101 } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 5d3b592ea596717101f791222ca2520e0dd4cf06..64024cfdd153dd0aa2cd095dd3c30172609f9bce 100644 +index b0ed6ce12254c9a0b71f9fe0cb2ed4edbe662376..0ccadc664bf2a763609b5a36d87f4153cb812e2e 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -916,6 +916,8 @@ public class PurpurWorldConfig { diff --git a/patches/server/0168-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch b/patches/server/0167-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch similarity index 96% rename from patches/server/0168-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch rename to patches/server/0167-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch index 49598e7de..4f97216c4 100644 --- a/patches/server/0168-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch +++ b/patches/server/0167-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch @@ -20,7 +20,7 @@ index e8779b23b5e1a399dde19fc66d820101d61f36bc..ba61f78874d8578b862f317fe00a3162 } else { Vec3 vec3d = player.getViewVector(1.0F).normalize(); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 64024cfdd153dd0aa2cd095dd3c30172609f9bce..4f4b0900b89662b2424b55b0b00354f451dcd19f 100644 +index 0ccadc664bf2a763609b5a36d87f4153cb812e2e..d7a22605ef8e3954ec5c6a60d5aae8404779977c 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -918,6 +918,8 @@ public class PurpurWorldConfig { diff --git a/patches/server/0169-Tick-fluids-config.patch b/patches/server/0168-Tick-fluids-config.patch similarity index 97% rename from patches/server/0169-Tick-fluids-config.patch rename to patches/server/0168-Tick-fluids-config.patch index 8debcc9fd..929976d89 100644 --- a/patches/server/0169-Tick-fluids-config.patch +++ b/patches/server/0168-Tick-fluids-config.patch @@ -36,7 +36,7 @@ index 087601ffdeea97ec4cbb9959607bdcbcbae7c6fa..ad24daa0c727df15dbe0549036290a6c } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 4f4b0900b89662b2424b55b0b00354f451dcd19f..97e52c23492755044cc14e40f149f5bbab5e2b93 100644 +index d7a22605ef8e3954ec5c6a60d5aae8404779977c..4b659deab12bf01c3a13e042cdf31748dca2a991 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -400,6 +400,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0170-Config-to-disable-Llama-caravans.patch b/patches/server/0169-Config-to-disable-Llama-caravans.patch similarity index 97% rename from patches/server/0170-Config-to-disable-Llama-caravans.patch rename to patches/server/0169-Config-to-disable-Llama-caravans.patch index 3ceb27561..a17d3cc54 100644 --- a/patches/server/0170-Config-to-disable-Llama-caravans.patch +++ b/patches/server/0169-Config-to-disable-Llama-caravans.patch @@ -32,7 +32,7 @@ index 93a05b945ac248df0ea7a0b9d7264a9c129c3bcf..8f12851f220bb23102f52f523a4c5d98 this.caravanHead.caravanTail = this; } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 97e52c23492755044cc14e40f149f5bbab5e2b93..491bd562ba8eb55634047857df98b7aa73f3e743 100644 +index 4b659deab12bf01c3a13e042cdf31748dca2a991..63036ee73e01439d5c5317e8e269323aaa80ec81 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -1184,6 +1184,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0171-Config-to-make-Creepers-explode-on-death.patch b/patches/server/0170-Config-to-make-Creepers-explode-on-death.patch similarity index 97% rename from patches/server/0171-Config-to-make-Creepers-explode-on-death.patch rename to patches/server/0170-Config-to-make-Creepers-explode-on-death.patch index 19779248e..8b089ef7c 100644 --- a/patches/server/0171-Config-to-make-Creepers-explode-on-death.patch +++ b/patches/server/0170-Config-to-make-Creepers-explode-on-death.patch @@ -50,7 +50,7 @@ index c550b8c19837ed9bf730a3eb777bc00de4e7ceb2..02494dcc8a342f65b2855612aebeb019 private void spawnLingeringCloud() { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 491bd562ba8eb55634047857df98b7aa73f3e743..6c0159cb30850967b0dadf948ad1cdebcca3cfb3 100644 +index 63036ee73e01439d5c5317e8e269323aaa80ec81..99ec71be96ebb9d3bbdbc79fbab207b8da66b24d 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -791,6 +791,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0172-Configurable-ravager-griefable-blocks-list.patch b/patches/server/0171-Configurable-ravager-griefable-blocks-list.patch similarity index 98% rename from patches/server/0172-Configurable-ravager-griefable-blocks-list.patch rename to patches/server/0171-Configurable-ravager-griefable-blocks-list.patch index 25a0bd805..dfccd8c26 100644 --- a/patches/server/0172-Configurable-ravager-griefable-blocks-list.patch +++ b/patches/server/0171-Configurable-ravager-griefable-blocks-list.patch @@ -31,7 +31,7 @@ index 3c51e6d419a244b9270119590aa299527163c331..b466b0430dd94777975a1e7ab9792166 } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 6c0159cb30850967b0dadf948ad1cdebcca3cfb3..5d88c7b57ddc05ef7a84c3f0075cca87c61bb14b 100644 +index 99ec71be96ebb9d3bbdbc79fbab207b8da66b24d..a21d60951a6d307524c0d1cf5526fc1d1775bbb8 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -1494,6 +1494,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0173-Sneak-to-bulk-process-composter.patch b/patches/server/0172-Sneak-to-bulk-process-composter.patch similarity index 97% rename from patches/server/0173-Sneak-to-bulk-process-composter.patch rename to patches/server/0172-Sneak-to-bulk-process-composter.patch index 5dad32b11..b9041f3c3 100644 --- a/patches/server/0173-Sneak-to-bulk-process-composter.patch +++ b/patches/server/0172-Sneak-to-bulk-process-composter.patch @@ -62,7 +62,7 @@ index 4c9ae6bdb2f0358798f84928271a2d783dcba7b4..47bf769a031ae39cc72d2191195d1378 int i = (Integer) iblockdata.getValue(ComposterBlock.LEVEL); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 5d88c7b57ddc05ef7a84c3f0075cca87c61bb14b..6c3f0f2e53d32959bef2f41571d6171760abb2e7 100644 +index a21d60951a6d307524c0d1cf5526fc1d1775bbb8..062b0e4d2e442eca84eebe9334943dc0f2ded580 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -484,6 +484,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0174-Config-for-skipping-night.patch b/patches/server/0173-Config-for-skipping-night.patch similarity index 96% rename from patches/server/0174-Config-for-skipping-night.patch rename to patches/server/0173-Config-for-skipping-night.patch index f0ef5e970..7aeb61c54 100644 --- a/patches/server/0174-Config-for-skipping-night.patch +++ b/patches/server/0173-Config-for-skipping-night.patch @@ -18,7 +18,7 @@ index f15da84c0e5f9ab67c4d9ec59ee37de35df76f5c..bd32872ef404f90a078e02ec434cac54 long l = this.levelData.getDayTime() + 24000L; TimeSkipEvent event = new TimeSkipEvent(this.getWorld(), TimeSkipEvent.SkipReason.NIGHT_SKIP, (l - l % 24000L) - this.getDayTime()); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 6c3f0f2e53d32959bef2f41571d6171760abb2e7..a89dca8d44d9d005caaab060aa9e0e04ba51462e 100644 +index 062b0e4d2e442eca84eebe9334943dc0f2ded580..f204e37af958cf2319269290c4bafeae6631d677 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -310,6 +310,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0175-Add-config-for-villager-trading.patch b/patches/server/0174-Add-config-for-villager-trading.patch similarity index 95% rename from patches/server/0175-Add-config-for-villager-trading.patch rename to patches/server/0174-Add-config-for-villager-trading.patch index 0020c0d4e..0ae40a2d6 100644 --- a/patches/server/0175-Add-config-for-villager-trading.patch +++ b/patches/server/0174-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 1cc8349d08ab6877a15075cf71236b7ae07314cc..fd5c077628733365527f339efc96f0a8620b8e1a 100644 +index 30961a60449a20c4168c4b0a593402df3066379d..4df6a5cf1a2fb00e77814307b52f45a1dae49a58 100644 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java @@ -375,7 +375,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler @@ -31,7 +31,7 @@ index c48935d35a6141c41db22e3ec172d5994fd317a2..fa4644c11cbb252734a6f5dc21c861d2 this.openTradingScreen(player, this.getDisplayName(), 1); } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index a89dca8d44d9d005caaab060aa9e0e04ba51462e..7c796c99076f510533462d46122b41a3b4128945 100644 +index f204e37af958cf2319269290c4bafeae6631d677..7fabd86e2013e58ede9b1100ea7a1c5dee413e1b 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -1838,6 +1838,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0176-Allow-infinity-on-crossbows.patch b/patches/server/0175-Allow-infinity-on-crossbows.patch similarity index 100% rename from patches/server/0176-Allow-infinity-on-crossbows.patch rename to patches/server/0175-Allow-infinity-on-crossbows.patch diff --git a/patches/server/0177-Drowning-Settings.patch b/patches/server/0176-Drowning-Settings.patch similarity index 91% rename from patches/server/0177-Drowning-Settings.patch rename to patches/server/0176-Drowning-Settings.patch index d9bf74bdf..2f496fa09 100644 --- a/patches/server/0177-Drowning-Settings.patch +++ b/patches/server/0176-Drowning-Settings.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Drowning Settings diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 3c0979e7031fb33257b5ec1efcb68882ab96efcd..cc00c159e672f9a1bfb72c3e6b6b94fa6e53045f 100644 +index 7d7d5db8c8206a68ae3c241e2106af4582105f1a..9d632b7d45ab8f61601107db6a8f4745ec131289 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2932,7 +2932,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n @@ -18,7 +18,7 @@ index 3c0979e7031fb33257b5ec1efcb68882ab96efcd..cc00c159e672f9a1bfb72c3e6b6b94fa 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 4dd6b5745ca42a067f00d2fc24056e97b242a5f7..784124b31d273f0eecb2798b6758bb4eda880544 100644 +index 59e4e240420a11b19b6da199092590ebe9096383..f6fa7ff3f896dca5e3b5cc5f7836f4208b0ec8b6 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -425,7 +425,7 @@ public abstract class LivingEntity extends Entity { @@ -40,7 +40,7 @@ index 4dd6b5745ca42a067f00d2fc24056e97b242a5f7..784124b31d273f0eecb2798b6758bb4e } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 7c796c99076f510533462d46122b41a3b4128945..ab723a14cc1f0db42a4f5d34674e27cee6f5702f 100644 +index 7fabd86e2013e58ede9b1100ea7a1c5dee413e1b..23988159bbe135a2152adc6fd7844d597ced5401 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -120,6 +120,15 @@ public class PurpurWorldConfig { diff --git a/patches/server/0178-Break-individual-slabs-when-sneaking.patch b/patches/server/0177-Break-individual-slabs-when-sneaking.patch similarity index 97% rename from patches/server/0178-Break-individual-slabs-when-sneaking.patch rename to patches/server/0177-Break-individual-slabs-when-sneaking.patch index 9d4e66c80..20f9da483 100644 --- a/patches/server/0178-Break-individual-slabs-when-sneaking.patch +++ b/patches/server/0177-Break-individual-slabs-when-sneaking.patch @@ -47,7 +47,7 @@ index eb7f8907bb362c0461194bbaf62917ce71c669f3..89f5e0d26500f1806dff9f91390546cd + // Purpur end } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index ab723a14cc1f0db42a4f5d34674e27cee6f5702f..34728bb981d39067537c7eb73024e72c2274bb6c 100644 +index 23988159bbe135a2152adc6fd7844d597ced5401..550fa310e76c4625ea0aa3746ed9dae3fc82a0da 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -611,6 +611,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0179-Config-to-disable-hostile-mob-spawn-on-ice.patch b/patches/server/0178-Config-to-disable-hostile-mob-spawn-on-ice.patch similarity index 95% rename from patches/server/0179-Config-to-disable-hostile-mob-spawn-on-ice.patch rename to patches/server/0178-Config-to-disable-hostile-mob-spawn-on-ice.patch index 41054e9f7..2770d5670 100644 --- a/patches/server/0179-Config-to-disable-hostile-mob-spawn-on-ice.patch +++ b/patches/server/0178-Config-to-disable-hostile-mob-spawn-on-ice.patch @@ -22,7 +22,7 @@ index fc34cfa8bfb3b82a8e1b28d261f0e901d837467e..35d47bb0d8c4a2b8374564133f040899 return false; } else { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 34728bb981d39067537c7eb73024e72c2274bb6c..4ae7478bc2525f4d0867abbda1de7b0e56b2edf9 100644 +index 550fa310e76c4625ea0aa3746ed9dae3fc82a0da..c29689c82dc13c3db9f3d0cd74c052673d75fca9 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -563,8 +563,12 @@ public class PurpurWorldConfig { diff --git a/patches/server/0180-Config-to-show-Armor-Stand-arms-on-spawn.patch b/patches/server/0179-Config-to-show-Armor-Stand-arms-on-spawn.patch similarity index 96% rename from patches/server/0180-Config-to-show-Armor-Stand-arms-on-spawn.patch rename to patches/server/0179-Config-to-show-Armor-Stand-arms-on-spawn.patch index a4c9c629b..84c5389a6 100644 --- a/patches/server/0180-Config-to-show-Armor-Stand-arms-on-spawn.patch +++ b/patches/server/0179-Config-to-show-Armor-Stand-arms-on-spawn.patch @@ -17,7 +17,7 @@ index d119f8ab447bc17deabc494463de496161c9b126..c9a44a4765f43b9c0247ed1005f4c134 public ArmorStand(Level world, double x, double y, double z) { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 4ae7478bc2525f4d0867abbda1de7b0e56b2edf9..d06a85856381f1290d53d1c74bc4c8af45b80662 100644 +index c29689c82dc13c3db9f3d0cd74c052673d75fca9..933da8c8404b1d20faff4d2f0c9ff2ad6831d0d8 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -104,6 +104,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0181-Option-to-make-doors-require-redstone.patch b/patches/server/0180-Option-to-make-doors-require-redstone.patch similarity index 98% rename from patches/server/0181-Option-to-make-doors-require-redstone.patch rename to patches/server/0180-Option-to-make-doors-require-redstone.patch index 89c008d81..a62d56cc9 100644 --- a/patches/server/0181-Option-to-make-doors-require-redstone.patch +++ b/patches/server/0180-Option-to-make-doors-require-redstone.patch @@ -67,7 +67,7 @@ index c903a1a8d2234bb0fa354d1c44ff3ab2275b04c7..d01e4064a772710c1383927e0848b9b3 + // Purpur end } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index d06a85856381f1290d53d1c74bc4c8af45b80662..30188b683f1ed9f71180930b7920b83dea1584c8 100644 +index 933da8c8404b1d20faff4d2f0c9ff2ad6831d0d8..12fe94c1deb42dacf5590412d88eda7321c06831 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -509,6 +509,16 @@ public class PurpurWorldConfig { diff --git a/patches/server/0182-Config-to-allow-for-unsafe-enchants.patch b/patches/server/0181-Config-to-allow-for-unsafe-enchants.patch similarity index 100% rename from patches/server/0182-Config-to-allow-for-unsafe-enchants.patch rename to patches/server/0181-Config-to-allow-for-unsafe-enchants.patch diff --git a/patches/server/0183-Configurable-sponge-absorption.patch b/patches/server/0182-Configurable-sponge-absorption.patch similarity index 97% rename from patches/server/0183-Configurable-sponge-absorption.patch rename to patches/server/0182-Configurable-sponge-absorption.patch index 2abcde6e8..5b1b812f9 100644 --- a/patches/server/0183-Configurable-sponge-absorption.patch +++ b/patches/server/0182-Configurable-sponge-absorption.patch @@ -43,7 +43,7 @@ index 1ef8eadd4e59f2e5d2bbd84f6f9bcf37b59db5bd..5b10e1110f938745c8f9ed0b55960566 } } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 30188b683f1ed9f71180930b7920b83dea1584c8..fd356e3431a3be4992442d9cb71a467d5a521413 100644 +index 12fe94c1deb42dacf5590412d88eda7321c06831..67086a7dc17f544b0b60721f9d685a60a79b97ad 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -637,6 +637,13 @@ public class PurpurWorldConfig { diff --git a/patches/server/0184-Projectile-offset-config.patch b/patches/server/0183-Projectile-offset-config.patch similarity index 99% rename from patches/server/0184-Projectile-offset-config.patch rename to patches/server/0183-Projectile-offset-config.patch index 3d5edeb2b..518c9510b 100644 --- a/patches/server/0184-Projectile-offset-config.patch +++ b/patches/server/0183-Projectile-offset-config.patch @@ -96,7 +96,7 @@ index 3f53dc8f250ad3f7616ce7ef0a2353caa0ab1879..29130aa9673a3956030f3e43b784ac46 entitythrowntrident.pickup = AbstractArrow.Pickup.CREATIVE_ONLY; } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index fd356e3431a3be4992442d9cb71a467d5a521413..1d3fedefc7a6dfbb0182d8cad5341f8682b65cf8 100644 +index 67086a7dc17f544b0b60721f9d685a60a79b97ad..346a174ce8dd4dce864bb58ea52d0b3836a0c43b 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -374,6 +374,23 @@ public class PurpurWorldConfig { diff --git a/patches/server/0185-Config-for-powered-rail-activation-distance.patch b/patches/server/0184-Config-for-powered-rail-activation-distance.patch similarity index 94% rename from patches/server/0185-Config-for-powered-rail-activation-distance.patch rename to patches/server/0184-Config-for-powered-rail-activation-distance.patch index 0478cc2e3..50ad216ff 100644 --- a/patches/server/0185-Config-for-powered-rail-activation-distance.patch +++ b/patches/server/0184-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/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 1d3fedefc7a6dfbb0182d8cad5341f8682b65cf8..9df8de15eb37c248ad5240564ad4213ae9445a9e 100644 +index 346a174ce8dd4dce864bb58ea52d0b3836a0c43b..b5f4d9bbed18b0c411a9a105421f45904176900c 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -649,6 +649,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0186-Piglin-portal-spawn-modifier.patch b/patches/server/0185-Piglin-portal-spawn-modifier.patch similarity index 96% rename from patches/server/0186-Piglin-portal-spawn-modifier.patch rename to patches/server/0185-Piglin-portal-spawn-modifier.patch index 1a5dc48cc..b9ee60c00 100644 --- a/patches/server/0186-Piglin-portal-spawn-modifier.patch +++ b/patches/server/0185-Piglin-portal-spawn-modifier.patch @@ -31,7 +31,7 @@ index fef1027829c44957e23c0a121033bfb7640d06f0..c42349d0f6b0025525278295b36f4030 pos = pos.below(); } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 9df8de15eb37c248ad5240564ad4213ae9445a9e..b6964ab54d20fb6d5579db2e95cf4aaa5f563439 100644 +index b5f4d9bbed18b0c411a9a105421f45904176900c..1a7e9661db4ec6d7a12906decb91675738b0771f 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -1459,6 +1459,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0187-Config-to-change-max-number-of-bees.patch b/patches/server/0186-Config-to-change-max-number-of-bees.patch similarity index 100% rename from patches/server/0187-Config-to-change-max-number-of-bees.patch rename to patches/server/0186-Config-to-change-max-number-of-bees.patch diff --git a/patches/server/0188-Configurable-damage-settings-for-magma-blocks.patch b/patches/server/0187-Configurable-damage-settings-for-magma-blocks.patch similarity index 94% rename from patches/server/0188-Configurable-damage-settings-for-magma-blocks.patch rename to patches/server/0187-Configurable-damage-settings-for-magma-blocks.patch index 0ed97491d..e7249e9fe 100644 --- a/patches/server/0188-Configurable-damage-settings-for-magma-blocks.patch +++ b/patches/server/0187-Configurable-damage-settings-for-magma-blocks.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configurable damage settings for magma blocks diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index cc00c159e672f9a1bfb72c3e6b6b94fa6e53045f..eea15d795475b79994c1b6ba55e862399831f960 100644 +index 9d632b7d45ab8f61601107db6a8f4745ec131289..6972880a375c60d19c03e0988e9ab9f80041d451 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1001,7 +1001,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n @@ -31,7 +31,7 @@ index 5d844ed98b916298a657d5e9766ab7f383a304e0..0129460ce1ca199a47b6657f824c75fd entity.hurt(DamageSource.HOT_FLOOR, 1.0F); org.bukkit.craftbukkit.event.CraftEventFactory.blockDamage = null; // CraftBukkit diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index b6964ab54d20fb6d5579db2e95cf4aaa5f563439..8f0f033900531b8dfd625da9ad83c27bc0ac6d44 100644 +index 1a7e9661db4ec6d7a12906decb91675738b0771f..66e8f7ffc1d54f26f4feaa2aa6cddcc72cff848d 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -616,6 +616,13 @@ public class PurpurWorldConfig { diff --git a/patches/server/0189-Config-for-wither-explosion-radius.patch b/patches/server/0188-Config-for-wither-explosion-radius.patch similarity index 96% rename from patches/server/0189-Config-for-wither-explosion-radius.patch rename to patches/server/0188-Config-for-wither-explosion-radius.patch index 7f5134b35..b7b1bff38 100644 --- a/patches/server/0189-Config-for-wither-explosion-radius.patch +++ b/patches/server/0188-Config-for-wither-explosion-radius.patch @@ -18,7 +18,7 @@ index 430aa10101d9f21561155941ff24441fd0c4103a..de91f0dd7f9a62e5a96b4cc3e4f505ec if (!event.isCancelled()) { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 8f0f033900531b8dfd625da9ad83c27bc0ac6d44..2f7476a72575485836a154b81333cc092d22ab70 100644 +index 66e8f7ffc1d54f26f4feaa2aa6cddcc72cff848d..2a5dfae70bfc266e8a2530992b3668d3bf0823bd 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -1995,6 +1995,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0190-Gamemode-extra-permissions.patch b/patches/server/0189-Gamemode-extra-permissions.patch similarity index 98% rename from patches/server/0190-Gamemode-extra-permissions.patch rename to patches/server/0189-Gamemode-extra-permissions.patch index ddeb33f97..71b03cdb2 100644 --- a/patches/server/0190-Gamemode-extra-permissions.patch +++ b/patches/server/0189-Gamemode-extra-permissions.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Gamemode extra permissions diff --git a/src/main/java/net/minecraft/commands/CommandSourceStack.java b/src/main/java/net/minecraft/commands/CommandSourceStack.java -index f1ebfd810fd06e62d796110345aa36ce4a94e2fd..99f2fd5a91e2812338cc5f2d616015a28f2fbe1a 100644 +index d9e868b6c70da18b4ce23c80e2aaf347f2dc6d50..0fcb54f3a0eae8639931866c8c3d7e1ac8c11960 100644 --- a/src/main/java/net/minecraft/commands/CommandSourceStack.java +++ b/src/main/java/net/minecraft/commands/CommandSourceStack.java @@ -193,6 +193,21 @@ public class CommandSourceStack implements SharedSuggestionProvider, com.destroy diff --git a/patches/server/0191-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch b/patches/server/0190-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch similarity index 96% rename from patches/server/0191-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch rename to patches/server/0190-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch index 710a7f8bc..4fcead1a1 100644 --- a/patches/server/0191-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch +++ b/patches/server/0190-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/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 2f7476a72575485836a154b81333cc092d22ab70..86daa97595ea38e805dff72edc1b1af7b5289bcc 100644 +index 2a5dfae70bfc266e8a2530992b3668d3bf0823bd..67cc82cd96742b67c6a6137fe14d07d881b29282 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -391,6 +391,21 @@ public class PurpurWorldConfig { diff --git a/patches/server/0192-Configurable-piston-push-limit.patch b/patches/server/0191-Configurable-piston-push-limit.patch similarity index 96% rename from patches/server/0192-Configurable-piston-push-limit.patch rename to patches/server/0191-Configurable-piston-push-limit.patch index e10835704..3698e00b5 100644 --- a/patches/server/0192-Configurable-piston-push-limit.patch +++ b/patches/server/0191-Configurable-piston-push-limit.patch @@ -36,7 +36,7 @@ index 744d91546d1a810f60a43c15ed74b4158f341a4a..354538daefa603f6df5a139b6bff87db } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 86daa97595ea38e805dff72edc1b1af7b5289bcc..e40f396a176520d0fe1c6919ebb1fd319bc30dce 100644 +index 67cc82cd96742b67c6a6137fe14d07d881b29282..113dea1aae484361d14a6db59b49046a2caccfcf 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -638,6 +638,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0193-Configurable-broadcast-settings.patch b/patches/server/0192-Configurable-broadcast-settings.patch similarity index 97% rename from patches/server/0193-Configurable-broadcast-settings.patch rename to patches/server/0192-Configurable-broadcast-settings.patch index d6df80f9d..873011425 100644 --- a/patches/server/0193-Configurable-broadcast-settings.patch +++ b/patches/server/0192-Configurable-broadcast-settings.patch @@ -17,7 +17,7 @@ index c46df052a5a39d92688f51377ee1f7b5b5b36faa..d7d2a975386cecb0d50b4f7ed37de8ad // Paper end } diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 9ce5a27dabb59104d35e7dffb9950b2dfd98611e..33f41de3aabaee37dbd92ad17d8dc65a60fef427 100644 +index 19b60f312e5e843964e9549b67109d1b285908ad..6103b81f34e7f2c82a7f4be492888cc720c0e9eb 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -875,6 +875,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0194-Fix-SPIGOT-6278.patch b/patches/server/0193-Fix-SPIGOT-6278.patch similarity index 100% rename from patches/server/0194-Fix-SPIGOT-6278.patch rename to patches/server/0193-Fix-SPIGOT-6278.patch diff --git a/patches/server/0195-Configurable-mob-blindness.patch b/patches/server/0194-Configurable-mob-blindness.patch similarity index 93% rename from patches/server/0195-Configurable-mob-blindness.patch rename to patches/server/0194-Configurable-mob-blindness.patch index fa028c261..5d8350f2f 100644 --- a/patches/server/0195-Configurable-mob-blindness.patch +++ b/patches/server/0194-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 784124b31d273f0eecb2798b6758bb4eda880544..2ece26f762f9764db27bea60b63f2121d1fd4211 100644 +index f6fa7ff3f896dca5e3b5cc5f7836f4208b0ec8b6..dd88755ac380e5c85d5327d02bc3ec7e06355e49 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -992,6 +992,17 @@ public abstract class LivingEntity extends Entity { @@ -28,7 +28,7 @@ index 784124b31d273f0eecb2798b6758bb4eda880544..2ece26f762f9764db27bea60b63f2121 return d0; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index e40f396a176520d0fe1c6919ebb1fd319bc30dce..8824e8fe1abcecd48baf2fd9792eeba37086df94 100644 +index 113dea1aae484361d14a6db59b49046a2caccfcf..55add284c30bff33e0d5d9358f6da62aa1b861ff 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -446,6 +446,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0196-Hide-hidden-players-from-entity-selector.patch b/patches/server/0195-Hide-hidden-players-from-entity-selector.patch similarity index 100% rename from patches/server/0196-Hide-hidden-players-from-entity-selector.patch rename to patches/server/0195-Hide-hidden-players-from-entity-selector.patch diff --git a/patches/server/0197-Config-for-health-to-impact-Creeper-explosion-radius.patch b/patches/server/0196-Config-for-health-to-impact-Creeper-explosion-radius.patch similarity index 96% rename from patches/server/0197-Config-for-health-to-impact-Creeper-explosion-radius.patch rename to patches/server/0196-Config-for-health-to-impact-Creeper-explosion-radius.patch index 26756bdd1..f20554b54 100644 --- a/patches/server/0197-Config-for-health-to-impact-Creeper-explosion-radius.patch +++ b/patches/server/0196-Config-for-health-to-impact-Creeper-explosion-radius.patch @@ -21,7 +21,7 @@ index 02494dcc8a342f65b2855612aebeb019095abf65..d66c8866f3c6b1412a6c1876c62e3b29 if (!event.isCancelled()) { this.dead = true; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 8824e8fe1abcecd48baf2fd9792eeba37086df94..db42b5d941b047bb5d30923ead77ee7584774d06 100644 +index 55add284c30bff33e0d5d9358f6da62aa1b861ff..3f6514545818b023caf71f24bc7172247f8652f5 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -887,6 +887,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0198-Iron-golem-poppy-calms-anger.patch b/patches/server/0197-Iron-golem-poppy-calms-anger.patch similarity index 98% rename from patches/server/0198-Iron-golem-poppy-calms-anger.patch rename to patches/server/0197-Iron-golem-poppy-calms-anger.patch index ebea632ee..a423b65a2 100644 --- a/patches/server/0198-Iron-golem-poppy-calms-anger.patch +++ b/patches/server/0197-Iron-golem-poppy-calms-anger.patch @@ -17,7 +17,7 @@ index f4e983da7206923ee0b0f984e65a6c2b3a6a8aeb..cea3725009af1bc746a593c4db63ed63 this.goalSelector.addGoal(2, new MoveTowardsTargetGoal(this, 0.9D, 32.0F)); this.goalSelector.addGoal(2, new MoveBackToVillageGoal(this, 0.6D, false)); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index db42b5d941b047bb5d30923ead77ee7584774d06..1574291ad301fe27161740d72bbce87d8470217b 100644 +index 3f6514545818b023caf71f24bc7172247f8652f5..020d98471332d39e45e33c215e6c1586837d3b64 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -1262,6 +1262,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0199-Breedable-parrots.patch b/patches/server/0198-Breedable-parrots.patch similarity index 97% rename from patches/server/0199-Breedable-parrots.patch rename to patches/server/0198-Breedable-parrots.patch index 20c571bfb..1b162abfb 100644 --- a/patches/server/0199-Breedable-parrots.patch +++ b/patches/server/0198-Breedable-parrots.patch @@ -50,7 +50,7 @@ index 553b0aff0ccc5baf41d5faae1a2fd88249dd5a74..3da2b68fb03a80676d7a5eed271499f6 @Override diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 1574291ad301fe27161740d72bbce87d8470217b..76800bb7a317d63a77532dcb3fc01d19b22ce655 100644 +index 020d98471332d39e45e33c215e6c1586837d3b64..0cda0924ae6935b6a3ef7dd1ba5f469a1ce52b3f 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -1398,6 +1398,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0200-Configurable-powered-rail-boost-modifier.patch b/patches/server/0199-Configurable-powered-rail-boost-modifier.patch similarity index 96% rename from patches/server/0200-Configurable-powered-rail-boost-modifier.patch rename to patches/server/0199-Configurable-powered-rail-boost-modifier.patch index 27c27d361..847ab5f90 100644 --- a/patches/server/0200-Configurable-powered-rail-boost-modifier.patch +++ b/patches/server/0199-Configurable-powered-rail-boost-modifier.patch @@ -18,7 +18,7 @@ index 1e3077a22d9d3d26356b865001dcce81c9c1d7e5..cc57ff699d159a0cc748e91b61d53965 Vec3 vec3d5 = this.getDeltaMovement(); double d21 = vec3d5.x; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 76800bb7a317d63a77532dcb3fc01d19b22ce655..e2e2b7e7e6a734f3838021388f7d117b95df2625 100644 +index 0cda0924ae6935b6a3ef7dd1ba5f469a1ce52b3f..cf2d757132c3d2e29b08b105703f6f688d20075d 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -225,6 +225,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0201-Add-config-change-multiplier-critical-damage-value.patch b/patches/server/0200-Add-config-change-multiplier-critical-damage-value.patch similarity index 96% rename from patches/server/0201-Add-config-change-multiplier-critical-damage-value.patch rename to patches/server/0200-Add-config-change-multiplier-critical-damage-value.patch index 803c27daa..521f16726 100644 --- a/patches/server/0201-Add-config-change-multiplier-critical-damage-value.patch +++ b/patches/server/0200-Add-config-change-multiplier-critical-damage-value.patch @@ -18,7 +18,7 @@ index 656b62c93dcbe15a79ebe684c18f4dc31ddc0dbe..5963b407d936e930a370677113ba947d f += f1; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index e2e2b7e7e6a734f3838021388f7d117b95df2625..cea35e4b795c660c010a54834c26d4c73115d54d 100644 +index cf2d757132c3d2e29b08b105703f6f688d20075d..8668571450256c5c4833bac0ec278a110b794f24 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -324,6 +324,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0202-Option-to-disable-dragon-egg-teleporting.patch b/patches/server/0201-Option-to-disable-dragon-egg-teleporting.patch similarity index 94% rename from patches/server/0202-Option-to-disable-dragon-egg-teleporting.patch rename to patches/server/0201-Option-to-disable-dragon-egg-teleporting.patch index 55f19e970..b352985c8 100644 --- a/patches/server/0202-Option-to-disable-dragon-egg-teleporting.patch +++ b/patches/server/0201-Option-to-disable-dragon-egg-teleporting.patch @@ -17,7 +17,7 @@ index 78f51f3dd0e7249af69228479da932e9aea982d6..d9d4421f7f316281487828739168cfd6 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/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index cea35e4b795c660c010a54834c26d4c73115d54d..8955d05d414b232a9737b02d2330b93509241396 100644 +index 8668571450256c5c4833bac0ec278a110b794f24..94f4be463977ca8363e0ea0dfecf8a3ee807818d 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -557,6 +557,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0203-Config-for-unverified-username-message.patch b/patches/server/0202-Config-for-unverified-username-message.patch similarity index 97% rename from patches/server/0203-Config-for-unverified-username-message.patch rename to patches/server/0202-Config-for-unverified-username-message.patch index b99ab3890..131ba0ec4 100644 --- a/patches/server/0203-Config-for-unverified-username-message.patch +++ b/patches/server/0202-Config-for-unverified-username-message.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Config for unverified username message diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java -index 5d26417b5d4e182fdefdf1ef5c81a0b7d7f2d4c1..43090b05642d252fd5b3d4a65149beab2daf0ce9 100644 +index 45e77d96f673ce68cf15ce3d45fd1eeffed4d8d8..811b48e0b91e2af30a122b72803591e48519e6a9 100644 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java @@ -304,7 +304,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener diff --git a/patches/server/0204-Make-anvil-cumulative-cost-configurable.patch b/patches/server/0203-Make-anvil-cumulative-cost-configurable.patch similarity index 100% rename from patches/server/0204-Make-anvil-cumulative-cost-configurable.patch rename to patches/server/0203-Make-anvil-cumulative-cost-configurable.patch diff --git a/patches/server/0205-ShulkerBox-allow-oversized-stacks.patch b/patches/server/0204-ShulkerBox-allow-oversized-stacks.patch similarity index 97% rename from patches/server/0205-ShulkerBox-allow-oversized-stacks.patch rename to patches/server/0204-ShulkerBox-allow-oversized-stacks.patch index db5ff00ed..abc999a4d 100644 --- a/patches/server/0205-ShulkerBox-allow-oversized-stacks.patch +++ b/patches/server/0204-ShulkerBox-allow-oversized-stacks.patch @@ -35,7 +35,7 @@ index b9c558060024d380e89116489c7fc12ad88db8ad..0a0a4be15bed899812fcd4af0e311f5f CompoundTag compoundTag = shulkerBoxBlockEntity.saveToTag(new CompoundTag()); if (!compoundTag.isEmpty()) { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 8955d05d414b232a9737b02d2330b93509241396..9b7e5299a67fd4f58d107e8e96c76e49117b75fd 100644 +index 94f4be463977ca8363e0ea0dfecf8a3ee807818d..74ffbaa9f7e5756d3997270c9963dbed8cf36512 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -675,6 +675,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0206-Bee-can-work-when-raining-or-at-night.patch b/patches/server/0205-Bee-can-work-when-raining-or-at-night.patch similarity index 97% rename from patches/server/0206-Bee-can-work-when-raining-or-at-night.patch rename to patches/server/0205-Bee-can-work-when-raining-or-at-night.patch index c03645886..556cc41bd 100644 --- a/patches/server/0206-Bee-can-work-when-raining-or-at-night.patch +++ b/patches/server/0205-Bee-can-work-when-raining-or-at-night.patch @@ -31,7 +31,7 @@ index ffacc4b8cc3ab8285c4131aec58e48ffa9e1952e..e0e039e2f614f2df48d8d1b6e8bbbe7a return false; } else { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 9b7e5299a67fd4f58d107e8e96c76e49117b75fd..bbd22135683df633524a989f6e9388e1a8de2b69 100644 +index 74ffbaa9f7e5756d3997270c9963dbed8cf36512..35b02b2f8ff0166a58cd86304f7bb8dfc1242660 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -779,6 +779,8 @@ public class PurpurWorldConfig { diff --git a/patches/server/0207-API-for-any-mob-to-burn-daylight.patch b/patches/server/0206-API-for-any-mob-to-burn-daylight.patch similarity index 99% rename from patches/server/0207-API-for-any-mob-to-burn-daylight.patch rename to patches/server/0206-API-for-any-mob-to-burn-daylight.patch index 18f3261f4..b14293842 100644 --- a/patches/server/0207-API-for-any-mob-to-burn-daylight.patch +++ b/patches/server/0206-API-for-any-mob-to-burn-daylight.patch @@ -29,7 +29,7 @@ index 6972880a375c60d19c03e0988e9ab9f80041d451..010a47813b2b3dbc0739c203e4186d14 // 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 8484f49814940b0350d1bec6b4bb5bf6519fbb1c..a0398eef44f65eae1404e122b3086db7aa688f8a 100644 +index dd88755ac380e5c85d5327d02bc3ec7e06355e49..3df4ca11fc44facd02f358948473d84d1de48e2b 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -265,6 +265,7 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0208-Fix-advancement-triggers-on-entity-death.patch b/patches/server/0207-Fix-advancement-triggers-on-entity-death.patch similarity index 98% rename from patches/server/0208-Fix-advancement-triggers-on-entity-death.patch rename to patches/server/0207-Fix-advancement-triggers-on-entity-death.patch index 0de9aef77..eb03044b6 100644 --- a/patches/server/0208-Fix-advancement-triggers-on-entity-death.patch +++ b/patches/server/0207-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 124cee713c3a808bd9c52f105a38ce71b6c9b423..7da1a70667c7537f2367660285d5ee80e9b6b67d 100644 +index 3df4ca11fc44facd02f358948473d84d1de48e2b..1354cd7e9805f16700d122b281be8038d5dd27ef 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1661,10 +1661,13 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0209-Config-MobEffect-by-world.patch b/patches/server/0208-Config-MobEffect-by-world.patch similarity index 98% rename from patches/server/0209-Config-MobEffect-by-world.patch rename to patches/server/0208-Config-MobEffect-by-world.patch index 9c175dee3..d023b9ce7 100644 --- a/patches/server/0209-Config-MobEffect-by-world.patch +++ b/patches/server/0208-Config-MobEffect-by-world.patch @@ -40,7 +40,7 @@ index 79e036d79dec2ec4404baf02c23ba5ccad20cdce..6706d8e6d43cc5f3058f08fdfde77bed ((ServerPlayer) entityhuman).connection.send(new ClientboundSetHealthPacket(((ServerPlayer) entityhuman).getBukkitEntity().getScaledHealth(), entityhuman.getFoodData().foodLevel, entityhuman.getFoodData().saturationLevel)); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index bbd22135683df633524a989f6e9388e1a8de2b69..72855a2a9747b20e6b55d74d702fd1b13a74df5c 100644 +index 35b02b2f8ff0166a58cd86304f7bb8dfc1242660..9353e5db3de39e06f0515df74e4de63667eb372b 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -281,6 +281,21 @@ public class PurpurWorldConfig { diff --git a/patches/server/0210-Beacon-Activation-Range-Configurable.patch b/patches/server/0209-Beacon-Activation-Range-Configurable.patch similarity index 96% rename from patches/server/0210-Beacon-Activation-Range-Configurable.patch rename to patches/server/0209-Beacon-Activation-Range-Configurable.patch index d139f2cf3..3671dbc9d 100644 --- a/patches/server/0210-Beacon-Activation-Range-Configurable.patch +++ b/patches/server/0209-Beacon-Activation-Range-Configurable.patch @@ -26,7 +26,7 @@ index 3281448bf37da8a1b4b7b44f10f4b2438b4a4f29..418c2ddf8ff50a5071b2a31585b77e9f } else { return effectRange; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 72855a2a9747b20e6b55d74d702fd1b13a74df5c..b28d05569629b3826bd71c5e5f16ae86388d9171 100644 +index 9353e5db3de39e06f0515df74e4de63667eb372b..ea9c06106cc7f28dae4f54134752da818da044cf 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -522,6 +522,17 @@ public class PurpurWorldConfig { diff --git a/patches/server/0211-Add-toggle-for-sand-duping-fix.patch b/patches/server/0210-Add-toggle-for-sand-duping-fix.patch similarity index 95% rename from patches/server/0211-Add-toggle-for-sand-duping-fix.patch rename to patches/server/0210-Add-toggle-for-sand-duping-fix.patch index baeca30c4..a9efddaf3 100644 --- a/patches/server/0211-Add-toggle-for-sand-duping-fix.patch +++ b/patches/server/0210-Add-toggle-for-sand-duping-fix.patch @@ -27,7 +27,7 @@ index 8336ea928faa92c6f58f8cdfb9faf1d8e26c9ccf..c765c182081fe83eb0f30dcbf97d8126 } // Paper end - fix sand duping diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index b28d05569629b3826bd71c5e5f16ae86388d9171..a001af5b903016a68cf2eb0aa4a31efd2ad7cdfd 100644 +index ea9c06106cc7f28dae4f54134752da818da044cf..0828be79bdade20e97ccf0146929748e465b6657 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -701,6 +701,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0212-Add-toggle-for-end-portal-safe-teleporting.patch b/patches/server/0211-Add-toggle-for-end-portal-safe-teleporting.patch similarity index 94% rename from patches/server/0212-Add-toggle-for-end-portal-safe-teleporting.patch rename to patches/server/0211-Add-toggle-for-end-portal-safe-teleporting.patch index 4f5350da9..5dc85e663 100644 --- a/patches/server/0212-Add-toggle-for-end-portal-safe-teleporting.patch +++ b/patches/server/0211-Add-toggle-for-end-portal-safe-teleporting.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add toggle for end portal safe teleporting diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index f3304cefa0a8862ef27dcb00519a8a3b9b94da26..0615c4cc3ada4673cb44eaafc4c7fbe189fb1093 100644 +index 010a47813b2b3dbc0739c203e4186d14cc780579..d209a7b09d8429573c93af3d6159f30e6bc877ec 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2749,7 +2749,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n @@ -45,7 +45,7 @@ index 197482e1ace23c3de002242097a68c6cc297cd3f..428875a6a99a619d337e2a7bbd2cb182 entity.portalWorld = ((ServerLevel)world); entity.portalBlock = pos.immutable(); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index a001af5b903016a68cf2eb0aa4a31efd2ad7cdfd..b6dec1172dbe0d49c0901fece931743959989d9d 100644 +index 0828be79bdade20e97ccf0146929748e465b6657..b844efc3eb4659bcde425e9d8003549212e61896 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -643,6 +643,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0213-Flying-Fall-Damage-API.patch b/patches/server/0212-Flying-Fall-Damage-API.patch similarity index 100% rename from patches/server/0213-Flying-Fall-Damage-API.patch rename to patches/server/0212-Flying-Fall-Damage-API.patch diff --git a/patches/server/0214-Make-lightning-rod-range-configurable.patch b/patches/server/0213-Make-lightning-rod-range-configurable.patch similarity index 100% rename from patches/server/0214-Make-lightning-rod-range-configurable.patch rename to patches/server/0213-Make-lightning-rod-range-configurable.patch diff --git a/patches/server/0215-Burp-after-eating-food-fills-hunger-bar-completely.patch b/patches/server/0214-Burp-after-eating-food-fills-hunger-bar-completely.patch similarity index 97% rename from patches/server/0215-Burp-after-eating-food-fills-hunger-bar-completely.patch rename to patches/server/0214-Burp-after-eating-food-fills-hunger-bar-completely.patch index 103815f51..c9e295a89 100644 --- a/patches/server/0215-Burp-after-eating-food-fills-hunger-bar-completely.patch +++ b/patches/server/0214-Burp-after-eating-food-fills-hunger-bar-completely.patch @@ -55,7 +55,7 @@ index 97133bd4af30d0ba92cbf884b83140f3399f92e2..c1130952e3fa22abaa27fcc1c4761c83 public void eat(Item item, ItemStack stack) { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index b6dec1172dbe0d49c0901fece931743959989d9d..e2880d47c06002b2baabf6029f44b13462b89768 100644 +index b844efc3eb4659bcde425e9d8003549212e61896..c5e81e088d0515fb2bc6a22b155c94b90546a86f 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -340,6 +340,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0216-Allow-player-join-full-server-by-permission.patch b/patches/server/0215-Allow-player-join-full-server-by-permission.patch similarity index 100% rename from patches/server/0216-Allow-player-join-full-server-by-permission.patch rename to patches/server/0215-Allow-player-join-full-server-by-permission.patch diff --git a/patches/server/0217-Populator-seed-controls.patch b/patches/server/0216-Populator-seed-controls.patch similarity index 95% rename from patches/server/0217-Populator-seed-controls.patch rename to patches/server/0216-Populator-seed-controls.patch index 68d615163..0c9b354c5 100644 --- a/patches/server/0217-Populator-seed-controls.patch +++ b/patches/server/0216-Populator-seed-controls.patch @@ -39,10 +39,10 @@ index a7a7e6cd87270e64a92448f03f8b0b0c7e375ec7..9fb19162c0e436122087d03d37b502a1 try { region.setCurrentlyGenerating(supplier3); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index e2880d47c06002b2baabf6029f44b13462b89768..3a1a328e74242a70fdfde2c774969955e2f573a4 100644 +index c5e81e088d0515fb2bc6a22b155c94b90546a86f..c377b52a243af8d867d175b55ab71616328a767f 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -2261,4 +2261,9 @@ public class PurpurWorldConfig { +@@ -2259,4 +2259,9 @@ public class PurpurWorldConfig { zombifiedPiglinJockeyTryExistingChickens = getBoolean("mobs.zombified_piglin.jockey.try-existing-chickens", zombifiedPiglinJockeyTryExistingChickens); zombifiedPiglinCountAsPlayerKillWhenAngry = getBoolean("mobs.zombified_piglin.count-as-player-kill-when-angry", zombifiedPiglinCountAsPlayerKillWhenAngry); } diff --git a/patches/server/0218-Add-permission-bypass-for-portal-waiting.patch b/patches/server/0217-Add-permission-bypass-for-portal-waiting.patch similarity index 89% rename from patches/server/0218-Add-permission-bypass-for-portal-waiting.patch rename to patches/server/0217-Add-permission-bypass-for-portal-waiting.patch index 130ec849d..60cb7e6ac 100644 --- a/patches/server/0218-Add-permission-bypass-for-portal-waiting.patch +++ b/patches/server/0217-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 34e6be36d1304e072bd742a61105757f8e6b0a62..4f256b1904b760d25d4a66fb27f2c930f9d2a285 100644 +index 79782538277b60a1c1c16c1c75b53b7d8a2c00ee..2064f93074a58c116352ee768ef9ad9663004641 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -184,6 +184,7 @@ public abstract class Player extends LivingEntity { @@ -26,7 +26,7 @@ index 34e6be36d1304e072bd742a61105757f8e6b0a62..4f256b1904b760d25d4a66fb27f2c930 @Override diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java -index 3ab8bd503a599a11c0d50017826cebf6765197f3..453f74ff74d63152e5bcc0d22301d0c55fded682 100644 +index 9ae925e02698fdfd2f77ab40268b9ac0635f9bd2..435f33938f9bd6d0fe62d3333d1995e7b05a162e 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java @@ -245,6 +245,7 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { diff --git a/patches/server/0219-Shulker-spawn-from-bullet-options.patch b/patches/server/0218-Shulker-spawn-from-bullet-options.patch similarity index 98% rename from patches/server/0219-Shulker-spawn-from-bullet-options.patch rename to patches/server/0218-Shulker-spawn-from-bullet-options.patch index dd5c5f6e5..89335bc4b 100644 --- a/patches/server/0219-Shulker-spawn-from-bullet-options.patch +++ b/patches/server/0218-Shulker-spawn-from-bullet-options.patch @@ -61,7 +61,7 @@ index f812a75985d26785639491c9a980387a3f261f2d..b11fb39b69f5225ca7da72ca1a2200c7 + // Purpur end } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 3a1a328e74242a70fdfde2c774969955e2f573a4..68d2feac1cc64e8f4e0e3274a0212d1113475862 100644 +index c377b52a243af8d867d175b55ab71616328a767f..29fc2e6e8116959f53f9e7a9f3a16c2a52103396 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -1716,6 +1716,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0220-Eating-glow-berries-adds-glow-effect.patch b/patches/server/0219-Eating-glow-berries-adds-glow-effect.patch similarity index 97% rename from patches/server/0220-Eating-glow-berries-adds-glow-effect.patch rename to patches/server/0219-Eating-glow-berries-adds-glow-effect.patch index 8bdf373db..7a648f4fc 100644 --- a/patches/server/0220-Eating-glow-berries-adds-glow-effect.patch +++ b/patches/server/0219-Eating-glow-berries-adds-glow-effect.patch @@ -18,7 +18,7 @@ index 89d4b7e4cd4222b61b49833fceda56ffa39710fa..1eb50f0bc41db79f091f900861ba71d7 public static final Item SOUL_CAMPFIRE = registerBlock(Blocks.SOUL_CAMPFIRE, CreativeModeTab.TAB_DECORATIONS); public static final Item SHROOMLIGHT = registerBlock(Blocks.SHROOMLIGHT, CreativeModeTab.TAB_DECORATIONS); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 68d2feac1cc64e8f4e0e3274a0212d1113475862..fc6f817266a17efaa8c27f3e6bc01099db45be86 100644 +index 29fc2e6e8116959f53f9e7a9f3a16c2a52103396..9b17536bf3e50bd1b3c1c2ca9619db3b19d1ce8d 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -172,6 +172,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0221-Option-to-make-drowned-break-doors.patch b/patches/server/0220-Option-to-make-drowned-break-doors.patch similarity index 97% rename from patches/server/0221-Option-to-make-drowned-break-doors.patch rename to patches/server/0220-Option-to-make-drowned-break-doors.patch index 395256878..2408f3eab 100644 --- a/patches/server/0221-Option-to-make-drowned-break-doors.patch +++ b/patches/server/0220-Option-to-make-drowned-break-doors.patch @@ -34,7 +34,7 @@ index 8d3ce6c97a8734c0d13844cafca251a3f4dce8a4..a004d59483dc3ffb404ae28daf76c807 @Override diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index fc6f817266a17efaa8c27f3e6bc01099db45be86..62aaf7033bc2426d109389f113d21b67b7f50894 100644 +index 9b17536bf3e50bd1b3c1c2ca9619db3b19d1ce8d..cb6efbbb3f12a24d0a18e1e124e17476809fe27a 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -1015,6 +1015,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0222-Configurable-hunger-starvation-damage.patch b/patches/server/0221-Configurable-hunger-starvation-damage.patch similarity index 91% rename from patches/server/0222-Configurable-hunger-starvation-damage.patch rename to patches/server/0221-Configurable-hunger-starvation-damage.patch index 06c7fb26e..8d529ac3f 100644 --- a/patches/server/0222-Configurable-hunger-starvation-damage.patch +++ b/patches/server/0221-Configurable-hunger-starvation-damage.patch @@ -18,10 +18,10 @@ index c1130952e3fa22abaa27fcc1c4761c831dc56cc3..1ac08eca469739cb52abd38483c431b6 this.tickTimer = 0; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 62aaf7033bc2426d109389f113d21b67b7f50894..ff6c5d7a9054935178d0236153ddc66e4914b5d5 100644 +index cb6efbbb3f12a24d0a18e1e124e17476809fe27a..e0b8fcb18b8ba79456f38159481d6e835995203a 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -2280,4 +2280,9 @@ public class PurpurWorldConfig { +@@ -2278,4 +2278,9 @@ public class PurpurWorldConfig { private void seedSettings() { randomPopulatorSeed = getBoolean("seed.random-populator-seed", randomPopulatorSeed); } diff --git a/patches/server/0223-Redirect-System.out-calls-to-plugin-loggers.patch b/patches/server/0222-Redirect-System.out-calls-to-plugin-loggers.patch similarity index 97% rename from patches/server/0223-Redirect-System.out-calls-to-plugin-loggers.patch rename to patches/server/0222-Redirect-System.out-calls-to-plugin-loggers.patch index 8debfa73c..9ed669723 100644 --- a/patches/server/0223-Redirect-System.out-calls-to-plugin-loggers.patch +++ b/patches/server/0222-Redirect-System.out-calls-to-plugin-loggers.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Redirect System.out calls to plugin loggers diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index 5d9d76f1b90e991bb01b059da86dcdd483d93c80..2ff5bf7f5dc66ad493f219b709809115fd4d18f7 100644 +index 606d5577f121b0103e272bbe4ffa4b582c76469c..a75d1872d63aeba5376d787336e4793e813ba21f 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java @@ -178,8 +178,8 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface diff --git a/patches/server/0224-Armor-click-equip-options.patch b/patches/server/0223-Armor-click-equip-options.patch similarity index 98% rename from patches/server/0224-Armor-click-equip-options.patch rename to patches/server/0223-Armor-click-equip-options.patch index 25f90b5a5..69581f92d 100644 --- a/patches/server/0224-Armor-click-equip-options.patch +++ b/patches/server/0223-Armor-click-equip-options.patch @@ -58,7 +58,7 @@ index 42f79d418ec4e2dbeac9a217d9dc144cda2ef714..250c0e31825f772d3fee7a523f150cb2 return InteractionResultHolder.fail(itemStack); } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index ff6c5d7a9054935178d0236153ddc66e4914b5d5..2c6579e5c77c0f409a9c92a80574c8a3961b1ad1 100644 +index e0b8fcb18b8ba79456f38159481d6e835995203a..fbafc3d1e0912ef1f4dfb9f81f04b6905483f933 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -343,6 +343,8 @@ public class PurpurWorldConfig { diff --git a/patches/server/0225-Add-uptime-command.patch b/patches/server/0224-Add-uptime-command.patch similarity index 100% rename from patches/server/0225-Add-uptime-command.patch rename to patches/server/0224-Add-uptime-command.patch diff --git a/patches/server/0226-Structure-seed-options.patch b/patches/server/0225-Structure-seed-options.patch similarity index 97% rename from patches/server/0226-Structure-seed-options.patch rename to patches/server/0225-Structure-seed-options.patch index f890e56a8..fc6def256 100644 --- a/patches/server/0226-Structure-seed-options.patch +++ b/patches/server/0225-Structure-seed-options.patch @@ -5,7 +5,7 @@ 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 6cd66a4edbe2010d2a34506baf1ba6fe3de38bb9..f3e67330c01f6a867ccd4e024a6695d90bc2988c 100644 +index f71cc1f5e5d594e82a4e6132d438bae74b9370a7..77948e19dd99b6f30bf294c9d5308228a271929b 100644 --- a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java +++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java @@ -389,6 +389,17 @@ public abstract class ChunkGenerator { diff --git a/patches/server/0227-Tool-actionable-options.patch b/patches/server/0226-Tool-actionable-options.patch similarity index 99% rename from patches/server/0227-Tool-actionable-options.patch rename to patches/server/0226-Tool-actionable-options.patch index a2022fbfe..1b38b58c1 100644 --- a/patches/server/0227-Tool-actionable-options.patch +++ b/patches/server/0226-Tool-actionable-options.patch @@ -109,7 +109,7 @@ index 009dd6b59e27a9413b3ef115468a6d1dd0746d56..fdbc1378bc148f5a16b414a3e5867cdc return InteractionResult.PASS; } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 2c6579e5c77c0f409a9c92a80574c8a3961b1ad1..2c3f734ae06a8d1c282e714b28377f3c4691350f 100644 +index fbafc3d1e0912ef1f4dfb9f81f04b6905483f933..6c113874402536a1e610ef46140e0755b3839475 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -458,6 +458,153 @@ public class PurpurWorldConfig { diff --git a/patches/server/0228-SPIGOT-5988-Fix-bed-respawn-location-not-resetting.patch b/patches/server/0227-SPIGOT-5988-Fix-bed-respawn-location-not-resetting.patch similarity index 100% rename from patches/server/0228-SPIGOT-5988-Fix-bed-respawn-location-not-resetting.patch rename to patches/server/0227-SPIGOT-5988-Fix-bed-respawn-location-not-resetting.patch diff --git a/patches/server/0229-Store-placer-on-Block-when-placed.patch b/patches/server/0228-Store-placer-on-Block-when-placed.patch similarity index 100% rename from patches/server/0229-Store-placer-on-Block-when-placed.patch rename to patches/server/0228-Store-placer-on-Block-when-placed.patch diff --git a/patches/server/0230-Summoner-API.patch b/patches/server/0229-Summoner-API.patch similarity index 99% rename from patches/server/0230-Summoner-API.patch rename to patches/server/0229-Summoner-API.patch index 1e4117920..3c9646695 100644 --- a/patches/server/0230-Summoner-API.patch +++ b/patches/server/0229-Summoner-API.patch @@ -93,7 +93,7 @@ index c66e72606c346d12d628b92dda97a997e503bdaf..5200f5188144cb50d46be72e4ff47649 } 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 36745f845f33c877595d572e46bd8e966c03d11a..281e8c109fb8aac76986eba86dc7434b3cd7a34a 100644 +index 257a1b91c65d9f66173cfe8a31f598a0adfd04a8..48c1ddbd9f20e6ece121b166c08341006fa15105 100644 --- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java +++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java @@ -84,6 +84,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob diff --git a/patches/server/0231-Customizable-sleeping-actionbar-messages.patch b/patches/server/0230-Customizable-sleeping-actionbar-messages.patch similarity index 100% rename from patches/server/0231-Customizable-sleeping-actionbar-messages.patch rename to patches/server/0230-Customizable-sleeping-actionbar-messages.patch diff --git a/patches/server/0232-option-to-disable-shulker-box-items-from-dropping-co.patch b/patches/server/0231-option-to-disable-shulker-box-items-from-dropping-co.patch similarity index 96% rename from patches/server/0232-option-to-disable-shulker-box-items-from-dropping-co.patch rename to patches/server/0231-option-to-disable-shulker-box-items-from-dropping-co.patch index 61b5c287f..7d6a48fc5 100644 --- a/patches/server/0232-option-to-disable-shulker-box-items-from-dropping-co.patch +++ b/patches/server/0231-option-to-disable-shulker-box-items-from-dropping-co.patch @@ -19,7 +19,7 @@ index d9114ee2ef4f1dee7ae018f932a7804a61a90ef6..8b521ee48480d3eb5cc77051c425ff45 if (nbttagcompound != null) { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 2c3f734ae06a8d1c282e714b28377f3c4691350f..0a2b847f77d0546c7e28925b259a5c3167a0e012 100644 +index 6c113874402536a1e610ef46140e0755b3839475..2c64ee0898414e3358bb105ca1c9f7e4fbe3deb3 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -173,6 +173,7 @@ public class PurpurWorldConfig {