diff --git a/patches/server/0003-Ridables.patch b/patches/server/0003-Ridables.patch index 9f1a846a4..040912b9c 100644 --- a/patches/server/0003-Ridables.patch +++ b/patches/server/0003-Ridables.patch @@ -889,7 +889,7 @@ index 74fc4fc2216cf82e1546ef3d567f2750b1240df1..c90dda3d62dab896f68481000c0b6db1 + } } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 361f7857e461578e90cb71e15027dadaf794cb69..4fd7d61c5d225f0dc0666ad7219542777afe01ea 100644 +index 361f7857e461578e90cb71e15027dadaf794cb69..5ad112baaa2dc0d56c0e7d36443eafd3ff0dc2c8 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -56,4 +56,530 @@ public class PurpurWorldConfig { @@ -1416,11 +1416,11 @@ index 361f7857e461578e90cb71e15027dadaf794cb69..4fd7d61c5d225f0dc0666ad721954277 + zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater); + } + -+ public boolean zombiefiedPiglinRidable = false; -+ public boolean zombiefiedPiglinRidableInWater = false; -+ private void zombiefiedPiglinSettings() { -+ zombiefiedPiglinRidable = getBoolean("mobs.zombiefied_piglin.ridable", zombiefiedPiglinRidable); -+ zombiefiedPiglinRidableInWater = getBoolean("mobs.zombiefied_piglin.ridable-in-water", zombiefiedPiglinRidableInWater); ++ public boolean zombifiedPiglinRidable = false; ++ public boolean zombifiedPiglinRidableInWater = false; ++ private void zombifiedPiglinSettings() { ++ zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable); ++ zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater); + } } diff --git a/src/main/java/net/pl3x/purpur/controller/FlyingMoveControllerWASD.java b/src/main/java/net/pl3x/purpur/controller/FlyingMoveControllerWASD.java diff --git a/patches/server/0074-Configurable-jockey-options.patch b/patches/server/0074-Configurable-jockey-options.patch index b2be30b10..674a528e6 100644 --- a/patches/server/0074-Configurable-jockey-options.patch +++ b/patches/server/0074-Configurable-jockey-options.patch @@ -184,7 +184,7 @@ index 233b390541acddcf815db4a8f299496eaea4f758..a50191aac887dffd3a7930455cb222fa public void setPersistentAngerTarget(@Nullable UUID uuid) { this.persistentAngerTarget = uuid; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 48d5dff7041f4e05e6c508ef23921ee8a5d71dd2..ad6c76a06a31d40ba5d5a8eb6af34d7e6f98c1b2 100644 +index aa984c2eebf2529e0be42b01ec7678d1f5157e0d..e39e1ff19f49b093ae27a98cba280ad2643df7a2 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -399,9 +399,15 @@ public class PurpurWorldConfig { @@ -250,15 +250,14 @@ index 48d5dff7041f4e05e6c508ef23921ee8a5d71dd2..ad6c76a06a31d40ba5d5a8eb6af34d7e + zombieVillagerJockeyTryExistingChickens = getBoolean("mobs.zombie_villager.jockey.try-existing-chickens", zombieVillagerJockeyTryExistingChickens); } - public boolean zombiefiedPiglinRidable = false; - public boolean zombiefiedPiglinRidableInWater = false; -- private void zombiefiedPiglinSettings() { + public boolean zombifiedPiglinRidable = false; + public boolean zombifiedPiglinRidableInWater = false; + public boolean zombifiedPiglinJockeyOnlyBaby = true; + public double zombifiedPiglinJockeyChance = 0.05D; + public boolean zombifiedPiglinJockeyTryExistingChickens = true; -+ private void zombifiedPiglinSettings() { - zombiefiedPiglinRidable = getBoolean("mobs.zombiefied_piglin.ridable", zombiefiedPiglinRidable); - zombiefiedPiglinRidableInWater = getBoolean("mobs.zombiefied_piglin.ridable-in-water", zombiefiedPiglinRidableInWater); + private void zombifiedPiglinSettings() { + zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable); + zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater); + 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);