[ci-skip] clean up stray imports

This commit is contained in:
granny
2023-08-13 07:48:40 -07:00
parent cf3dca9776
commit 1846bae1b6
205 changed files with 905 additions and 923 deletions

View File

@@ -32,10 +32,10 @@ index 21d6851cb903f214db92109a6c16bb7367e40e1c..aff8b1b0683e52038b6d92e052a012c9
// 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 3cfb762c9c8af78ba6320d563516e879530a1f95..29cf03dec710b56b6f8ebdf25965e69f89c69879 100644
index 30e63ae6bc35efc64a016966f55bfb1e7df52d89..91af2d4187b2e61426539d018900c810d048efc9 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1311,6 +1311,7 @@ public class PurpurWorldConfig {
@@ -1309,6 +1309,7 @@ public class PurpurWorldConfig {
public boolean creeperExplodeWhenKilled = false;
public boolean creeperHealthRadius = false;
public boolean creeperAlwaysDropExp = false;
@@ -43,7 +43,7 @@ index 3cfb762c9c8af78ba6320d563516e879530a1f95..29cf03dec710b56b6f8ebdf25965e69f
private void creeperSettings() {
creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
@@ -1328,6 +1329,7 @@ public class PurpurWorldConfig {
@@ -1326,6 +1327,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 3cfb762c9c8af78ba6320d563516e879530a1f95..29cf03dec710b56b6f8ebdf25965e69f
}
public boolean dolphinRidable = false;
@@ -2114,6 +2116,7 @@ public class PurpurWorldConfig {
@@ -2112,6 +2114,7 @@ public class PurpurWorldConfig {
public boolean piglinTakeDamageFromWater = false;
public int piglinPortalSpawnModifier = 2000;
public boolean piglinAlwaysDropExp = false;
@@ -59,7 +59,7 @@ index 3cfb762c9c8af78ba6320d563516e879530a1f95..29cf03dec710b56b6f8ebdf25965e69f
private void piglinSettings() {
piglinRidable = getBoolean("mobs.piglin.ridable", piglinRidable);
piglinRidableInWater = getBoolean("mobs.piglin.ridable-in-water", piglinRidableInWater);
@@ -2128,6 +2131,7 @@ public class PurpurWorldConfig {
@@ -2126,6 +2129,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 3cfb762c9c8af78ba6320d563516e879530a1f95..29cf03dec710b56b6f8ebdf25965e69f
}
public boolean piglinBruteRidable = false;
@@ -2389,6 +2393,7 @@ public class PurpurWorldConfig {
@@ -2387,6 +2391,7 @@ public class PurpurWorldConfig {
public double skeletonMaxHealth = 20.0D;
public boolean skeletonTakeDamageFromWater = false;
public boolean skeletonAlwaysDropExp = false;
@@ -75,7 +75,7 @@ index 3cfb762c9c8af78ba6320d563516e879530a1f95..29cf03dec710b56b6f8ebdf25965e69f
private void skeletonSettings() {
skeletonRidable = getBoolean("mobs.skeleton.ridable", skeletonRidable);
skeletonRidableInWater = getBoolean("mobs.skeleton.ridable-in-water", skeletonRidableInWater);
@@ -2401,6 +2406,7 @@ public class PurpurWorldConfig {
@@ -2399,6 +2404,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 3cfb762c9c8af78ba6320d563516e879530a1f95..29cf03dec710b56b6f8ebdf25965e69f
}
public boolean skeletonHorseRidableInWater = true;
@@ -2935,6 +2941,7 @@ public class PurpurWorldConfig {
@@ -2933,6 +2939,7 @@ public class PurpurWorldConfig {
public boolean zombieBypassMobGriefing = false;
public boolean zombieTakeDamageFromWater = false;
public boolean zombieAlwaysDropExp = false;
@@ -91,7 +91,7 @@ index 3cfb762c9c8af78ba6320d563516e879530a1f95..29cf03dec710b56b6f8ebdf25965e69f
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -2953,6 +2960,7 @@ public class PurpurWorldConfig {
@@ -2951,6 +2958,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);