[ci-skip] remove unused config option

not sure why we didn't do this during the 1.19.2 update
This commit is contained in:
granny
2023-03-14 21:56:31 -07:00
parent 72b75798c5
commit 67066cdd46
86 changed files with 620 additions and 625 deletions

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Mob head visibility percent
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 7a60d00faa9434ca283f428df02a38c50c1666dc..7fc6a47dd0ded34c74c8aca3091a1d1e38cb2aa5 100644
index a50d5d9487a31c560deddef26c7d8dda6d81bd88..2838c325126791beef94aa3444010dbdbbefe9b9 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -1029,9 +1029,20 @@ public abstract class LivingEntity extends Entity {
@@ -32,10 +32,10 @@ index 7a60d00faa9434ca283f428df02a38c50c1666dc..7fc6a47dd0ded34c74c8aca3091a1d1e
// 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 0abaa61cd1ca81da3062c9732deba789309a55df..63f1a1d3c1356473f8ee2cfe5e895902f4088245 100644
index e0d226ab4f02a2002b007a2daa7a031185bbaa69..0f45c72ab93f7926b628202e4ddd2e4b109c1f29 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1274,6 +1274,7 @@ public class PurpurWorldConfig {
@@ -1270,6 +1270,7 @@ public class PurpurWorldConfig {
public boolean creeperExplodeWhenKilled = false;
public boolean creeperHealthRadius = false;
public boolean creeperAlwaysDropExp = false;
@@ -43,7 +43,7 @@ index 0abaa61cd1ca81da3062c9732deba789309a55df..63f1a1d3c1356473f8ee2cfe5e895902
private void creeperSettings() {
creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
@@ -1291,6 +1292,7 @@ public class PurpurWorldConfig {
@@ -1287,6 +1288,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);
@@ -51,7 +51,7 @@ index 0abaa61cd1ca81da3062c9732deba789309a55df..63f1a1d3c1356473f8ee2cfe5e895902
}
public boolean dolphinRidable = false;
@@ -2077,6 +2079,7 @@ public class PurpurWorldConfig {
@@ -2073,6 +2075,7 @@ public class PurpurWorldConfig {
public boolean piglinTakeDamageFromWater = false;
public int piglinPortalSpawnModifier = 2000;
public boolean piglinAlwaysDropExp = false;
@@ -59,7 +59,7 @@ index 0abaa61cd1ca81da3062c9732deba789309a55df..63f1a1d3c1356473f8ee2cfe5e895902
private void piglinSettings() {
piglinRidable = getBoolean("mobs.piglin.ridable", piglinRidable);
piglinRidableInWater = getBoolean("mobs.piglin.ridable-in-water", piglinRidableInWater);
@@ -2091,6 +2094,7 @@ public class PurpurWorldConfig {
@@ -2087,6 +2090,7 @@ public class PurpurWorldConfig {
piglinTakeDamageFromWater = getBoolean("mobs.piglin.takes-damage-from-water", piglinTakeDamageFromWater);
piglinPortalSpawnModifier = getInt("mobs.piglin.portal-spawn-modifier", piglinPortalSpawnModifier);
piglinAlwaysDropExp = getBoolean("mobs.piglin.always-drop-exp", piglinAlwaysDropExp);
@@ -67,7 +67,7 @@ index 0abaa61cd1ca81da3062c9732deba789309a55df..63f1a1d3c1356473f8ee2cfe5e895902
}
public boolean piglinBruteRidable = false;
@@ -2352,6 +2356,7 @@ public class PurpurWorldConfig {
@@ -2348,6 +2352,7 @@ public class PurpurWorldConfig {
public double skeletonMaxHealth = 20.0D;
public boolean skeletonTakeDamageFromWater = false;
public boolean skeletonAlwaysDropExp = false;
@@ -75,7 +75,7 @@ index 0abaa61cd1ca81da3062c9732deba789309a55df..63f1a1d3c1356473f8ee2cfe5e895902
private void skeletonSettings() {
skeletonRidable = getBoolean("mobs.skeleton.ridable", skeletonRidable);
skeletonRidableInWater = getBoolean("mobs.skeleton.ridable-in-water", skeletonRidableInWater);
@@ -2364,6 +2369,7 @@ public class PurpurWorldConfig {
@@ -2360,6 +2365,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);
@@ -83,7 +83,7 @@ index 0abaa61cd1ca81da3062c9732deba789309a55df..63f1a1d3c1356473f8ee2cfe5e895902
}
public boolean skeletonHorseRidableInWater = true;
@@ -2885,6 +2891,7 @@ public class PurpurWorldConfig {
@@ -2881,6 +2887,7 @@ public class PurpurWorldConfig {
public boolean zombieBypassMobGriefing = false;
public boolean zombieTakeDamageFromWater = false;
public boolean zombieAlwaysDropExp = false;
@@ -91,7 +91,7 @@ index 0abaa61cd1ca81da3062c9732deba789309a55df..63f1a1d3c1356473f8ee2cfe5e895902
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -2903,6 +2910,7 @@ public class PurpurWorldConfig {
@@ -2899,6 +2906,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);