Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 18:07:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

it compiles \o/

Browse Source
This commit is contained in:
granny
2023-03-16 02:12:43 -07:00
parent 3c0d4f1d84
commit 55dbafe799
64 changed files with 599 additions and 814 deletions
Download Patch File Download Diff File Expand all files Collapse all files

140
patches/server/0130-Toggle-for-water-sensitive-mob-damage.patch
View File

@@ -1,6 +1,6 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: YouHaveTrouble <garrenpolska@gmail.com>
Date: Fri, 5 Feb 2021 01:11:22 +0100
From: granny <granny@purpurmc.org>
Date: Thu, 16 Mar 2023 02:43:15 -0700
Subject: [PATCH] Toggle for water sensitive mob damage
@@ -427,10 +427,10 @@ index 1af75e173958c192b8f53b7e17e75d980cbbbcbc..5e705c84e5deeb3b3bdede80bf2acd9a
@Override
diff --git a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
index 9fc6241c08aabfb4e21ee1eb4fb15226c718e0a4..85d08932d2941f2e75d2449d1a7a6223d529e295 100644
index b627fee1cb19f476f45921f1fae7624b27ff7280..e47d4b920737cca51fa4003e79030258685d7e1a 100644
--- a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
+++ b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
@@ -114,6 +114,11 @@ public class Goat extends Animal {
@@ -109,6 +109,11 @@ public class Goat extends Animal {
public int getPurpurBreedTime() {
return this.level.purpurConfig.goatBreedingTicks;
}
@@ -443,10 +443,10 @@ index 9fc6241c08aabfb4e21ee1eb4fb15226c718e0a4..85d08932d2941f2e75d2449d1a7a6223
@Override
diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java b/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java
index 56746fca617a0ede20b6d71e8f2a39400f529b25..c71127d7adb24a1bd14641b79839666412d08662 100644
index efe381ff8d43295bcaf0d4fb7ff75f2bf46391eb..1b2838de60399e83fe6de91b368bfc5d9aa7a805 100644
--- a/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java
+++ b/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java
@@ -40,6 +40,11 @@ public class Donkey extends AbstractChestedHorse {
@@ -25,6 +25,11 @@ public class Donkey extends AbstractChestedHorse {
public int getPurpurBreedTime() {
return this.level.purpurConfig.donkeyBreedingTicks;
}
@@ -459,10 +459,10 @@ index 56746fca617a0ede20b6d71e8f2a39400f529b25..c71127d7adb24a1bd14641b798396664
@Override
diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java b/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java
index 7984e920034af1cfa68179f82b9a51c5345cceb5..22f8d501e2dfb765f0cf3f199efed7c5b1067581 100644
index 2dbcebf7c370d4f5a51b5a23e67306c6c1ab83ba..02c090a15271a2d597278d01c850d842b4e7a9fd 100644
--- a/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java
+++ b/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java
@@ -65,6 +65,11 @@ public class Horse extends AbstractHorse implements VariantHolder<Variant> {
@@ -50,6 +50,11 @@ public class Horse extends AbstractHorse implements VariantHolder<Variant> {
public int getPurpurBreedTime() {
return this.level.purpurConfig.horseBreedingTicks;
}
@@ -475,10 +475,10 @@ index 7984e920034af1cfa68179f82b9a51c5345cceb5..22f8d501e2dfb765f0cf3f199efed7c5
@Override
diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
index d83ab783d5faeea8af25826ec24a337abb852e98..ce31da2f68c5468703ee24e546b829e9006e1eab 100644
index 4165c7d54d00e356767dc56be86f5bff6aa8e8bb..185749df0c7c08f625145a29810ffed6042550bb 100644
--- a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
+++ b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
@@ -141,6 +141,11 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
@@ -126,6 +126,11 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
public int getPurpurBreedTime() {
return this.level.purpurConfig.llamaBreedingTicks;
}
@@ -491,10 +491,10 @@ index d83ab783d5faeea8af25826ec24a337abb852e98..ce31da2f68c5468703ee24e546b829e9
public boolean isTraderLlama() {
diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java b/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java
index 205a738ce558eb0d2686e945b5831151fe7f1c2f..32ade7ae57c5fe598e51c8f2d805b280f00e8a2e 100644
index ddb31f39182f7e2dd3c3a0b521563a0983b548cd..5bcbe92441bf51f4303bb7dacd4c439ce160c1a9 100644
--- a/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java
+++ b/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java
@@ -39,6 +39,11 @@ public class Mule extends AbstractChestedHorse {
@@ -24,6 +24,11 @@ public class Mule extends AbstractChestedHorse {
public int getPurpurBreedTime() {
return this.level.purpurConfig.muleBreedingTicks;
}
@@ -507,10 +507,10 @@ index 205a738ce558eb0d2686e945b5831151fe7f1c2f..32ade7ae57c5fe598e51c8f2d805b280
@Override
diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonHorse.java b/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonHorse.java
index 244e38548c1ccbf0720dc074a2385d21f5edd7ad..a0a28c3d682bd96ac65151293fb8429de42c905c 100644
index 33250d34cc6e2733330f9c4a42f498b2bbc73b33..6b97898fae19e755b57eb13e2577e774024ba1e3 100644
--- a/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonHorse.java
+++ b/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonHorse.java
@@ -53,6 +53,11 @@ public class SkeletonHorse extends AbstractHorse {
@@ -38,6 +38,11 @@ public class SkeletonHorse extends AbstractHorse {
public int getPurpurBreedTime() {
return 6000;
}
@@ -523,10 +523,10 @@ index 244e38548c1ccbf0720dc074a2385d21f5edd7ad..a0a28c3d682bd96ac65151293fb8429d
public static AttributeSupplier.Builder createAttributes() {
diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/TraderLlama.java b/src/main/java/net/minecraft/world/entity/animal/horse/TraderLlama.java
index 494bd7180a8c0dc6bfdff5c2fb989efefaaf77ee..02b6f2ce6831eb68442d1a4b47764426830dedb5 100644
index e723506f1fced33e945340392545e7970ddeb6cc..86e14420d499e0dccbd7a8dcae2623feef1328aa 100644
--- a/src/main/java/net/minecraft/world/entity/animal/horse/TraderLlama.java
+++ b/src/main/java/net/minecraft/world/entity/animal/horse/TraderLlama.java
@@ -67,6 +67,11 @@ public class TraderLlama extends Llama {
@@ -52,6 +52,11 @@ public class TraderLlama extends Llama {
public int getPurpurBreedTime() {
return this.level.purpurConfig.traderLlamaBreedingTicks;
}
@@ -539,10 +539,10 @@ index 494bd7180a8c0dc6bfdff5c2fb989efefaaf77ee..02b6f2ce6831eb68442d1a4b47764426
@Override
diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java b/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java
index 2b3c197ff241f19ba251f08e080129280b3219f3..a3e33c2a7bbabc0e295c5ed93ca6030b39b10efb 100644
index df438bc84c5b90f2fc66965f926dc2efeb6563c1..89b4748289230ca63fbf6de41e82b7dd7fa768b1 100644
--- a/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java
+++ b/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java
@@ -51,6 +51,11 @@ public class ZombieHorse extends AbstractHorse {
@@ -36,6 +36,11 @@ public class ZombieHorse extends AbstractHorse {
public int getPurpurBreedTime() {
return 6000;
}
@@ -1197,7 +1197,7 @@ index fbbeacb94aeda40e9fc5c0553ab68948de9019c4..64c8890a54a10abd454a62671fbabfcf
@Override
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index eab135372764fe2be0244cddadaa8891bba0fb45..fb2aa8f5e3d7e53c5eac037e5dfca25a03e6ca9c 100644
index 1cada527ffee79197c54f2504b3c4616746f8e9c..efee0da104d1ad78d7a4c99338f530727d2d2be0 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -577,11 +577,13 @@ public class PurpurWorldConfig {
@@ -1372,8 +1372,8 @@ index eab135372764fe2be0244cddadaa8891bba0fb45..fb2aa8f5e3d7e53c5eac037e5dfca25a
public boolean donkeyRidableInWater = false;
@@ -816,6 +838,7 @@ public class PurpurWorldConfig {
public double donkeyMovementSpeedMin = 0.175D;
public double donkeyMovementSpeedMax = 0.175D;
public double donkeyMovementSpeedMin = 0.175D; // TODO: re-implement
public double donkeyMovementSpeedMax = 0.175D; // TODO: re-implement
public int donkeyBreedingTicks = 6000;
+ public boolean donkeyTakeDamageFromWater = false;
private void donkeySettings() {
@@ -1587,8 +1587,8 @@ index eab135372764fe2be0244cddadaa8891bba0fb45..fb2aa8f5e3d7e53c5eac037e5dfca25a
public boolean horseRidableInWater = false;
@@ -1103,6 +1153,7 @@ public class PurpurWorldConfig {
public double horseMovementSpeedMin = 0.1125D;
public double horseMovementSpeedMax = 0.3375D;
public double horseMovementSpeedMin = 0.1125D; // TODO: re-implement
public double horseMovementSpeedMax = 0.3375D; // TODO: re-implement
public int horseBreedingTicks = 6000;
+ public boolean horseTakeDamageFromWater = false;
private void horseSettings() {
@@ -1651,8 +1651,8 @@ index eab135372764fe2be0244cddadaa8891bba0fb45..fb2aa8f5e3d7e53c5eac037e5dfca25a
public boolean llamaRidable = false;
@@ -1197,6 +1255,7 @@ public class PurpurWorldConfig {
public double llamaMovementSpeedMin = 0.175D;
public double llamaMovementSpeedMax = 0.175D;
public double llamaMovementSpeedMin = 0.175D; // TODO: re-implement
public double llamaMovementSpeedMax = 0.175D; // TODO: re-implement
public int llamaBreedingTicks = 6000;
+ public boolean llamaTakeDamageFromWater = false;
private void llamaSettings() {
@@ -1699,8 +1699,8 @@ index eab135372764fe2be0244cddadaa8891bba0fb45..fb2aa8f5e3d7e53c5eac037e5dfca25a
public boolean muleRidableInWater = false;
@@ -1265,6 +1329,7 @@ public class PurpurWorldConfig {
public double muleMovementSpeedMin = 0.175D;
public double muleMovementSpeedMax = 0.175D;
public double muleMovementSpeedMin = 0.175D; // TODO: re-implement
public double muleMovementSpeedMax = 0.175D; // TODO: re-implement
public int muleBreedingTicks = 6000;
+ public boolean muleTakeDamageFromWater = false;
private void muleSettings() {
@@ -1980,9 +1980,9 @@ index eab135372764fe2be0244cddadaa8891bba0fb45..fb2aa8f5e3d7e53c5eac037e5dfca25a
public boolean skeletonHorseRidableInWater = true;
@@ -1640,6 +1740,7 @@ public class PurpurWorldConfig {
public double skeletonHorseJumpStrengthMax = 1.0D;
public double skeletonHorseMovementSpeedMin = 0.2D;
public double skeletonHorseMovementSpeedMax = 0.2D;
public double skeletonHorseJumpStrengthMax = 1.0D; // TODO: re-implement
public double skeletonHorseMovementSpeedMin = 0.2D; // TODO: re-implement
public double skeletonHorseMovementSpeedMax = 0.2D; // TODO: re-implement
+ public boolean skeletonHorseTakeDamageFromWater = false;
private void skeletonHorseSettings() {
skeletonHorseRidableInWater = getBoolean("mobs.skeleton_horse.ridable-in-water", skeletonHorseRidableInWater);
@@ -2026,8 +2026,8 @@ index eab135372764fe2be0244cddadaa8891bba0fb45..fb2aa8f5e3d7e53c5eac037e5dfca25a
+ snowGolemTakeDamageFromWater = getBoolean("mobs.snow_golem.takes-damage-from-water", snowGolemTakeDamageFromWater);
}
public boolean squidRidable = false;
@@ -1717,6 +1823,7 @@ public class PurpurWorldConfig {
public int snifferBreedingTicks = 6000;
@@ -1722,6 +1828,7 @@ public class PurpurWorldConfig {
public boolean squidImmuneToEAR = true;
public double squidOffsetWaterCheck = 0.0D;
public boolean squidsCanFly = false;
@@ -2035,7 +2035,7 @@ index eab135372764fe2be0244cddadaa8891bba0fb45..fb2aa8f5e3d7e53c5eac037e5dfca25a
private void squidSettings() {
squidRidable = getBoolean("mobs.squid.ridable", squidRidable);
squidControllable = getBoolean("mobs.squid.controllable", squidControllable);
@@ -1729,12 +1836,14 @@ public class PurpurWorldConfig {
@@ -1734,12 +1841,14 @@ public class PurpurWorldConfig {
squidImmuneToEAR = getBoolean("mobs.squid.immune-to-EAR", squidImmuneToEAR);
squidOffsetWaterCheck = getDouble("mobs.squid.water-offset-check", squidOffsetWaterCheck);
squidsCanFly = getBoolean("mobs.squid.can-fly", squidsCanFly);
@@ -2050,7 +2050,7 @@ index eab135372764fe2be0244cddadaa8891bba0fb45..fb2aa8f5e3d7e53c5eac037e5dfca25a
private void spiderSettings() {
spiderRidable = getBoolean("mobs.spider.ridable", spiderRidable);
spiderRidableInWater = getBoolean("mobs.spider.ridable-in-water", spiderRidableInWater);
@@ -1745,12 +1854,14 @@ public class PurpurWorldConfig {
@@ -1750,12 +1859,14 @@ public class PurpurWorldConfig {
set("mobs.spider.attributes.max_health", oldValue);
}
spiderMaxHealth = getDouble("mobs.spider.attributes.max_health", spiderMaxHealth);
@@ -2065,7 +2065,7 @@ index eab135372764fe2be0244cddadaa8891bba0fb45..fb2aa8f5e3d7e53c5eac037e5dfca25a
private void straySettings() {
strayRidable = getBoolean("mobs.stray.ridable", strayRidable);
strayRidableInWater = getBoolean("mobs.stray.ridable-in-water", strayRidableInWater);
@@ -1761,6 +1872,7 @@ public class PurpurWorldConfig {
@@ -1766,6 +1877,7 @@ public class PurpurWorldConfig {
set("mobs.stray.attributes.max_health", oldValue);
}
strayMaxHealth = getDouble("mobs.stray.attributes.max_health", strayMaxHealth);
@@ -2073,7 +2073,7 @@ index eab135372764fe2be0244cddadaa8891bba0fb45..fb2aa8f5e3d7e53c5eac037e5dfca25a
}
public boolean striderRidable = false;
@@ -1769,6 +1881,7 @@ public class PurpurWorldConfig {
@@ -1774,6 +1886,7 @@ public class PurpurWorldConfig {
public double striderMaxHealth = 20.0D;
public int striderBreedingTicks = 6000;
public boolean striderGiveSaddleBack = false;
@@ -2081,7 +2081,7 @@ index eab135372764fe2be0244cddadaa8891bba0fb45..fb2aa8f5e3d7e53c5eac037e5dfca25a
private void striderSettings() {
striderRidable = getBoolean("mobs.strider.ridable", striderRidable);
striderRidableInWater = getBoolean("mobs.strider.ridable-in-water", striderRidableInWater);
@@ -1781,6 +1894,7 @@ public class PurpurWorldConfig {
@@ -1786,6 +1899,7 @@ public class PurpurWorldConfig {
striderMaxHealth = getDouble("mobs.strider.attributes.max_health", striderMaxHealth);
striderBreedingTicks = getInt("mobs.strider.breeding-delay-ticks", striderBreedingTicks);
striderGiveSaddleBack = getBoolean("mobs.strider.give-saddle-back", striderGiveSaddleBack);
@@ -2089,15 +2089,15 @@ index eab135372764fe2be0244cddadaa8891bba0fb45..fb2aa8f5e3d7e53c5eac037e5dfca25a
}
public boolean tadpoleRidable = false;
@@ -1802,6 +1916,7 @@ public class PurpurWorldConfig {
public double traderLlamaMovementSpeedMin = 0.175D;
public double traderLlamaMovementSpeedMax = 0.175D;
@@ -1807,6 +1921,7 @@ public class PurpurWorldConfig {
public double traderLlamaMovementSpeedMin = 0.175D; // TODO: re-implement
public double traderLlamaMovementSpeedMax = 0.175D; // TODO: re-implement
public int traderLlamaBreedingTicks = 6000;
+ public boolean traderLlamaTakeDamageFromWater = false;
private void traderLlamaSettings() {
traderLlamaRidable = getBoolean("mobs.trader_llama.ridable", traderLlamaRidable);
traderLlamaRidableInWater = getBoolean("mobs.trader_llama.ridable-in-water", traderLlamaRidableInWater);
@@ -1820,11 +1935,13 @@ public class PurpurWorldConfig {
@@ -1825,11 +1940,13 @@ public class PurpurWorldConfig {
traderLlamaMovementSpeedMin = getDouble("mobs.trader_llama.attributes.movement_speed.min", traderLlamaMovementSpeedMin);
traderLlamaMovementSpeedMax = getDouble("mobs.trader_llama.attributes.movement_speed.max", traderLlamaMovementSpeedMax);
traderLlamaBreedingTicks = getInt("mobs.trader_llama.breeding-delay-ticks", traderLlamaBreedingTicks);
@@ -2111,7 +2111,7 @@ index eab135372764fe2be0244cddadaa8891bba0fb45..fb2aa8f5e3d7e53c5eac037e5dfca25a
private void tropicalFishSettings() {
tropicalFishRidable = getBoolean("mobs.tropical_fish.ridable", tropicalFishRidable);
tropicalFishControllable = getBoolean("mobs.tropical_fish.controllable", tropicalFishControllable);
@@ -1834,6 +1951,7 @@ public class PurpurWorldConfig {
@@ -1839,6 +1956,7 @@ public class PurpurWorldConfig {
set("mobs.tropical_fish.attributes.max_health", oldValue);
}
tropicalFishMaxHealth = getDouble("mobs.tropical_fish.attributes.max_health", tropicalFishMaxHealth);
@@ -2119,7 +2119,7 @@ index eab135372764fe2be0244cddadaa8891bba0fb45..fb2aa8f5e3d7e53c5eac037e5dfca25a
}
public boolean turtleRidable = false;
@@ -1841,6 +1959,7 @@ public class PurpurWorldConfig {
@@ -1846,6 +1964,7 @@ public class PurpurWorldConfig {
public boolean turtleControllable = true;
public double turtleMaxHealth = 30.0D;
public int turtleBreedingTicks = 6000;
@@ -2127,7 +2127,7 @@ index eab135372764fe2be0244cddadaa8891bba0fb45..fb2aa8f5e3d7e53c5eac037e5dfca25a
private void turtleSettings() {
turtleRidable = getBoolean("mobs.turtle.ridable", turtleRidable);
turtleRidableInWater = getBoolean("mobs.turtle.ridable-in-water", turtleRidableInWater);
@@ -1852,6 +1971,7 @@ public class PurpurWorldConfig {
@@ -1857,6 +1976,7 @@ public class PurpurWorldConfig {
}
turtleMaxHealth = getDouble("mobs.turtle.attributes.max_health", turtleMaxHealth);
turtleBreedingTicks = getInt("mobs.turtle.breeding-delay-ticks", turtleBreedingTicks);
@@ -2135,7 +2135,7 @@ index eab135372764fe2be0244cddadaa8891bba0fb45..fb2aa8f5e3d7e53c5eac037e5dfca25a
}
public boolean vexRidable = false;
@@ -1859,6 +1979,7 @@ public class PurpurWorldConfig {
@@ -1864,6 +1984,7 @@ public class PurpurWorldConfig {
public boolean vexControllable = true;
public double vexMaxY = 320D;
public double vexMaxHealth = 14.0D;
@@ -2143,7 +2143,7 @@ index eab135372764fe2be0244cddadaa8891bba0fb45..fb2aa8f5e3d7e53c5eac037e5dfca25a
private void vexSettings() {
vexRidable = getBoolean("mobs.vex.ridable", vexRidable);
vexRidableInWater = getBoolean("mobs.vex.ridable-in-water", vexRidableInWater);
@@ -1870,6 +1991,7 @@ public class PurpurWorldConfig {
@@ -1875,6 +1996,7 @@ public class PurpurWorldConfig {
set("mobs.vex.attributes.max_health", oldValue);
}
vexMaxHealth = getDouble("mobs.vex.attributes.max_health", vexMaxHealth);
@@ -2151,7 +2151,7 @@ index eab135372764fe2be0244cddadaa8891bba0fb45..fb2aa8f5e3d7e53c5eac037e5dfca25a
}
public boolean villagerRidable = false;
@@ -1883,6 +2005,7 @@ public class PurpurWorldConfig {
@@ -1888,6 +2010,7 @@ public class PurpurWorldConfig {
public boolean villagerClericsFarmWarts = false;
public boolean villagerClericFarmersThrowWarts = true;
public boolean villagerBypassMobGriefing = false;
@@ -2159,7 +2159,7 @@ index eab135372764fe2be0244cddadaa8891bba0fb45..fb2aa8f5e3d7e53c5eac037e5dfca25a
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1900,6 +2023,7 @@ public class PurpurWorldConfig {
@@ -1905,6 +2028,7 @@ public class PurpurWorldConfig {
villagerClericsFarmWarts = getBoolean("mobs.villager.clerics-farm-warts", villagerClericsFarmWarts);
villagerClericFarmersThrowWarts = getBoolean("mobs.villager.cleric-wart-farmers-throw-warts-at-villagers", villagerClericFarmersThrowWarts);
villagerBypassMobGriefing = getBoolean("mobs.villager.bypass-mob-griefing", villagerBypassMobGriefing);
@@ -2167,7 +2167,7 @@ index eab135372764fe2be0244cddadaa8891bba0fb45..fb2aa8f5e3d7e53c5eac037e5dfca25a
}
public boolean vindicatorRidable = false;
@@ -1907,6 +2031,7 @@ public class PurpurWorldConfig {
@@ -1912,6 +2036,7 @@ public class PurpurWorldConfig {
public boolean vindicatorControllable = true;
public double vindicatorMaxHealth = 24.0D;
public double vindicatorJohnnySpawnChance = 0D;
@@ -2175,7 +2175,7 @@ index eab135372764fe2be0244cddadaa8891bba0fb45..fb2aa8f5e3d7e53c5eac037e5dfca25a
private void vindicatorSettings() {
vindicatorRidable = getBoolean("mobs.vindicator.ridable", vindicatorRidable);
vindicatorRidableInWater = getBoolean("mobs.vindicator.ridable-in-water", vindicatorRidableInWater);
@@ -1918,6 +2043,7 @@ public class PurpurWorldConfig {
@@ -1923,6 +2048,7 @@ public class PurpurWorldConfig {
}
vindicatorMaxHealth = getDouble("mobs.vindicator.attributes.max_health", vindicatorMaxHealth);
vindicatorJohnnySpawnChance = getDouble("mobs.vindicator.johnny.spawn-chance", vindicatorJohnnySpawnChance);
@@ -2183,7 +2183,7 @@ index eab135372764fe2be0244cddadaa8891bba0fb45..fb2aa8f5e3d7e53c5eac037e5dfca25a
}
public boolean wanderingTraderRidable = false;
@@ -1926,6 +2052,7 @@ public class PurpurWorldConfig {
@@ -1931,6 +2057,7 @@ public class PurpurWorldConfig {
public double wanderingTraderMaxHealth = 20.0D;
public boolean wanderingTraderFollowEmeraldBlock = false;
public boolean wanderingTraderCanBeLeashed = false;
@@ -2191,7 +2191,7 @@ index eab135372764fe2be0244cddadaa8891bba0fb45..fb2aa8f5e3d7e53c5eac037e5dfca25a
private void wanderingTraderSettings() {
wanderingTraderRidable = getBoolean("mobs.wandering_trader.ridable", wanderingTraderRidable);
wanderingTraderRidableInWater = getBoolean("mobs.wandering_trader.ridable-in-water", wanderingTraderRidableInWater);
@@ -1938,6 +2065,7 @@ public class PurpurWorldConfig {
@@ -1943,6 +2070,7 @@ public class PurpurWorldConfig {
wanderingTraderMaxHealth = getDouble("mobs.wandering_trader.attributes.max_health", wanderingTraderMaxHealth);
wanderingTraderFollowEmeraldBlock = getBoolean("mobs.wandering_trader.follow-emerald-blocks", wanderingTraderFollowEmeraldBlock);
wanderingTraderCanBeLeashed = getBoolean("mobs.wandering_trader.can-be-leashed", wanderingTraderCanBeLeashed);
@@ -2199,7 +2199,7 @@ index eab135372764fe2be0244cddadaa8891bba0fb45..fb2aa8f5e3d7e53c5eac037e5dfca25a
}
public boolean wardenRidable = false;
@@ -1953,6 +2081,7 @@ public class PurpurWorldConfig {
@@ -1958,6 +2086,7 @@ public class PurpurWorldConfig {
public boolean witchRidableInWater = false;
public boolean witchControllable = true;
public double witchMaxHealth = 26.0D;
@@ -2207,7 +2207,7 @@ index eab135372764fe2be0244cddadaa8891bba0fb45..fb2aa8f5e3d7e53c5eac037e5dfca25a
private void witchSettings() {
witchRidable = getBoolean("mobs.witch.ridable", witchRidable);
witchRidableInWater = getBoolean("mobs.witch.ridable-in-water", witchRidableInWater);
@@ -1963,6 +2092,7 @@ public class PurpurWorldConfig {
@@ -1968,6 +2097,7 @@ public class PurpurWorldConfig {
set("mobs.witch.attributes.max_health", oldValue);
}
witchMaxHealth = getDouble("mobs.witch.attributes.max_health", witchMaxHealth);
@@ -2215,7 +2215,7 @@ index eab135372764fe2be0244cddadaa8891bba0fb45..fb2aa8f5e3d7e53c5eac037e5dfca25a
}
public boolean witherRidable = false;
@@ -1973,6 +2103,7 @@ public class PurpurWorldConfig {
@@ -1978,6 +2108,7 @@ public class PurpurWorldConfig {
public float witherHealthRegenAmount = 1.0f;
public int witherHealthRegenDelay = 20;
public boolean witherBypassMobGriefing = false;
@@ -2223,7 +2223,7 @@ index eab135372764fe2be0244cddadaa8891bba0fb45..fb2aa8f5e3d7e53c5eac037e5dfca25a
private void witherSettings() {
witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
@@ -1991,12 +2122,14 @@ public class PurpurWorldConfig {
@@ -1996,12 +2127,14 @@ public class PurpurWorldConfig {
witherHealthRegenAmount = (float) getDouble("mobs.wither.health-regen-amount", witherHealthRegenAmount);
witherHealthRegenDelay = getInt("mobs.wither.health-regen-delay", witherHealthRegenDelay);
witherBypassMobGriefing = getBoolean("mobs.wither.bypass-mob-griefing", witherBypassMobGriefing);
@@ -2238,7 +2238,7 @@ index eab135372764fe2be0244cddadaa8891bba0fb45..fb2aa8f5e3d7e53c5eac037e5dfca25a
private void witherSkeletonSettings() {
witherSkeletonRidable = getBoolean("mobs.wither_skeleton.ridable", witherSkeletonRidable);
witherSkeletonRidableInWater = getBoolean("mobs.wither_skeleton.ridable-in-water", witherSkeletonRidableInWater);
@@ -2007,6 +2140,7 @@ public class PurpurWorldConfig {
@@ -2012,6 +2145,7 @@ public class PurpurWorldConfig {
set("mobs.wither_skeleton.attributes.max_health", oldValue);
}
witherSkeletonMaxHealth = getDouble("mobs.wither_skeleton.attributes.max_health", witherSkeletonMaxHealth);
@@ -2246,7 +2246,7 @@ index eab135372764fe2be0244cddadaa8891bba0fb45..fb2aa8f5e3d7e53c5eac037e5dfca25a
}
public boolean wolfRidable = false;
@@ -2017,6 +2151,7 @@ public class PurpurWorldConfig {
@@ -2022,6 +2156,7 @@ public class PurpurWorldConfig {
public boolean wolfMilkCuresRabies = true;
public double wolfNaturalRabid = 0.0D;
public int wolfBreedingTicks = 6000;
@@ -2254,7 +2254,7 @@ index eab135372764fe2be0244cddadaa8891bba0fb45..fb2aa8f5e3d7e53c5eac037e5dfca25a
private void wolfSettings() {
wolfRidable = getBoolean("mobs.wolf.ridable", wolfRidable);
wolfRidableInWater = getBoolean("mobs.wolf.ridable-in-water", wolfRidableInWater);
@@ -2035,12 +2170,14 @@ public class PurpurWorldConfig {
@@ -2040,12 +2175,14 @@ public class PurpurWorldConfig {
wolfMilkCuresRabies = getBoolean("mobs.wolf.milk-cures-rabid-wolves", wolfMilkCuresRabies);
wolfNaturalRabid = getDouble("mobs.wolf.spawn-rabid-chance", wolfNaturalRabid);
wolfBreedingTicks = getInt("mobs.wolf.breeding-delay-ticks", wolfBreedingTicks);
@@ -2269,7 +2269,7 @@ index eab135372764fe2be0244cddadaa8891bba0fb45..fb2aa8f5e3d7e53c5eac037e5dfca25a
private void zoglinSettings() {
zoglinRidable = getBoolean("mobs.zoglin.ridable", zoglinRidable);
zoglinRidableInWater = getBoolean("mobs.zoglin.ridable-in-water", zoglinRidableInWater);
@@ -2051,6 +2188,7 @@ public class PurpurWorldConfig {
@@ -2056,6 +2193,7 @@ public class PurpurWorldConfig {
set("mobs.zoglin.attributes.max_health", oldValue);
}
zoglinMaxHealth = getDouble("mobs.zoglin.attributes.max_health", zoglinMaxHealth);
@@ -2277,7 +2277,7 @@ index eab135372764fe2be0244cddadaa8891bba0fb45..fb2aa8f5e3d7e53c5eac037e5dfca25a
}
public boolean zombieRidable = false;
@@ -2063,6 +2201,7 @@ public class PurpurWorldConfig {
@@ -2068,6 +2206,7 @@ public class PurpurWorldConfig {
public boolean zombieJockeyTryExistingChickens = true;
public boolean zombieAggressiveTowardsVillagerWhenLagging = true;
public boolean zombieBypassMobGriefing = false;
@@ -2285,7 +2285,7 @@ index eab135372764fe2be0244cddadaa8891bba0fb45..fb2aa8f5e3d7e53c5eac037e5dfca25a
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -2079,6 +2218,7 @@ public class PurpurWorldConfig {
@@ -2084,6 +2223,7 @@ public class PurpurWorldConfig {
zombieJockeyTryExistingChickens = getBoolean("mobs.zombie.jockey.try-existing-chickens", zombieJockeyTryExistingChickens);
zombieAggressiveTowardsVillagerWhenLagging = getBoolean("mobs.zombie.aggressive-towards-villager-when-lagging", zombieAggressiveTowardsVillagerWhenLagging);
zombieBypassMobGriefing = getBoolean("mobs.zombie.bypass-mob-griefing", zombieBypassMobGriefing);
@@ -2293,15 +2293,15 @@ index eab135372764fe2be0244cddadaa8891bba0fb45..fb2aa8f5e3d7e53c5eac037e5dfca25a
}
public boolean zombieHorseRidableInWater = false;
@@ -2090,6 +2230,7 @@ public class PurpurWorldConfig {
public double zombieHorseMovementSpeedMin = 0.2D;
public double zombieHorseMovementSpeedMax = 0.2D;
@@ -2095,6 +2235,7 @@ public class PurpurWorldConfig {
public double zombieHorseMovementSpeedMin = 0.2D; // TODO: re-implement
public double zombieHorseMovementSpeedMax = 0.2D; // TODO: re-implement
public double zombieHorseSpawnChance = 0.0D;
+ public boolean zombieHorseTakeDamageFromWater = false;
private void zombieHorseSettings() {
zombieHorseRidableInWater = getBoolean("mobs.zombie_horse.ridable-in-water", zombieHorseRidableInWater);
zombieHorseCanSwim = getBoolean("mobs.zombie_horse.can-swim", zombieHorseCanSwim);
@@ -2106,6 +2247,7 @@ public class PurpurWorldConfig {
@@ -2111,6 +2252,7 @@ public class PurpurWorldConfig {
zombieHorseMovementSpeedMin = getDouble("mobs.zombie_horse.attributes.movement_speed.min", zombieHorseMovementSpeedMin);
zombieHorseMovementSpeedMax = getDouble("mobs.zombie_horse.attributes.movement_speed.max", zombieHorseMovementSpeedMax);
zombieHorseSpawnChance = getDouble("mobs.zombie_horse.spawn-chance", zombieHorseSpawnChance);
@@ -2309,7 +2309,7 @@ index eab135372764fe2be0244cddadaa8891bba0fb45..fb2aa8f5e3d7e53c5eac037e5dfca25a
}
public boolean zombieVillagerRidable = false;
@@ -2116,6 +2258,7 @@ public class PurpurWorldConfig {
@@ -2121,6 +2263,7 @@ public class PurpurWorldConfig {
public boolean zombieVillagerJockeyOnlyBaby = true;
public double zombieVillagerJockeyChance = 0.05D;
public boolean zombieVillagerJockeyTryExistingChickens = true;
@@ -2317,7 +2317,7 @@ index eab135372764fe2be0244cddadaa8891bba0fb45..fb2aa8f5e3d7e53c5eac037e5dfca25a
private void zombieVillagerSettings() {
zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable);
zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater);
@@ -2130,6 +2273,7 @@ public class PurpurWorldConfig {
@@ -2135,6 +2278,7 @@ public class PurpurWorldConfig {
zombieVillagerJockeyOnlyBaby = getBoolean("mobs.zombie_villager.jockey.only-babies", zombieVillagerJockeyOnlyBaby);
zombieVillagerJockeyChance = getDouble("mobs.zombie_villager.jockey.chance", zombieVillagerJockeyChance);
zombieVillagerJockeyTryExistingChickens = getBoolean("mobs.zombie_villager.jockey.try-existing-chickens", zombieVillagerJockeyTryExistingChickens);
@@ -2325,7 +2325,7 @@ index eab135372764fe2be0244cddadaa8891bba0fb45..fb2aa8f5e3d7e53c5eac037e5dfca25a
}
public boolean zombifiedPiglinRidable = false;
@@ -2141,6 +2285,7 @@ public class PurpurWorldConfig {
@@ -2146,6 +2290,7 @@ public class PurpurWorldConfig {
public double zombifiedPiglinJockeyChance = 0.05D;
public boolean zombifiedPiglinJockeyTryExistingChickens = true;
public boolean zombifiedPiglinCountAsPlayerKillWhenAngry = true;
@@ -2333,7 +2333,7 @@ index eab135372764fe2be0244cddadaa8891bba0fb45..fb2aa8f5e3d7e53c5eac037e5dfca25a
private void zombifiedPiglinSettings() {
zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable);
zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater);
@@ -2156,5 +2301,6 @@ public class PurpurWorldConfig {
@@ -2161,5 +2306,6 @@ public class PurpurWorldConfig {
zombifiedPiglinJockeyChance = getDouble("mobs.zombified_piglin.jockey.chance", zombifiedPiglinJockeyChance);
zombifiedPiglinJockeyTryExistingChickens = getBoolean("mobs.zombified_piglin.jockey.try-existing-chickens", zombifiedPiglinJockeyTryExistingChickens);
zombifiedPiglinCountAsPlayerKillWhenAngry = getBoolean("mobs.zombified_piglin.count-as-player-kill-when-angry", zombifiedPiglinCountAsPlayerKillWhenAngry);