fix config options in patches

This commit is contained in:
granny
2023-06-09 04:33:41 -07:00
parent 91b9a1a0ce
commit 9bed3af997
94 changed files with 603 additions and 611 deletions

View File

@@ -167,7 +167,7 @@ index 8f22bfcde4bb8ad73794f2b98b156113e5a2a6c9..3d61b27c23d90e87fdfc8c170eafc116
public void setPersistentAngerTarget(@Nullable UUID angryAt) {
this.persistentAngerTarget = angryAt;
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 023eb3bc381803d9ab712965f44e2e3f3790ddbe..d96d87fd198e54802712b8cfde2a0563812a3136 100644
index f69b94022b78cd9dad74858a90eb61904944e17e..1d9c99f3740cec7fb41602835cda3277ea4a36c3 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -587,6 +587,9 @@ public class PurpurWorldConfig {
@@ -210,7 +210,7 @@ index 023eb3bc381803d9ab712965f44e2e3f3790ddbe..d96d87fd198e54802712b8cfde2a0563
}
public boolean illusionerRidable = false;
@@ -1676,6 +1688,9 @@ public class PurpurWorldConfig {
@@ -1673,6 +1685,9 @@ public class PurpurWorldConfig {
public boolean zombieControllable = true;
public double zombieMaxHealth = 20.0D;
public double zombieSpawnReinforcements = 0.1D;
@@ -220,7 +220,7 @@ index 023eb3bc381803d9ab712965f44e2e3f3790ddbe..d96d87fd198e54802712b8cfde2a0563
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -1687,6 +1702,9 @@ public class PurpurWorldConfig {
@@ -1684,6 +1699,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 023eb3bc381803d9ab712965f44e2e3f3790ddbe..d96d87fd198e54802712b8cfde2a0563
}
public boolean zombieHorseRidableInWater = false;
@@ -1721,12 +1739,18 @@ public class PurpurWorldConfig {
@@ -1718,6 +1736,9 @@ public class PurpurWorldConfig {
public boolean zombieVillagerControllable = true;
public double zombieVillagerMaxHealth = 20.0D;
public double zombieVillagerSpawnReinforcements = 0.1D;
@@ -240,7 +240,8 @@ index 023eb3bc381803d9ab712965f44e2e3f3790ddbe..d96d87fd198e54802712b8cfde2a0563
private void zombieVillagerSettings() {
zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable);
zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater);
zombieVillagerControllable = getBoolean("mobs.zombie_villager.controllable", zombieVillagerControllable);
@@ -1729,6 +1750,9 @@ public class PurpurWorldConfig {
}
zombieVillagerMaxHealth = getDouble("mobs.zombie_villager.attributes.max_health", zombieVillagerMaxHealth);
zombieVillagerSpawnReinforcements = getDouble("mobs.zombie_villager.attributes.spawn_reinforcements", zombieVillagerSpawnReinforcements);
+ zombieVillagerJockeyOnlyBaby = getBoolean("mobs.zombie_villager.jockey.only-babies", zombieVillagerJockeyOnlyBaby);
@@ -249,7 +250,7 @@ index 023eb3bc381803d9ab712965f44e2e3f3790ddbe..d96d87fd198e54802712b8cfde2a0563
}
public boolean zombifiedPiglinRidable = false;
@@ -1734,6 +1758,9 @@ public class PurpurWorldConfig {
@@ -1736,6 +1760,9 @@ public class PurpurWorldConfig {
public boolean zombifiedPiglinControllable = true;
public double zombifiedPiglinMaxHealth = 20.0D;
public double zombifiedPiglinSpawnReinforcements = 0.0D;
@@ -259,7 +260,7 @@ index 023eb3bc381803d9ab712965f44e2e3f3790ddbe..d96d87fd198e54802712b8cfde2a0563
private void zombifiedPiglinSettings() {
zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable);
zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater);
@@ -1745,5 +1772,8 @@ public class PurpurWorldConfig {
@@ -1747,5 +1774,8 @@ public class PurpurWorldConfig {
}
zombifiedPiglinMaxHealth = getDouble("mobs.zombified_piglin.attributes.max_health", zombifiedPiglinMaxHealth);
zombifiedPiglinSpawnReinforcements = getDouble("mobs.zombified_piglin.attributes.spawn_reinforcements", zombifiedPiglinSpawnReinforcements);