make sniffer health attributes configurable

This commit is contained in:
granny
2023-03-21 23:35:58 -07:00
parent 20115a4b2e
commit ac3a469545
38 changed files with 238 additions and 213 deletions

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Add mobGriefing bypass to everything affected
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 56781b5cf331400703bdda49508390651b506208..11f7902e30771d5c279e0116b813295a5daf3510 100644
index b5d6060af4f806896ea499cad4073778ed5659e4..3ac340ec29845321e1ed4d1afb3687ba564b06b3 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -1715,7 +1715,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -374,7 +374,7 @@ index 1942649e868fc985a488034c411a6721595ecc67..7495e0e8beedad59fff24ebf189b58b3
}
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index a9cef10353547680630d5d7916858f027a2669e2..cbe45869a27177a7d83db1b6562fe91808baec6c 100644
index 71d4ba7f97b9898dca7efb55a81833b43a9624ee..8c21f611c515a18fae777d86e96f9010a921b75a 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -117,8 +117,11 @@ public class PurpurWorldConfig {
@@ -629,7 +629,7 @@ index a9cef10353547680630d5d7916858f027a2669e2..cbe45869a27177a7d83db1b6562fe918
}
public boolean snifferRidable = false;
@@ -1836,6 +1875,7 @@ public class PurpurWorldConfig {
@@ -1838,6 +1877,7 @@ public class PurpurWorldConfig {
public int villagerBreedingTicks = 6000;
public boolean villagerClericsFarmWarts = false;
public boolean villagerClericFarmersThrowWarts = true;
@@ -637,7 +637,7 @@ index a9cef10353547680630d5d7916858f027a2669e2..cbe45869a27177a7d83db1b6562fe918
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1852,6 +1892,7 @@ public class PurpurWorldConfig {
@@ -1854,6 +1894,7 @@ public class PurpurWorldConfig {
villagerBreedingTicks = getInt("mobs.villager.breeding-delay-ticks", villagerBreedingTicks);
villagerClericsFarmWarts = getBoolean("mobs.villager.clerics-farm-warts", villagerClericsFarmWarts);
villagerClericFarmersThrowWarts = getBoolean("mobs.villager.cleric-wart-farmers-throw-warts-at-villagers", villagerClericFarmersThrowWarts);
@@ -645,7 +645,7 @@ index a9cef10353547680630d5d7916858f027a2669e2..cbe45869a27177a7d83db1b6562fe918
}
public boolean vindicatorRidable = false;
@@ -1924,6 +1965,7 @@ public class PurpurWorldConfig {
@@ -1926,6 +1967,7 @@ public class PurpurWorldConfig {
public double witherMaxHealth = 300.0D;
public float witherHealthRegenAmount = 1.0f;
public int witherHealthRegenDelay = 20;
@@ -653,7 +653,7 @@ index a9cef10353547680630d5d7916858f027a2669e2..cbe45869a27177a7d83db1b6562fe918
private void witherSettings() {
witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
@@ -1941,6 +1983,7 @@ public class PurpurWorldConfig {
@@ -1943,6 +1985,7 @@ public class PurpurWorldConfig {
witherMaxHealth = getDouble("mobs.wither.attributes.max_health", witherMaxHealth);
witherHealthRegenAmount = (float) getDouble("mobs.wither.health-regen-amount", witherHealthRegenAmount);
witherHealthRegenDelay = getInt("mobs.wither.health-regen-delay", witherHealthRegenDelay);
@@ -661,7 +661,7 @@ index a9cef10353547680630d5d7916858f027a2669e2..cbe45869a27177a7d83db1b6562fe918
}
public boolean witherSkeletonRidable = false;
@@ -2012,6 +2055,7 @@ public class PurpurWorldConfig {
@@ -2014,6 +2057,7 @@ public class PurpurWorldConfig {
public double zombieJockeyChance = 0.05D;
public boolean zombieJockeyTryExistingChickens = true;
public boolean zombieAggressiveTowardsVillagerWhenLagging = true;
@@ -669,7 +669,7 @@ index a9cef10353547680630d5d7916858f027a2669e2..cbe45869a27177a7d83db1b6562fe918
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -2027,6 +2071,7 @@ public class PurpurWorldConfig {
@@ -2029,6 +2073,7 @@ public class PurpurWorldConfig {
zombieJockeyChance = getDouble("mobs.zombie.jockey.chance", zombieJockeyChance);
zombieJockeyTryExistingChickens = getBoolean("mobs.zombie.jockey.try-existing-chickens", zombieJockeyTryExistingChickens);
zombieAggressiveTowardsVillagerWhenLagging = getBoolean("mobs.zombie.aggressive-towards-villager-when-lagging", zombieAggressiveTowardsVillagerWhenLagging);