add missing waxable and weatherable options for axe

This commit is contained in:
granny
2023-12-14 22:39:35 -08:00
parent 92a6325cb0
commit 9e1216de50
51 changed files with 347 additions and 273 deletions

View File

@@ -32,10 +32,10 @@ index cbf14a9f6c4059ac2246d840ff901113fb03f8cc..ccf94ec8c0fcff5d75365274f662ff24
// 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 f607d41ffa51c00cb9edc70545e3d55fdf56f8db..e1cb805d20768559db3452a83392f2e9ea9aa4c3 100644
index d31aa9b30124832fbc010299b8a24c67624ac6f3..3760848e35ce82a546fb406ed383be8d943ba25b 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1296,6 +1296,7 @@ public class PurpurWorldConfig {
@@ -1370,6 +1370,7 @@ public class PurpurWorldConfig {
public boolean creeperExplodeWhenKilled = false;
public boolean creeperHealthRadius = false;
public boolean creeperAlwaysDropExp = false;
@@ -43,7 +43,7 @@ index f607d41ffa51c00cb9edc70545e3d55fdf56f8db..e1cb805d20768559db3452a83392f2e9
private void creeperSettings() {
creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
@@ -1313,6 +1314,7 @@ public class PurpurWorldConfig {
@@ -1387,6 +1388,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 f607d41ffa51c00cb9edc70545e3d55fdf56f8db..e1cb805d20768559db3452a83392f2e9
}
public boolean dolphinRidable = false;
@@ -2099,6 +2101,7 @@ public class PurpurWorldConfig {
@@ -2173,6 +2175,7 @@ public class PurpurWorldConfig {
public boolean piglinTakeDamageFromWater = false;
public int piglinPortalSpawnModifier = 2000;
public boolean piglinAlwaysDropExp = false;
@@ -59,7 +59,7 @@ index f607d41ffa51c00cb9edc70545e3d55fdf56f8db..e1cb805d20768559db3452a83392f2e9
private void piglinSettings() {
piglinRidable = getBoolean("mobs.piglin.ridable", piglinRidable);
piglinRidableInWater = getBoolean("mobs.piglin.ridable-in-water", piglinRidableInWater);
@@ -2113,6 +2116,7 @@ public class PurpurWorldConfig {
@@ -2187,6 +2190,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 f607d41ffa51c00cb9edc70545e3d55fdf56f8db..e1cb805d20768559db3452a83392f2e9
}
public boolean piglinBruteRidable = false;
@@ -2374,6 +2378,7 @@ public class PurpurWorldConfig {
@@ -2448,6 +2452,7 @@ public class PurpurWorldConfig {
public double skeletonMaxHealth = 20.0D;
public boolean skeletonTakeDamageFromWater = false;
public boolean skeletonAlwaysDropExp = false;
@@ -75,7 +75,7 @@ index f607d41ffa51c00cb9edc70545e3d55fdf56f8db..e1cb805d20768559db3452a83392f2e9
private void skeletonSettings() {
skeletonRidable = getBoolean("mobs.skeleton.ridable", skeletonRidable);
skeletonRidableInWater = getBoolean("mobs.skeleton.ridable-in-water", skeletonRidableInWater);
@@ -2386,6 +2391,7 @@ public class PurpurWorldConfig {
@@ -2460,6 +2465,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 f607d41ffa51c00cb9edc70545e3d55fdf56f8db..e1cb805d20768559db3452a83392f2e9
}
public boolean skeletonHorseRidable = false;
@@ -2922,6 +2928,7 @@ public class PurpurWorldConfig {
@@ -2996,6 +3002,7 @@ public class PurpurWorldConfig {
public boolean zombieBypassMobGriefing = false;
public boolean zombieTakeDamageFromWater = false;
public boolean zombieAlwaysDropExp = false;
@@ -91,7 +91,7 @@ index f607d41ffa51c00cb9edc70545e3d55fdf56f8db..e1cb805d20768559db3452a83392f2e9
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -2940,6 +2947,7 @@ public class PurpurWorldConfig {
@@ -3014,6 +3021,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);