Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 18:07:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

[ci-skip] Reorder configs

Browse Source
This commit is contained in:
BillyGalbreath
2021-12-31 09:45:42 -06:00
parent 2e4174e033
commit 1c9c6b910a
180 changed files with 906 additions and 903 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
patches/server/0072-Configurable-jockey-options.patch
View File

@@ -167,10 +167,10 @@ index f30b36b3f1153e1cbd9b8242909d9ba8c995df1d..76f1bbec2b8ebe037de65ee5ec718e17
@Override
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 72d6c875070e16bacc40700e30b07d5fe5cf1236..f72530a2659e3d1568314f496aba06cf97873eb3 100644
index 4f2ce450267a98f6b5e2814eb0303fc37125f792..d251746cbb14fce9756af250e6e2276f75b86420 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -547,6 +547,9 @@ public class PurpurWorldConfig {
@@ -541,6 +541,9 @@ public class PurpurWorldConfig {
public boolean drownedRidableInWater = false;
public double drownedMaxHealth = 20.0D;
public double drownedSpawnReinforcements = 0.1D;
@@ -180,7 +180,7 @@ index 72d6c875070e16bacc40700e30b07d5fe5cf1236..f72530a2659e3d1568314f496aba06cf
private void drownedSettings() {
drownedRidable = getBoolean("mobs.drowned.ridable", drownedRidable);
drownedRidableInWater = getBoolean("mobs.drowned.ridable-in-water", drownedRidableInWater);
@@ -557,6 +560,9 @@ public class PurpurWorldConfig {
@@ -551,6 +554,9 @@ public class PurpurWorldConfig {
}
drownedMaxHealth = getDouble("mobs.drowned.attributes.max_health", drownedMaxHealth);
drownedSpawnReinforcements = getDouble("mobs.drowned.attributes.spawn_reinforcements", drownedSpawnReinforcements);
@@ -190,7 +190,7 @@ index 72d6c875070e16bacc40700e30b07d5fe5cf1236..f72530a2659e3d1568314f496aba06cf
}
public boolean elderGuardianRidable = false;
@@ -769,6 +775,9 @@ public class PurpurWorldConfig {
@@ -763,6 +769,9 @@ public class PurpurWorldConfig {
public boolean huskRidableInWater = false;
public double huskMaxHealth = 20.0D;
public double huskSpawnReinforcements = 0.1D;
@@ -200,7 +200,7 @@ index 72d6c875070e16bacc40700e30b07d5fe5cf1236..f72530a2659e3d1568314f496aba06cf
private void huskSettings() {
huskRidable = getBoolean("mobs.husk.ridable", huskRidable);
huskRidableInWater = getBoolean("mobs.husk.ridable-in-water", huskRidableInWater);
@@ -779,6 +788,9 @@ public class PurpurWorldConfig {
@@ -773,6 +782,9 @@ public class PurpurWorldConfig {
}
huskMaxHealth = getDouble("mobs.husk.attributes.max_health", huskMaxHealth);
huskSpawnReinforcements = getDouble("mobs.husk.attributes.spawn_reinforcements", huskSpawnReinforcements);
@@ -210,7 +210,7 @@ index 72d6c875070e16bacc40700e30b07d5fe5cf1236..f72530a2659e3d1568314f496aba06cf
}
public boolean illusionerRidable = false;
@@ -1473,6 +1485,9 @@ public class PurpurWorldConfig {
@@ -1467,6 +1479,9 @@ public class PurpurWorldConfig {
public boolean zombieRidableInWater = false;
public double zombieMaxHealth = 20.0D;
public double zombieSpawnReinforcements = 0.1D;
@@ -220,7 +220,7 @@ index 72d6c875070e16bacc40700e30b07d5fe5cf1236..f72530a2659e3d1568314f496aba06cf
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -1483,6 +1498,9 @@ public class PurpurWorldConfig {
@@ -1477,6 +1492,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 72d6c875070e16bacc40700e30b07d5fe5cf1236..f72530a2659e3d1568314f496aba06cf
}
public boolean zombieHorseRidableInWater = false;
@@ -1516,6 +1534,9 @@ public class PurpurWorldConfig {
@@ -1510,6 +1528,9 @@ public class PurpurWorldConfig {
public boolean zombieVillagerRidableInWater = false;
public double zombieVillagerMaxHealth = 20.0D;
public double zombieVillagerSpawnReinforcements = 0.1D;
@@ -240,7 +240,7 @@ index 72d6c875070e16bacc40700e30b07d5fe5cf1236..f72530a2659e3d1568314f496aba06cf
private void zombieVillagerSettings() {
zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable);
zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater);
@@ -1526,12 +1547,18 @@ public class PurpurWorldConfig {
@@ -1520,12 +1541,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 72d6c875070e16bacc40700e30b07d5fe5cf1236..f72530a2659e3d1568314f496aba06cf
private void zombifiedPiglinSettings() {
zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable);
zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater);
@@ -1542,5 +1569,8 @@ public class PurpurWorldConfig {
@@ -1536,5 +1563,8 @@ public class PurpurWorldConfig {
}
zombifiedPiglinMaxHealth = getDouble("mobs.zombified_piglin.attributes.max_health", zombifiedPiglinMaxHealth);
zombifiedPiglinSpawnReinforcements = getDouble("mobs.zombified_piglin.attributes.spawn_reinforcements", zombifiedPiglinSpawnReinforcements);