fix build issue

This commit is contained in:
Ben Kerllenevich
2023-06-11 22:04:37 -04:00
parent 866df4ad0e
commit 788c14f02c
77 changed files with 586 additions and 586 deletions

View File

@@ -32,10 +32,10 @@ index 48fa05e80483e470572ecc8b2f7feb58e2f36dd0..fd276495ddcf160660a725c721d3c3f1
// 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 2f139bc7a088e721e2da2823f163faa07ba5153b..e4b6a301db66dd27a8d1cb275cb792043bc59e46 100644
index f465c6ab76a5a0b7afca7801d98cdda7ebcd3dca..d65dbd63062d637554a16bd648bf49adbf62e748 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1288,6 +1288,7 @@ public class PurpurWorldConfig {
@@ -1285,6 +1285,7 @@ public class PurpurWorldConfig {
public boolean creeperExplodeWhenKilled = false;
public boolean creeperHealthRadius = false;
public boolean creeperAlwaysDropExp = false;
@@ -43,7 +43,7 @@ index 2f139bc7a088e721e2da2823f163faa07ba5153b..e4b6a301db66dd27a8d1cb275cb79204
private void creeperSettings() {
creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
@@ -1305,6 +1306,7 @@ public class PurpurWorldConfig {
@@ -1302,6 +1303,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 2f139bc7a088e721e2da2823f163faa07ba5153b..e4b6a301db66dd27a8d1cb275cb79204
}
public boolean dolphinRidable = false;
@@ -2091,6 +2093,7 @@ public class PurpurWorldConfig {
@@ -2088,6 +2090,7 @@ public class PurpurWorldConfig {
public boolean piglinTakeDamageFromWater = false;
public int piglinPortalSpawnModifier = 2000;
public boolean piglinAlwaysDropExp = false;
@@ -59,7 +59,7 @@ index 2f139bc7a088e721e2da2823f163faa07ba5153b..e4b6a301db66dd27a8d1cb275cb79204
private void piglinSettings() {
piglinRidable = getBoolean("mobs.piglin.ridable", piglinRidable);
piglinRidableInWater = getBoolean("mobs.piglin.ridable-in-water", piglinRidableInWater);
@@ -2105,6 +2108,7 @@ public class PurpurWorldConfig {
@@ -2102,6 +2105,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 2f139bc7a088e721e2da2823f163faa07ba5153b..e4b6a301db66dd27a8d1cb275cb79204
}
public boolean piglinBruteRidable = false;
@@ -2366,6 +2370,7 @@ public class PurpurWorldConfig {
@@ -2363,6 +2367,7 @@ public class PurpurWorldConfig {
public double skeletonMaxHealth = 20.0D;
public boolean skeletonTakeDamageFromWater = false;
public boolean skeletonAlwaysDropExp = false;
@@ -75,7 +75,7 @@ index 2f139bc7a088e721e2da2823f163faa07ba5153b..e4b6a301db66dd27a8d1cb275cb79204
private void skeletonSettings() {
skeletonRidable = getBoolean("mobs.skeleton.ridable", skeletonRidable);
skeletonRidableInWater = getBoolean("mobs.skeleton.ridable-in-water", skeletonRidableInWater);
@@ -2378,6 +2383,7 @@ public class PurpurWorldConfig {
@@ -2375,6 +2380,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 2f139bc7a088e721e2da2823f163faa07ba5153b..e4b6a301db66dd27a8d1cb275cb79204
}
public boolean skeletonHorseRidableInWater = true;
@@ -2912,6 +2918,7 @@ public class PurpurWorldConfig {
@@ -2909,6 +2915,7 @@ public class PurpurWorldConfig {
public boolean zombieBypassMobGriefing = false;
public boolean zombieTakeDamageFromWater = false;
public boolean zombieAlwaysDropExp = false;
@@ -91,7 +91,7 @@ index 2f139bc7a088e721e2da2823f163faa07ba5153b..e4b6a301db66dd27a8d1cb275cb79204
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -2930,6 +2937,7 @@ public class PurpurWorldConfig {
@@ -2927,6 +2934,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);