Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 09:27: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

130
patches/server/0230-Mobs-always-drop-experience.patch
View File

@@ -421,10 +421,10 @@ index 5e705c84e5deeb3b3bdede80bf2acd9a252e3972..d61d9a7e7fa4d360dc740fdcb31efd02
@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 85d08932d2941f2e75d2449d1a7a6223d529e295..9d813827c27823c2e01341330cda1a64c4cdd315 100644
index e47d4b920737cca51fa4003e79030258685d7e1a..f61843b76ad0dd50ed0ccaaf5f83a0c63e460343 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
@@ -119,6 +119,11 @@ public class Goat extends Animal {
@@ -114,6 +114,11 @@ public class Goat extends Animal {
public boolean isSensitiveToWater() {
return this.level.purpurConfig.goatTakeDamageFromWater;
}
@@ -437,10 +437,10 @@ index 85d08932d2941f2e75d2449d1a7a6223d529e295..9d813827c27823c2e01341330cda1a64
@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 c71127d7adb24a1bd14641b79839666412d08662..bdf6078b6cc8409a664ac1ae387a2738f56378b5 100644
index 1b2838de60399e83fe6de91b368bfc5d9aa7a805..8c856583daa8c7c9821adb8195218c06266fda3e 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
@@ -45,6 +45,11 @@ public class Donkey extends AbstractChestedHorse {
@@ -30,6 +30,11 @@ public class Donkey extends AbstractChestedHorse {
public boolean isSensitiveToWater() {
return this.level.purpurConfig.donkeyTakeDamageFromWater;
}
@@ -453,10 +453,10 @@ index c71127d7adb24a1bd14641b79839666412d08662..bdf6078b6cc8409a664ac1ae387a2738
@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 22f8d501e2dfb765f0cf3f199efed7c5b1067581..b737eb9d32b3a460d0832155b8c64faf1ebb44f1 100644
index 02c090a15271a2d597278d01c850d842b4e7a9fd..d7ac9a61e341af66eccde3cb425e7054620c19fc 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
@@ -70,6 +70,11 @@ public class Horse extends AbstractHorse implements VariantHolder<Variant> {
@@ -55,6 +55,11 @@ public class Horse extends AbstractHorse implements VariantHolder<Variant> {
public boolean isSensitiveToWater() {
return this.level.purpurConfig.horseTakeDamageFromWater;
}
@@ -469,10 +469,10 @@ index 22f8d501e2dfb765f0cf3f199efed7c5b1067581..b737eb9d32b3a460d0832155b8c64faf
@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 670a78292aa069b4e37eb1b46089e9f907f0a440..0b06ef5537cf781b9954fcdfc9423f1987cb5674 100644
index 3f3e6633a3de2ceb5a082777a24ff0451bd27976..80cdace3ac83dd7186d417e83408f684a13512ae 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
@@ -146,6 +146,11 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
@@ -131,6 +131,11 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
public boolean isSensitiveToWater() {
return this.level.purpurConfig.llamaTakeDamageFromWater;
}
@@ -485,10 +485,10 @@ index 670a78292aa069b4e37eb1b46089e9f907f0a440..0b06ef5537cf781b9954fcdfc9423f19
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 32ade7ae57c5fe598e51c8f2d805b280f00e8a2e..b7cb49c03fc8ae655d3c596c872f988e7c863cf6 100644
index 5bcbe92441bf51f4303bb7dacd4c439ce160c1a9..6466c988be66cf851f753d2ed70762e32f972815 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
@@ -44,6 +44,11 @@ public class Mule extends AbstractChestedHorse {
@@ -29,6 +29,11 @@ public class Mule extends AbstractChestedHorse {
public boolean isSensitiveToWater() {
return this.level.purpurConfig.muleTakeDamageFromWater;
}
@@ -501,10 +501,10 @@ index 32ade7ae57c5fe598e51c8f2d805b280f00e8a2e..b7cb49c03fc8ae655d3c596c872f988e
@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 a0a28c3d682bd96ac65151293fb8429de42c905c..9ed43b3cb5b60e80387fc39caa9cc4711c4e1fd6 100644
index 6b97898fae19e755b57eb13e2577e774024ba1e3..93ea9e8bb1f8d7746f122b2939e00c98ce6fec10 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
@@ -58,6 +58,11 @@ public class SkeletonHorse extends AbstractHorse {
@@ -43,6 +43,11 @@ public class SkeletonHorse extends AbstractHorse {
public boolean isSensitiveToWater() {
return this.level.purpurConfig.skeletonHorseTakeDamageFromWater;
}
@@ -517,10 +517,10 @@ index a0a28c3d682bd96ac65151293fb8429de42c905c..9ed43b3cb5b60e80387fc39caa9cc471
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 02b6f2ce6831eb68442d1a4b47764426830dedb5..71f61ffc206eb6c098978bfc4e36944e61c4e320 100644
index 86e14420d499e0dccbd7a8dcae2623feef1328aa..df250bace02459d35c7eca4e2703ff2263397265 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
@@ -72,6 +72,11 @@ public class TraderLlama extends Llama {
@@ -57,6 +57,11 @@ public class TraderLlama extends Llama {
public boolean isSensitiveToWater() {
return this.level.purpurConfig.traderLlamaTakeDamageFromWater;
}
@@ -533,10 +533,10 @@ index 02b6f2ce6831eb68442d1a4b47764426830dedb5..71f61ffc206eb6c098978bfc4e36944e
@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 a3e33c2a7bbabc0e295c5ed93ca6030b39b10efb..bf97ed859e178a1028de413eb136fdeb40fac8ef 100644
index 89b4748289230ca63fbf6de41e82b7dd7fa768b1..d48dc9bbb89c3122a6010d4561464fe4258dac42 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
@@ -56,6 +56,11 @@ public class ZombieHorse extends AbstractHorse {
@@ -41,6 +41,11 @@ public class ZombieHorse extends AbstractHorse {
public boolean isSensitiveToWater() {
return this.level.purpurConfig.zombieHorseTakeDamageFromWater;
}
@@ -1125,7 +1125,7 @@ index fd8f5ef1842eaa8676893fcd53f550ab5ccb3b93..b6165a1d513bea0d441289eb0df05ea8
public static AttributeSupplier.Builder createAttributes() {
diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
index 7a7e200f79a1055217139992d26561bd54164677..6b97c1b84ee64f0f7cf7fb329a5123a3acc512d0 100644
index 4f114d7cf5e6429e74bcf3653568beb1a944b6ae..92adb537f342f3da41c91cf2c3141425e68e3cb7 100644
--- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
+++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
@@ -189,6 +189,11 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
@@ -1157,7 +1157,7 @@ index e06f3ee85dde587f1146d4a3d70e8a2e5b9a128b..2e9dd920e5c3943cba4c53ec2a2b48ee
@Override
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 06dbb9b24a27552133a57573ffa44e22671dc7ff..cc5b1dfd4f28823a40185ea70928a5b90a3e9835 100644
index 8a9f7b7d831d2b812f4833835bcba68845f42f39..2261e51166b9bf487bb109977b6db9630b5c9631 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1013,12 +1013,14 @@ public class PurpurWorldConfig {
@@ -1335,7 +1335,7 @@ index 06dbb9b24a27552133a57573ffa44e22671dc7ff..cc5b1dfd4f28823a40185ea70928a5b9
public boolean donkeyRidableInWater = false;
@@ -1293,6 +1315,7 @@ public class PurpurWorldConfig {
public double donkeyMovementSpeedMax = 0.175D;
public double donkeyMovementSpeedMax = 0.175D; // TODO: re-implement
public int donkeyBreedingTicks = 6000;
public boolean donkeyTakeDamageFromWater = false;
+ public boolean donkeyAlwaysDropExp = false;
@@ -1540,7 +1540,7 @@ index 06dbb9b24a27552133a57573ffa44e22671dc7ff..cc5b1dfd4f28823a40185ea70928a5b9
public boolean horseRidableInWater = false;
@@ -1633,6 +1681,7 @@ public class PurpurWorldConfig {
public double horseMovementSpeedMax = 0.3375D;
public double horseMovementSpeedMax = 0.3375D; // TODO: re-implement
public int horseBreedingTicks = 6000;
public boolean horseTakeDamageFromWater = false;
+ public boolean horseAlwaysDropExp = false;
@@ -1652,7 +1652,7 @@ index 06dbb9b24a27552133a57573ffa44e22671dc7ff..cc5b1dfd4f28823a40185ea70928a5b9
public boolean muleRidableInWater = false;
@@ -1815,6 +1877,7 @@ public class PurpurWorldConfig {
public double muleMovementSpeedMax = 0.175D;
public double muleMovementSpeedMax = 0.175D; // TODO: re-implement
public int muleBreedingTicks = 6000;
public boolean muleTakeDamageFromWater = false;
+ public boolean muleAlwaysDropExp = false;
@@ -1938,8 +1938,8 @@ index 06dbb9b24a27552133a57573ffa44e22671dc7ff..cc5b1dfd4f28823a40185ea70928a5b9
public boolean skeletonHorseRidableInWater = true;
@@ -2260,6 +2358,7 @@ public class PurpurWorldConfig {
public double skeletonHorseMovementSpeedMin = 0.2D;
public double skeletonHorseMovementSpeedMax = 0.2D;
public double skeletonHorseMovementSpeedMin = 0.2D; // TODO: re-implement
public double skeletonHorseMovementSpeedMax = 0.2D; // TODO: re-implement
public boolean skeletonHorseTakeDamageFromWater = false;
+ public boolean skeletonHorseAlwaysDropExp = false;
private void skeletonHorseSettings() {
@@ -1984,8 +1984,8 @@ index 06dbb9b24a27552133a57573ffa44e22671dc7ff..cc5b1dfd4f28823a40185ea70928a5b9
+ snowGolemAlwaysDropExp = getBoolean("mobs.snow_golem.always-drop-exp", snowGolemAlwaysDropExp);
}
public boolean squidRidable = false;
@@ -2343,6 +2447,7 @@ public class PurpurWorldConfig {
public int snifferBreedingTicks = 6000;
@@ -2348,6 +2452,7 @@ public class PurpurWorldConfig {
public double squidOffsetWaterCheck = 0.0D;
public boolean squidsCanFly = false;
public boolean squidTakeDamageFromWater = false;
@@ -1993,7 +1993,7 @@ index 06dbb9b24a27552133a57573ffa44e22671dc7ff..cc5b1dfd4f28823a40185ea70928a5b9
private void squidSettings() {
squidRidable = getBoolean("mobs.squid.ridable", squidRidable);
squidControllable = getBoolean("mobs.squid.controllable", squidControllable);
@@ -2356,6 +2461,7 @@ public class PurpurWorldConfig {
@@ -2361,6 +2466,7 @@ public class PurpurWorldConfig {
squidOffsetWaterCheck = getDouble("mobs.squid.water-offset-check", squidOffsetWaterCheck);
squidsCanFly = getBoolean("mobs.squid.can-fly", squidsCanFly);
squidTakeDamageFromWater = getBoolean("mobs.squid.takes-damage-from-water", squidTakeDamageFromWater);
@@ -2001,7 +2001,7 @@ index 06dbb9b24a27552133a57573ffa44e22671dc7ff..cc5b1dfd4f28823a40185ea70928a5b9
}
public boolean spiderRidable = false;
@@ -2363,6 +2469,7 @@ public class PurpurWorldConfig {
@@ -2368,6 +2474,7 @@ public class PurpurWorldConfig {
public boolean spiderControllable = true;
public double spiderMaxHealth = 16.0D;
public boolean spiderTakeDamageFromWater = false;
@@ -2009,7 +2009,7 @@ index 06dbb9b24a27552133a57573ffa44e22671dc7ff..cc5b1dfd4f28823a40185ea70928a5b9
private void spiderSettings() {
spiderRidable = getBoolean("mobs.spider.ridable", spiderRidable);
spiderRidableInWater = getBoolean("mobs.spider.ridable-in-water", spiderRidableInWater);
@@ -2374,6 +2481,7 @@ public class PurpurWorldConfig {
@@ -2379,6 +2486,7 @@ public class PurpurWorldConfig {
}
spiderMaxHealth = getDouble("mobs.spider.attributes.max_health", spiderMaxHealth);
spiderTakeDamageFromWater = getBoolean("mobs.spider.takes-damage-from-water", spiderTakeDamageFromWater);
@@ -2017,7 +2017,7 @@ index 06dbb9b24a27552133a57573ffa44e22671dc7ff..cc5b1dfd4f28823a40185ea70928a5b9
}
public boolean strayRidable = false;
@@ -2381,6 +2489,7 @@ public class PurpurWorldConfig {
@@ -2386,6 +2494,7 @@ public class PurpurWorldConfig {
public boolean strayControllable = true;
public double strayMaxHealth = 20.0D;
public boolean strayTakeDamageFromWater = false;
@@ -2025,7 +2025,7 @@ index 06dbb9b24a27552133a57573ffa44e22671dc7ff..cc5b1dfd4f28823a40185ea70928a5b9
private void straySettings() {
strayRidable = getBoolean("mobs.stray.ridable", strayRidable);
strayRidableInWater = getBoolean("mobs.stray.ridable-in-water", strayRidableInWater);
@@ -2392,6 +2501,7 @@ public class PurpurWorldConfig {
@@ -2397,6 +2506,7 @@ public class PurpurWorldConfig {
}
strayMaxHealth = getDouble("mobs.stray.attributes.max_health", strayMaxHealth);
strayTakeDamageFromWater = getBoolean("mobs.stray.takes-damage-from-water", strayTakeDamageFromWater);
@@ -2033,7 +2033,7 @@ index 06dbb9b24a27552133a57573ffa44e22671dc7ff..cc5b1dfd4f28823a40185ea70928a5b9
}
public boolean striderRidable = false;
@@ -2401,6 +2511,7 @@ public class PurpurWorldConfig {
@@ -2406,6 +2516,7 @@ public class PurpurWorldConfig {
public int striderBreedingTicks = 6000;
public boolean striderGiveSaddleBack = false;
public boolean striderTakeDamageFromWater = true;
@@ -2041,7 +2041,7 @@ index 06dbb9b24a27552133a57573ffa44e22671dc7ff..cc5b1dfd4f28823a40185ea70928a5b9
private void striderSettings() {
striderRidable = getBoolean("mobs.strider.ridable", striderRidable);
striderRidableInWater = getBoolean("mobs.strider.ridable-in-water", striderRidableInWater);
@@ -2414,6 +2525,7 @@ public class PurpurWorldConfig {
@@ -2419,6 +2530,7 @@ public class PurpurWorldConfig {
striderBreedingTicks = getInt("mobs.strider.breeding-delay-ticks", striderBreedingTicks);
striderGiveSaddleBack = getBoolean("mobs.strider.give-saddle-back", striderGiveSaddleBack);
striderTakeDamageFromWater = getBoolean("mobs.strider.takes-damage-from-water", striderTakeDamageFromWater);
@@ -2049,15 +2049,15 @@ index 06dbb9b24a27552133a57573ffa44e22671dc7ff..cc5b1dfd4f28823a40185ea70928a5b9
}
public boolean tadpoleRidable = false;
@@ -2436,6 +2548,7 @@ public class PurpurWorldConfig {
public double traderLlamaMovementSpeedMax = 0.175D;
@@ -2441,6 +2553,7 @@ public class PurpurWorldConfig {
public double traderLlamaMovementSpeedMax = 0.175D; // TODO: re-implement
public int traderLlamaBreedingTicks = 6000;
public boolean traderLlamaTakeDamageFromWater = false;
+ public boolean traderLlamaAlwaysDropExp = false;
private void traderLlamaSettings() {
traderLlamaRidable = getBoolean("mobs.trader_llama.ridable", traderLlamaRidable);
traderLlamaRidableInWater = getBoolean("mobs.trader_llama.ridable-in-water", traderLlamaRidableInWater);
@@ -2455,12 +2568,14 @@ public class PurpurWorldConfig {
@@ -2460,12 +2573,14 @@ public class PurpurWorldConfig {
traderLlamaMovementSpeedMax = getDouble("mobs.trader_llama.attributes.movement_speed.max", traderLlamaMovementSpeedMax);
traderLlamaBreedingTicks = getInt("mobs.trader_llama.breeding-delay-ticks", traderLlamaBreedingTicks);
traderLlamaTakeDamageFromWater = getBoolean("mobs.trader_llama.takes-damage-from-water", traderLlamaTakeDamageFromWater);
@@ -2072,7 +2072,7 @@ index 06dbb9b24a27552133a57573ffa44e22671dc7ff..cc5b1dfd4f28823a40185ea70928a5b9
private void tropicalFishSettings() {
tropicalFishRidable = getBoolean("mobs.tropical_fish.ridable", tropicalFishRidable);
tropicalFishControllable = getBoolean("mobs.tropical_fish.controllable", tropicalFishControllable);
@@ -2471,6 +2586,7 @@ public class PurpurWorldConfig {
@@ -2476,6 +2591,7 @@ public class PurpurWorldConfig {
}
tropicalFishMaxHealth = getDouble("mobs.tropical_fish.attributes.max_health", tropicalFishMaxHealth);
tropicalFishTakeDamageFromWater = getBoolean("mobs.tropical_fish.takes-damage-from-water", tropicalFishTakeDamageFromWater);
@@ -2080,7 +2080,7 @@ index 06dbb9b24a27552133a57573ffa44e22671dc7ff..cc5b1dfd4f28823a40185ea70928a5b9
}
public boolean turtleRidable = false;
@@ -2479,6 +2595,7 @@ public class PurpurWorldConfig {
@@ -2484,6 +2600,7 @@ public class PurpurWorldConfig {
public double turtleMaxHealth = 30.0D;
public int turtleBreedingTicks = 6000;
public boolean turtleTakeDamageFromWater = false;
@@ -2088,7 +2088,7 @@ index 06dbb9b24a27552133a57573ffa44e22671dc7ff..cc5b1dfd4f28823a40185ea70928a5b9
private void turtleSettings() {
turtleRidable = getBoolean("mobs.turtle.ridable", turtleRidable);
turtleRidableInWater = getBoolean("mobs.turtle.ridable-in-water", turtleRidableInWater);
@@ -2491,6 +2608,7 @@ public class PurpurWorldConfig {
@@ -2496,6 +2613,7 @@ public class PurpurWorldConfig {
turtleMaxHealth = getDouble("mobs.turtle.attributes.max_health", turtleMaxHealth);
turtleBreedingTicks = getInt("mobs.turtle.breeding-delay-ticks", turtleBreedingTicks);
turtleTakeDamageFromWater = getBoolean("mobs.turtle.takes-damage-from-water", turtleTakeDamageFromWater);
@@ -2096,7 +2096,7 @@ index 06dbb9b24a27552133a57573ffa44e22671dc7ff..cc5b1dfd4f28823a40185ea70928a5b9
}
public boolean vexRidable = false;
@@ -2499,6 +2617,7 @@ public class PurpurWorldConfig {
@@ -2504,6 +2622,7 @@ public class PurpurWorldConfig {
public double vexMaxY = 320D;
public double vexMaxHealth = 14.0D;
public boolean vexTakeDamageFromWater = false;
@@ -2104,7 +2104,7 @@ index 06dbb9b24a27552133a57573ffa44e22671dc7ff..cc5b1dfd4f28823a40185ea70928a5b9
private void vexSettings() {
vexRidable = getBoolean("mobs.vex.ridable", vexRidable);
vexRidableInWater = getBoolean("mobs.vex.ridable-in-water", vexRidableInWater);
@@ -2511,6 +2630,7 @@ public class PurpurWorldConfig {
@@ -2516,6 +2635,7 @@ public class PurpurWorldConfig {
}
vexMaxHealth = getDouble("mobs.vex.attributes.max_health", vexMaxHealth);
vexTakeDamageFromWater = getBoolean("mobs.vex.takes-damage-from-water", vexTakeDamageFromWater);
@@ -2112,7 +2112,7 @@ index 06dbb9b24a27552133a57573ffa44e22671dc7ff..cc5b1dfd4f28823a40185ea70928a5b9
}
public boolean villagerRidable = false;
@@ -2526,6 +2646,7 @@ public class PurpurWorldConfig {
@@ -2531,6 +2651,7 @@ public class PurpurWorldConfig {
public boolean villagerBypassMobGriefing = false;
public boolean villagerTakeDamageFromWater = false;
public boolean villagerAllowTrading = true;
@@ -2120,7 +2120,7 @@ index 06dbb9b24a27552133a57573ffa44e22671dc7ff..cc5b1dfd4f28823a40185ea70928a5b9
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -2545,6 +2666,7 @@ public class PurpurWorldConfig {
@@ -2550,6 +2671,7 @@ public class PurpurWorldConfig {
villagerBypassMobGriefing = getBoolean("mobs.villager.bypass-mob-griefing", villagerBypassMobGriefing);
villagerTakeDamageFromWater = getBoolean("mobs.villager.takes-damage-from-water", villagerTakeDamageFromWater);
villagerAllowTrading = getBoolean("mobs.villager.allow-trading", villagerAllowTrading);
@@ -2128,7 +2128,7 @@ index 06dbb9b24a27552133a57573ffa44e22671dc7ff..cc5b1dfd4f28823a40185ea70928a5b9
}
public boolean vindicatorRidable = false;
@@ -2553,6 +2675,7 @@ public class PurpurWorldConfig {
@@ -2558,6 +2680,7 @@ public class PurpurWorldConfig {
public double vindicatorMaxHealth = 24.0D;
public double vindicatorJohnnySpawnChance = 0D;
public boolean vindicatorTakeDamageFromWater = false;
@@ -2136,7 +2136,7 @@ index 06dbb9b24a27552133a57573ffa44e22671dc7ff..cc5b1dfd4f28823a40185ea70928a5b9
private void vindicatorSettings() {
vindicatorRidable = getBoolean("mobs.vindicator.ridable", vindicatorRidable);
vindicatorRidableInWater = getBoolean("mobs.vindicator.ridable-in-water", vindicatorRidableInWater);
@@ -2565,6 +2688,7 @@ public class PurpurWorldConfig {
@@ -2570,6 +2693,7 @@ public class PurpurWorldConfig {
vindicatorMaxHealth = getDouble("mobs.vindicator.attributes.max_health", vindicatorMaxHealth);
vindicatorJohnnySpawnChance = getDouble("mobs.vindicator.johnny.spawn-chance", vindicatorJohnnySpawnChance);
vindicatorTakeDamageFromWater = getBoolean("mobs.vindicator.takes-damage-from-water", vindicatorTakeDamageFromWater);
@@ -2144,7 +2144,7 @@ index 06dbb9b24a27552133a57573ffa44e22671dc7ff..cc5b1dfd4f28823a40185ea70928a5b9
}
public boolean wanderingTraderRidable = false;
@@ -2575,6 +2699,7 @@ public class PurpurWorldConfig {
@@ -2580,6 +2704,7 @@ public class PurpurWorldConfig {
public boolean wanderingTraderCanBeLeashed = false;
public boolean wanderingTraderTakeDamageFromWater = false;
public boolean wanderingTraderAllowTrading = true;
@@ -2152,7 +2152,7 @@ index 06dbb9b24a27552133a57573ffa44e22671dc7ff..cc5b1dfd4f28823a40185ea70928a5b9
private void wanderingTraderSettings() {
wanderingTraderRidable = getBoolean("mobs.wandering_trader.ridable", wanderingTraderRidable);
wanderingTraderRidableInWater = getBoolean("mobs.wandering_trader.ridable-in-water", wanderingTraderRidableInWater);
@@ -2589,6 +2714,7 @@ public class PurpurWorldConfig {
@@ -2594,6 +2719,7 @@ public class PurpurWorldConfig {
wanderingTraderCanBeLeashed = getBoolean("mobs.wandering_trader.can-be-leashed", wanderingTraderCanBeLeashed);
wanderingTraderTakeDamageFromWater = getBoolean("mobs.wandering_trader.takes-damage-from-water", wanderingTraderTakeDamageFromWater);
wanderingTraderAllowTrading = getBoolean("mobs.wandering_trader.allow-trading", wanderingTraderAllowTrading);
@@ -2160,7 +2160,7 @@ index 06dbb9b24a27552133a57573ffa44e22671dc7ff..cc5b1dfd4f28823a40185ea70928a5b9
}
public boolean wardenRidable = false;
@@ -2605,6 +2731,7 @@ public class PurpurWorldConfig {
@@ -2610,6 +2736,7 @@ public class PurpurWorldConfig {
public boolean witchControllable = true;
public double witchMaxHealth = 26.0D;
public boolean witchTakeDamageFromWater = false;
@@ -2168,7 +2168,7 @@ index 06dbb9b24a27552133a57573ffa44e22671dc7ff..cc5b1dfd4f28823a40185ea70928a5b9
private void witchSettings() {
witchRidable = getBoolean("mobs.witch.ridable", witchRidable);
witchRidableInWater = getBoolean("mobs.witch.ridable-in-water", witchRidableInWater);
@@ -2616,6 +2743,7 @@ public class PurpurWorldConfig {
@@ -2621,6 +2748,7 @@ public class PurpurWorldConfig {
}
witchMaxHealth = getDouble("mobs.witch.attributes.max_health", witchMaxHealth);
witchTakeDamageFromWater = getBoolean("mobs.witch.takes-damage-from-water", witchTakeDamageFromWater);
@@ -2176,7 +2176,7 @@ index 06dbb9b24a27552133a57573ffa44e22671dc7ff..cc5b1dfd4f28823a40185ea70928a5b9
}
public boolean witherRidable = false;
@@ -2630,6 +2758,7 @@ public class PurpurWorldConfig {
@@ -2635,6 +2763,7 @@ public class PurpurWorldConfig {
public boolean witherCanRideVehicles = false;
public float witherExplosionRadius = 1.0F;
public boolean witherPlaySpawnSound = true;
@@ -2184,7 +2184,7 @@ index 06dbb9b24a27552133a57573ffa44e22671dc7ff..cc5b1dfd4f28823a40185ea70928a5b9
private void witherSettings() {
witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
@@ -2652,6 +2781,7 @@ public class PurpurWorldConfig {
@@ -2657,6 +2786,7 @@ public class PurpurWorldConfig {
witherCanRideVehicles = getBoolean("mobs.wither.can-ride-vehicles", witherCanRideVehicles);
witherExplosionRadius = (float) getDouble("mobs.wither.explosion-radius", witherExplosionRadius);
witherPlaySpawnSound = getBoolean("mobs.wither.play-spawn-sound", witherPlaySpawnSound);
@@ -2192,7 +2192,7 @@ index 06dbb9b24a27552133a57573ffa44e22671dc7ff..cc5b1dfd4f28823a40185ea70928a5b9
}
public boolean witherSkeletonRidable = false;
@@ -2659,6 +2789,7 @@ public class PurpurWorldConfig {
@@ -2664,6 +2794,7 @@ public class PurpurWorldConfig {
public boolean witherSkeletonControllable = true;
public double witherSkeletonMaxHealth = 20.0D;
public boolean witherSkeletonTakeDamageFromWater = false;
@@ -2200,7 +2200,7 @@ index 06dbb9b24a27552133a57573ffa44e22671dc7ff..cc5b1dfd4f28823a40185ea70928a5b9
private void witherSkeletonSettings() {
witherSkeletonRidable = getBoolean("mobs.wither_skeleton.ridable", witherSkeletonRidable);
witherSkeletonRidableInWater = getBoolean("mobs.wither_skeleton.ridable-in-water", witherSkeletonRidableInWater);
@@ -2670,6 +2801,7 @@ public class PurpurWorldConfig {
@@ -2675,6 +2806,7 @@ public class PurpurWorldConfig {
}
witherSkeletonMaxHealth = getDouble("mobs.wither_skeleton.attributes.max_health", witherSkeletonMaxHealth);
witherSkeletonTakeDamageFromWater = getBoolean("mobs.wither_skeleton.takes-damage-from-water", witherSkeletonTakeDamageFromWater);
@@ -2208,7 +2208,7 @@ index 06dbb9b24a27552133a57573ffa44e22671dc7ff..cc5b1dfd4f28823a40185ea70928a5b9
}
public boolean wolfRidable = false;
@@ -2681,6 +2813,7 @@ public class PurpurWorldConfig {
@@ -2686,6 +2818,7 @@ public class PurpurWorldConfig {
public double wolfNaturalRabid = 0.0D;
public int wolfBreedingTicks = 6000;
public boolean wolfTakeDamageFromWater = false;
@@ -2216,7 +2216,7 @@ index 06dbb9b24a27552133a57573ffa44e22671dc7ff..cc5b1dfd4f28823a40185ea70928a5b9
private void wolfSettings() {
wolfRidable = getBoolean("mobs.wolf.ridable", wolfRidable);
wolfRidableInWater = getBoolean("mobs.wolf.ridable-in-water", wolfRidableInWater);
@@ -2700,6 +2833,7 @@ public class PurpurWorldConfig {
@@ -2705,6 +2838,7 @@ public class PurpurWorldConfig {
wolfNaturalRabid = getDouble("mobs.wolf.spawn-rabid-chance", wolfNaturalRabid);
wolfBreedingTicks = getInt("mobs.wolf.breeding-delay-ticks", wolfBreedingTicks);
wolfTakeDamageFromWater = getBoolean("mobs.wolf.takes-damage-from-water", wolfTakeDamageFromWater);
@@ -2224,7 +2224,7 @@ index 06dbb9b24a27552133a57573ffa44e22671dc7ff..cc5b1dfd4f28823a40185ea70928a5b9
}
public boolean zoglinRidable = false;
@@ -2707,6 +2841,7 @@ public class PurpurWorldConfig {
@@ -2712,6 +2846,7 @@ public class PurpurWorldConfig {
public boolean zoglinControllable = true;
public double zoglinMaxHealth = 40.0D;
public boolean zoglinTakeDamageFromWater = false;
@@ -2232,7 +2232,7 @@ index 06dbb9b24a27552133a57573ffa44e22671dc7ff..cc5b1dfd4f28823a40185ea70928a5b9
private void zoglinSettings() {
zoglinRidable = getBoolean("mobs.zoglin.ridable", zoglinRidable);
zoglinRidableInWater = getBoolean("mobs.zoglin.ridable-in-water", zoglinRidableInWater);
@@ -2718,6 +2853,7 @@ public class PurpurWorldConfig {
@@ -2723,6 +2858,7 @@ public class PurpurWorldConfig {
}
zoglinMaxHealth = getDouble("mobs.zoglin.attributes.max_health", zoglinMaxHealth);
zoglinTakeDamageFromWater = getBoolean("mobs.zoglin.takes-damage-from-water", zoglinTakeDamageFromWater);
@@ -2240,7 +2240,7 @@ index 06dbb9b24a27552133a57573ffa44e22671dc7ff..cc5b1dfd4f28823a40185ea70928a5b9
}
public boolean zombieRidable = false;
@@ -2731,6 +2867,7 @@ public class PurpurWorldConfig {
@@ -2736,6 +2872,7 @@ public class PurpurWorldConfig {
public boolean zombieAggressiveTowardsVillagerWhenLagging = true;
public boolean zombieBypassMobGriefing = false;
public boolean zombieTakeDamageFromWater = false;
@@ -2248,7 +2248,7 @@ index 06dbb9b24a27552133a57573ffa44e22671dc7ff..cc5b1dfd4f28823a40185ea70928a5b9
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -2748,6 +2885,7 @@ public class PurpurWorldConfig {
@@ -2753,6 +2890,7 @@ public class PurpurWorldConfig {
zombieAggressiveTowardsVillagerWhenLagging = getBoolean("mobs.zombie.aggressive-towards-villager-when-lagging", zombieAggressiveTowardsVillagerWhenLagging);
zombieBypassMobGriefing = getBoolean("mobs.zombie.bypass-mob-griefing", zombieBypassMobGriefing);
zombieTakeDamageFromWater = getBoolean("mobs.zombie.takes-damage-from-water", zombieTakeDamageFromWater);
@@ -2256,15 +2256,15 @@ index 06dbb9b24a27552133a57573ffa44e22671dc7ff..cc5b1dfd4f28823a40185ea70928a5b9
}
public boolean zombieHorseRidableInWater = false;
@@ -2760,6 +2898,7 @@ public class PurpurWorldConfig {
public double zombieHorseMovementSpeedMax = 0.2D;
@@ -2765,6 +2903,7 @@ public class PurpurWorldConfig {
public double zombieHorseMovementSpeedMax = 0.2D; // TODO: re-implement
public double zombieHorseSpawnChance = 0.0D;
public boolean zombieHorseTakeDamageFromWater = false;
+ public boolean zombieHorseAlwaysDropExp = false;
private void zombieHorseSettings() {
zombieHorseRidableInWater = getBoolean("mobs.zombie_horse.ridable-in-water", zombieHorseRidableInWater);
zombieHorseCanSwim = getBoolean("mobs.zombie_horse.can-swim", zombieHorseCanSwim);
@@ -2777,6 +2916,7 @@ public class PurpurWorldConfig {
@@ -2782,6 +2921,7 @@ public class PurpurWorldConfig {
zombieHorseMovementSpeedMax = getDouble("mobs.zombie_horse.attributes.movement_speed.max", zombieHorseMovementSpeedMax);
zombieHorseSpawnChance = getDouble("mobs.zombie_horse.spawn-chance", zombieHorseSpawnChance);
zombieHorseTakeDamageFromWater = getBoolean("mobs.zombie_horse.takes-damage-from-water", zombieHorseTakeDamageFromWater);
@@ -2272,7 +2272,7 @@ index 06dbb9b24a27552133a57573ffa44e22671dc7ff..cc5b1dfd4f28823a40185ea70928a5b9
}
public boolean zombieVillagerRidable = false;
@@ -2791,6 +2931,7 @@ public class PurpurWorldConfig {
@@ -2796,6 +2936,7 @@ public class PurpurWorldConfig {
public int zombieVillagerCuringTimeMin = 3600;
public int zombieVillagerCuringTimeMax = 6000;
public boolean zombieVillagerCureEnabled = true;
@@ -2280,7 +2280,7 @@ index 06dbb9b24a27552133a57573ffa44e22671dc7ff..cc5b1dfd4f28823a40185ea70928a5b9
private void zombieVillagerSettings() {
zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable);
zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater);
@@ -2809,6 +2950,7 @@ public class PurpurWorldConfig {
@@ -2814,6 +2955,7 @@ public class PurpurWorldConfig {
zombieVillagerCuringTimeMin = getInt("mobs.zombie_villager.curing_time.min", zombieVillagerCuringTimeMin);
zombieVillagerCuringTimeMax = getInt("mobs.zombie_villager.curing_time.max", zombieVillagerCuringTimeMax);
zombieVillagerCureEnabled = getBoolean("mobs.zombie_villager.cure.enabled", zombieVillagerCureEnabled);
@@ -2288,7 +2288,7 @@ index 06dbb9b24a27552133a57573ffa44e22671dc7ff..cc5b1dfd4f28823a40185ea70928a5b9
}
public boolean zombifiedPiglinRidable = false;
@@ -2821,6 +2963,7 @@ public class PurpurWorldConfig {
@@ -2826,6 +2968,7 @@ public class PurpurWorldConfig {
public boolean zombifiedPiglinJockeyTryExistingChickens = true;
public boolean zombifiedPiglinCountAsPlayerKillWhenAngry = true;
public boolean zombifiedPiglinTakeDamageFromWater = false;
@@ -2296,7 +2296,7 @@ index 06dbb9b24a27552133a57573ffa44e22671dc7ff..cc5b1dfd4f28823a40185ea70928a5b9
private void zombifiedPiglinSettings() {
zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable);
zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater);
@@ -2837,6 +2980,7 @@ public class PurpurWorldConfig {
@@ -2842,6 +2985,7 @@ public class PurpurWorldConfig {
zombifiedPiglinJockeyTryExistingChickens = getBoolean("mobs.zombified_piglin.jockey.try-existing-chickens", zombifiedPiglinJockeyTryExistingChickens);
zombifiedPiglinCountAsPlayerKillWhenAngry = getBoolean("mobs.zombified_piglin.count-as-player-kill-when-angry", zombifiedPiglinCountAsPlayerKillWhenAngry);
zombifiedPiglinTakeDamageFromWater = getBoolean("mobs.zombified_piglin.takes-damage-from-water", zombifiedPiglinTakeDamageFromWater);