[ci-skip] Reorder configs

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

View File

@@ -29,10 +29,10 @@ index b6022415925d365931a1110f727d5a22a04b9cee..49238d8b25f4d8a477bd5bbf02e655fe
// Purpur start
if (entity instanceof LivingEntity entityliving) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index d600414555e076047a2114255538f0a2ab3fbd94..7c35a14a02fb160918ef33d2c57666bc1f167a87 100644
index c85f8a53f65fd9a142c18401129693888030adb7..b0e97fcbbaf445143cf5a02cc3e125a47c2a7840 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1237,6 +1237,7 @@ public class PurpurWorldConfig {
@@ -1234,6 +1234,7 @@ public class PurpurWorldConfig {
public boolean creeperExplodeWhenKilled = false;
public boolean creeperHealthRadius = false;
public boolean creeperAlwaysDropExp = false;
@@ -40,7 +40,7 @@ index d600414555e076047a2114255538f0a2ab3fbd94..7c35a14a02fb160918ef33d2c57666bc
private void creeperSettings() {
creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
@@ -1253,6 +1254,7 @@ public class PurpurWorldConfig {
@@ -1250,6 +1251,7 @@ public class PurpurWorldConfig {
creeperExplodeWhenKilled = getBoolean("mobs.creeper.explode-when-killed", creeperExplodeWhenKilled);
creeperHealthRadius = getBoolean("mobs.creeper.health-impacts-explosion", creeperHealthRadius);
creeperAlwaysDropExp = getBoolean("mobs.creeper.always-drop-exp", creeperAlwaysDropExp);
@@ -48,7 +48,7 @@ index d600414555e076047a2114255538f0a2ab3fbd94..7c35a14a02fb160918ef33d2c57666bc
}
public boolean dolphinRidable = false;
@@ -2224,6 +2226,7 @@ public class PurpurWorldConfig {
@@ -2221,6 +2223,7 @@ public class PurpurWorldConfig {
public double skeletonMaxHealth = 20.0D;
public boolean skeletonTakeDamageFromWater = false;
public boolean skeletonAlwaysDropExp = false;
@@ -56,7 +56,7 @@ index d600414555e076047a2114255538f0a2ab3fbd94..7c35a14a02fb160918ef33d2c57666bc
private void skeletonSettings() {
skeletonRidable = getBoolean("mobs.skeleton.ridable", skeletonRidable);
skeletonRidableInWater = getBoolean("mobs.skeleton.ridable-in-water", skeletonRidableInWater);
@@ -2235,6 +2238,7 @@ public class PurpurWorldConfig {
@@ -2232,6 +2235,7 @@ public class PurpurWorldConfig {
skeletonMaxHealth = getDouble("mobs.skeleton.attributes.max_health", skeletonMaxHealth);
skeletonTakeDamageFromWater = getBoolean("mobs.skeleton.takes-damage-from-water", skeletonTakeDamageFromWater);
skeletonAlwaysDropExp = getBoolean("mobs.skeleton.always-drop-exp", skeletonAlwaysDropExp);
@@ -64,7 +64,7 @@ index d600414555e076047a2114255538f0a2ab3fbd94..7c35a14a02fb160918ef33d2c57666bc
}
public boolean skeletonHorseRidableInWater = true;
@@ -2707,6 +2711,7 @@ public class PurpurWorldConfig {
@@ -2704,6 +2708,7 @@ public class PurpurWorldConfig {
public boolean zombieBypassMobGriefing = false;
public boolean zombieTakeDamageFromWater = false;
public boolean zombieAlwaysDropExp = false;
@@ -72,7 +72,7 @@ index d600414555e076047a2114255538f0a2ab3fbd94..7c35a14a02fb160918ef33d2c57666bc
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -2724,6 +2729,7 @@ public class PurpurWorldConfig {
@@ -2721,6 +2726,7 @@ public class PurpurWorldConfig {
zombieBypassMobGriefing = getBoolean("mobs.zombie.bypass-mob-griefing", zombieBypassMobGriefing);
zombieTakeDamageFromWater = getBoolean("mobs.zombie.takes-damage-from-water", zombieTakeDamageFromWater);
zombieAlwaysDropExp = getBoolean("mobs.zombie.always-drop-exp", zombieAlwaysDropExp);