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

add "use-dismounts-underwater-tag" to fix ridables in water

Browse Source
This commit is contained in:
granny
2023-03-22 02:41:50 -07:00
parent 7c449672c9
commit f7801bd51a
83 changed files with 1172 additions and 1168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

174
patches/server/0104-Make-entity-breeding-times-configurable.patch
View File

@@ -47,7 +47,7 @@ index f185215b826c4b50a819c8454089cb8ccdb0ed3a..2ac88f06ebb79e515cd9934ac1e3e2c8
other.resetLove();
world.addFreshEntityWithPassengers(entityageable, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.BREEDING); // CraftBukkit - added SpawnReason
diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java
index 1ff79871121944864da0b5179bba17f97c551608..609fc99fb2f6120af1220ca9dda9ed05686c1448 100644
index c0b85da9cce5ec75d83945ba7b4d2fc823105103..980bab802ce49384fc836187fa69e178a04a3ea2 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
@@ -219,6 +219,11 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
@@ -63,7 +63,7 @@ index 1ff79871121944864da0b5179bba17f97c551608..609fc99fb2f6120af1220ca9dda9ed05
@Override
diff --git a/src/main/java/net/minecraft/world/entity/animal/Cat.java b/src/main/java/net/minecraft/world/entity/animal/Cat.java
index 61f83ec67c68dfafbdb11ed88f02d2be526ab7f9..7b3faddc9731ef34708f4caed51c48868159d4c6 100644
index 944da53f7f48e5218c12b7fd4bb443621cafc331..bc9c39e90f0a41f9bec6f93db921d2157183698c 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Cat.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Cat.java
@@ -125,6 +125,11 @@ public class Cat extends TamableAnimal implements VariantHolder<CatVariant> {
@@ -79,7 +79,7 @@ index 61f83ec67c68dfafbdb11ed88f02d2be526ab7f9..7b3faddc9731ef34708f4caed51c4886
public ResourceLocation getResourceLocation() {
diff --git a/src/main/java/net/minecraft/world/entity/animal/Chicken.java b/src/main/java/net/minecraft/world/entity/animal/Chicken.java
index 4b66412d04a28e3ee0a6e6c5fa0f3f4bf633d2d8..68c90c92409e79011aff84f655b391ba113804a2 100644
index da281eb1355fd753dfdb69cee13661818b5d0fc8..12faecfb4ffdd2c248c4a36134ed38f96b6d4069 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Chicken.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Chicken.java
@@ -77,6 +77,11 @@ public class Chicken extends Animal {
@@ -95,7 +95,7 @@ index 4b66412d04a28e3ee0a6e6c5fa0f3f4bf633d2d8..68c90c92409e79011aff84f655b391ba
@Override
diff --git a/src/main/java/net/minecraft/world/entity/animal/Cow.java b/src/main/java/net/minecraft/world/entity/animal/Cow.java
index 757b846bb1591c36e6b4413e3a8534986a84233f..6974e10842c66906a2ee70add8b7f046f312301c 100644
index b7a0ee0e055d12e36b411859211367c9df3b9549..7776aa8db4b8782fea1ac57b82b98687548aab93 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Cow.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Cow.java
@@ -63,6 +63,11 @@ public class Cow extends Animal {
@@ -111,7 +111,7 @@ index 757b846bb1591c36e6b4413e3a8534986a84233f..6974e10842c66906a2ee70add8b7f046
@Override
diff --git a/src/main/java/net/minecraft/world/entity/animal/Fox.java b/src/main/java/net/minecraft/world/entity/animal/Fox.java
index 2119cdd90228f9034781b9496640b159343afbd8..bbd14bd8f2da3457fe9520be50b43e05e57998f3 100644
index d5f536eb87163c946815ace610ba99ad2a0b16c5..920b70b5c534ee83f5acb26890f3cfdf220fd887 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Fox.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Fox.java
@@ -184,6 +184,11 @@ public class Fox extends Animal implements VariantHolder<Fox.Type> {
@@ -140,7 +140,7 @@ index 2119cdd90228f9034781b9496640b159343afbd8..bbd14bd8f2da3457fe9520be50b43e05
this.partner.resetLove();
worldserver.addFreshEntityWithPassengers(entityfox, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.BREEDING); // CraftBukkit - added SpawnReason
diff --git a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
index 51c032e06bbf64e688778053056acef042c5b4b8..1b4d9c39bae147442d6bf9f742f9233c80c44363 100644
index 12b715086a347b82726327358ac71c72a4fca8b0..7e3f730aac201dd5302c1d3a1b98e06c214f0740 100644
--- a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
+++ b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
@@ -83,6 +83,11 @@ public class MushroomCow extends Cow implements Shearable, VariantHolder<Mushroo
@@ -156,7 +156,7 @@ index 51c032e06bbf64e688778053056acef042c5b4b8..1b4d9c39bae147442d6bf9f742f9233c
@Override
diff --git a/src/main/java/net/minecraft/world/entity/animal/Ocelot.java b/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
index 5b2996a782e8f2ad01c587aac113074c5c382da0..4b20204c2d4fcbe1eb075dccac9618b89e0f9dc2 100644
index c4d36725c614d4fb2a7d097ea5c5cd381b758e92..27e596183026b916444407979cfc36895443d2d7 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
@@ -88,6 +88,11 @@ public class Ocelot extends Animal {
@@ -172,7 +172,7 @@ index 5b2996a782e8f2ad01c587aac113074c5c382da0..4b20204c2d4fcbe1eb075dccac9618b8
public boolean isTrusting() {
diff --git a/src/main/java/net/minecraft/world/entity/animal/Panda.java b/src/main/java/net/minecraft/world/entity/animal/Panda.java
index e5156dba9cf467e73c2376ffabafc437bc9e3536..560af707b9e1175e8e40c999be9b4f615815e1f5 100644
index a5654221f7488c66582b6d97565b96ea7abb6f14..3cd4e5d8298c984d49f21f644658d0b92b597ce7 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Panda.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Panda.java
@@ -138,6 +138,11 @@ public class Panda extends Animal {
@@ -188,7 +188,7 @@ index e5156dba9cf467e73c2376ffabafc437bc9e3536..560af707b9e1175e8e40c999be9b4f61
@Override
diff --git a/src/main/java/net/minecraft/world/entity/animal/Parrot.java b/src/main/java/net/minecraft/world/entity/animal/Parrot.java
index e031a0a60253d896788cf14aaf65d4001d74d9a8..ea570aeb67a493f8c538b2926c517d49c71739cf 100644
index d3e9288928ac3a0132050b4aa3b6098b4dc293c0..a0f37d267c866499d251cf3b5e6a5a31406b8148 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Parrot.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Parrot.java
@@ -194,6 +194,11 @@ public class Parrot extends ShoulderRidingEntity implements VariantHolder<Parrot
@@ -204,7 +204,7 @@ index e031a0a60253d896788cf14aaf65d4001d74d9a8..ea570aeb67a493f8c538b2926c517d49
@Nullable
diff --git a/src/main/java/net/minecraft/world/entity/animal/Pig.java b/src/main/java/net/minecraft/world/entity/animal/Pig.java
index 97e2b3a4445d195021a67567c4b0c3346095e7e8..39b75ee52e48cf4b00a635152c534e4f64646fb7 100644
index 8734738ce69e2e776b80a4695fce3bcf33213959..4260d0c40d0eb0419dcb9dc1fc935590ce60fcd1 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Pig.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Pig.java
@@ -84,6 +84,11 @@ public class Pig extends Animal implements ItemSteerable, Saddleable {
@@ -220,7 +220,7 @@ index 97e2b3a4445d195021a67567c4b0c3346095e7e8..39b75ee52e48cf4b00a635152c534e4f
@Override
diff --git a/src/main/java/net/minecraft/world/entity/animal/PolarBear.java b/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
index e439ce2c0752ee772df888ccccf9d97e45a83b1c..af499a8b6d16669dc72f85a05f8e153b31ad8599 100644
index 69a0e50a4f136a3e799f8fc079bd931a83235bd0..1c25b3621631486aff569eec98aa360eacea4c27 100644
--- a/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
+++ b/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
@@ -118,6 +118,11 @@ public class PolarBear extends Animal implements NeutralMob {
@@ -236,7 +236,7 @@ index e439ce2c0752ee772df888ccccf9d97e45a83b1c..af499a8b6d16669dc72f85a05f8e153b
@Nullable
diff --git a/src/main/java/net/minecraft/world/entity/animal/Rabbit.java b/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
index 92da91319f59745f43529b9ddae032a8f60f693d..f564460d4d66fc8cdb163759e6fd8a81ac619661 100644
index 620cf2c9927648804155495a908df1d36d9832af..aca51a77f02670809a6da5e7c384d9bbfcee2506 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
@@ -140,6 +140,11 @@ public class Rabbit extends Animal implements VariantHolder<Rabbit.Variant> {
@@ -252,7 +252,7 @@ index 92da91319f59745f43529b9ddae032a8f60f693d..f564460d4d66fc8cdb163759e6fd8a81
// CraftBukkit start - code from constructor
diff --git a/src/main/java/net/minecraft/world/entity/animal/Sheep.java b/src/main/java/net/minecraft/world/entity/animal/Sheep.java
index 0b9c36f130a0ccd62bbf2418896627553bc61225..70e8ee40ec545b9be7f55f64f251864b03bacaac 100644
index ce2bac7cc95dca0f3d8c97ba6d7cf922d328c579..0969acaee0708a6fbb52c1cbee05ebb58b1408dd 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Sheep.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Sheep.java
@@ -136,6 +136,11 @@ public class Sheep extends Animal implements Shearable {
@@ -268,7 +268,7 @@ index 0b9c36f130a0ccd62bbf2418896627553bc61225..70e8ee40ec545b9be7f55f64f251864b
@Override
diff --git a/src/main/java/net/minecraft/world/entity/animal/Turtle.java b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
index 31c98011ee4521acebf8d452f135e534ffafd64c..7ee3c81f95907886c4036fb5ab9c16aebea38a85 100644
index 67c8f06d1befaf810e3954dbda156ee29bfbc0d4..303a2c74574d9ef456866ff30b98b9d103562658 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Turtle.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
@@ -103,6 +103,11 @@ public class Turtle extends Animal {
@@ -284,7 +284,7 @@ index 31c98011ee4521acebf8d452f135e534ffafd64c..7ee3c81f95907886c4036fb5ab9c16ae
public void setHomePos(BlockPos pos) {
diff --git a/src/main/java/net/minecraft/world/entity/animal/Wolf.java b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
index 4713da69b3f45bfcf423726feff2800560494306..8e5b38aaba602ef8bd2ee615569fa25fd979531b 100644
index 05792466a89bdcffe1a4241761b7c23afcc6bc88..6ddcf37ce8dbc6a57cabd43b04be6baba496a904 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
@@ -127,6 +127,11 @@ public class Wolf extends TamableAnimal implements NeutralMob {
@@ -334,7 +334,7 @@ index 05c7680569346bb863b896bcc9515f3e7cfb8114..bda7a0e29e40386c57766c224ffb8938
public void addAdditionalSaveData(CompoundTag nbt) {
super.addAdditionalSaveData(nbt);
diff --git a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
index 00bac64a6417b9e34c2b441a13e80052ad66a2c1..61c604a05eedb1928bdac8c8544b0cad074f29ee 100644
index 12962698dd354dc5da325e8bb24e5fff40af9e51..4807eb6487c3a394ee4eb88d7f68b09eb76f4a54 100644
--- a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
+++ b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
@@ -139,6 +139,10 @@ public class Frog extends Animal implements VariantHolder<FrogVariant> {
@@ -349,7 +349,7 @@ index 00bac64a6417b9e34c2b441a13e80052ad66a2c1..61c604a05eedb1928bdac8c8544b0cad
@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 a9805129f0aaba5f0c2751d463019844eb3b347d..b627fee1cb19f476f45921f1fae7624b27ff7280 100644
index 1cfc1ade52b79c6c5577935fe5c37a0e7a1673f0..b2c025184b9d8d272fab720a5930c030312d6e03 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
@@ -104,6 +104,11 @@ public class Goat extends Animal {
@@ -365,12 +365,12 @@ index a9805129f0aaba5f0c2751d463019844eb3b347d..b627fee1cb19f476f45921f1fae7624b
@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 8f7cd5c3c786ff94fc9b890ec488a461b7edced0..efe381ff8d43295bcaf0d4fb7ff75f2bf46391eb 100644
index 6ed4ef1c628b77448629388bfc4a8575dd4afefd..0a5313546858a235c071f15d91edc4f161f6a351 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
@@ -20,6 +20,11 @@ public class Donkey extends AbstractChestedHorse {
public boolean dismountsUnderwater() {
return !level.purpurConfig.donkeyRidableInWater || super.dismountsUnderwater();
return level.purpurConfig.useDismountsUnderwaterTag ? super.dismountsUnderwater() : !level.purpurConfig.donkeyRidableInWater;
}
+
+ @Override
@@ -381,12 +381,12 @@ index 8f7cd5c3c786ff94fc9b890ec488a461b7edced0..efe381ff8d43295bcaf0d4fb7ff75f2b
@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 c653a3d459fd8c1c4728cd5a0e63c6b3707792d9..2dbcebf7c370d4f5a51b5a23e67306c6c1ab83ba 100644
index 9d8879fc2f7afafdd42cd8ee471c698b31159209..dc8ebffdd6e64dd11d1e254ea1860f287f40aa50 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
@@ -45,6 +45,11 @@ public class Horse extends AbstractHorse implements VariantHolder<Variant> {
public boolean dismountsUnderwater() {
return !level.purpurConfig.horseRidableInWater || super.dismountsUnderwater();
return level.purpurConfig.useDismountsUnderwaterTag ? super.dismountsUnderwater() : !level.purpurConfig.horseRidableInWater;
}
+
+ @Override
@@ -397,7 +397,7 @@ index c653a3d459fd8c1c4728cd5a0e63c6b3707792d9..2dbcebf7c370d4f5a51b5a23e67306c6
@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 8adca393017dcc2e44a7379b971cd2a4704bc570..4165c7d54d00e356767dc56be86f5bff6aa8e8bb 100644
index 766285d0a62cf5314c99eba8c81ac29f171a2b0a..2f585de77bb8ad5431a48710d341dff0321b124d 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
@@ -121,6 +121,11 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
@@ -413,12 +413,12 @@ index 8adca393017dcc2e44a7379b971cd2a4704bc570..4165c7d54d00e356767dc56be86f5bff
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 cb72039e1c69e76d5d1c99f5fb63819369c2a0d6..ddb31f39182f7e2dd3c3a0b521563a0983b548cd 100644
index 84d265aaa4a2c5942e3ca04deab644570bb8ee83..183c8a1355d373a7cda91532eba3d62a58639167 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
@@ -19,6 +19,11 @@ public class Mule extends AbstractChestedHorse {
public boolean dismountsUnderwater() {
return !level.purpurConfig.muleRidableInWater || super.dismountsUnderwater();
return level.purpurConfig.useDismountsUnderwaterTag ? super.dismountsUnderwater() : !level.purpurConfig.muleRidableInWater;
}
+
+ @Override
@@ -445,7 +445,7 @@ index 7c891be8b94a6438910a53c0473393d49b19f5d9..33250d34cc6e2733330f9c4a42f498b2
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 636e86c4f0c9739d1440e524c86eddce15bb3e63..e723506f1fced33e945340392545e7970ddeb6cc 100644
index 6747dbd11a883249f18cd51320daa663d6203bb7..5a000d95d013d9c3251ad9eafd92700091db2857 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
@@ -47,6 +47,11 @@ public class TraderLlama extends Llama {
@@ -461,7 +461,7 @@ index 636e86c4f0c9739d1440e524c86eddce15bb3e63..e723506f1fced33e945340392545e797
@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 e9f1d53599168c4c4b44a14b445143025c4be83a..df438bc84c5b90f2fc66965f926dc2efeb6563c1 100644
index b6e2e7398413296449e8f132a2a6296da231f4d4..488bb0af3acb5bc077b0f4026fc0f3bd8ea081ac 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
@@ -31,6 +31,11 @@ public class ZombieHorse extends AbstractHorse {
@@ -477,7 +477,7 @@ index e9f1d53599168c4c4b44a14b445143025c4be83a..df438bc84c5b90f2fc66965f926dc2ef
public static AttributeSupplier.Builder createAttributes() {
diff --git a/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java b/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
index bc74bae29b8426ced84e203edb0c41065062f422..12aab69aca179717ea2a2ac04e28a78eff98af20 100644
index 30ff9967aa19a9e77bdf7d32e494276b1b72ab72..f5d2f12c2a95c274823ec37ac1c14a54a48a9cdc 100644
--- a/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
+++ b/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
@@ -101,6 +101,11 @@ public class Sniffer extends Animal {
@@ -493,7 +493,7 @@ index bc74bae29b8426ced84e203edb0c41065062f422..12aab69aca179717ea2a2ac04e28a78e
// CraftBukkit start - SPIGOT-7295: moved from constructor to appropriate location
diff --git a/src/main/java/net/minecraft/world/entity/monster/Strider.java b/src/main/java/net/minecraft/world/entity/monster/Strider.java
index b512ac4b75e53c272a3c41fb5b66c84b6b0e9847..fbc2e3f0b73608a999619469cd701692cb1cb788 100644
index 0a480333373c3f3a9504d0b4a3e00fba2e8b2e15..1be6dc3608b839b0ed7d2fcd968991ce5bbeb89b 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Strider.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Strider.java
@@ -120,6 +120,11 @@ public class Strider extends Animal implements ItemSteerable, Saddleable {
@@ -509,7 +509,7 @@ index b512ac4b75e53c272a3c41fb5b66c84b6b0e9847..fbc2e3f0b73608a999619469cd701692
public static boolean checkStriderSpawnRules(EntityType<Strider> type, LevelAccessor world, MobSpawnType spawnReason, BlockPos pos, RandomSource random) {
diff --git a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
index 9cc42b4a1ea0d2315350e038034dfe7171668658..8e837ce3069ca05bcc93ea93f94c79342ea9eb3c 100644
index 930d74e5fd20b69baeec60dfc54da37a1290fccc..2161df2ebee7dc00c924bfbc56377d68906b1f18 100644
--- a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
+++ b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
@@ -87,6 +87,11 @@ public class Hoglin extends Animal implements Enemy, HoglinBase {
@@ -525,10 +525,10 @@ index 9cc42b4a1ea0d2315350e038034dfe7171668658..8e837ce3069ca05bcc93ea93f94c7934
@Override
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index de9435f336643a0654796b2545210829569ec01f..b74313333e8bd1b0302f6c13e7effbb73c4c37b5 100644
index 94e2fe3e094b2519d4a12ff653e5041b4f93b94c..901fc6601b9e0cb25e9641de9e14755b12c6297d 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -510,10 +510,12 @@ public class PurpurWorldConfig {
@@ -512,10 +512,12 @@ public class PurpurWorldConfig {
public boolean axolotlRidable = false;
public boolean axolotlControllable = true;
public double axolotlMaxHealth = 14.0D;
@@ -541,7 +541,7 @@ index de9435f336643a0654796b2545210829569ec01f..b74313333e8bd1b0302f6c13e7effbb7
}
public boolean batRidable = false;
@@ -546,6 +548,7 @@ public class PurpurWorldConfig {
@@ -548,6 +550,7 @@ public class PurpurWorldConfig {
public boolean beeControllable = true;
public double beeMaxY = 320D;
public double beeMaxHealth = 10.0D;
@@ -549,7 +549,7 @@ index de9435f336643a0654796b2545210829569ec01f..b74313333e8bd1b0302f6c13e7effbb7
private void beeSettings() {
beeRidable = getBoolean("mobs.bee.ridable", beeRidable);
beeRidableInWater = getBoolean("mobs.bee.ridable-in-water", beeRidableInWater);
@@ -557,6 +560,7 @@ public class PurpurWorldConfig {
@@ -559,6 +562,7 @@ public class PurpurWorldConfig {
set("mobs.bee.attributes.max_health", oldValue);
}
beeMaxHealth = getDouble("mobs.bee.attributes.max_health", beeMaxHealth);
@@ -557,7 +557,7 @@ index de9435f336643a0654796b2545210829569ec01f..b74313333e8bd1b0302f6c13e7effbb7
}
public boolean blazeRidable = false;
@@ -577,6 +581,7 @@ public class PurpurWorldConfig {
@@ -579,6 +583,7 @@ public class PurpurWorldConfig {
blazeMaxHealth = getDouble("mobs.blaze.attributes.max_health", blazeMaxHealth);
}
@@ -565,7 +565,7 @@ index de9435f336643a0654796b2545210829569ec01f..b74313333e8bd1b0302f6c13e7effbb7
public double camelMaxHealthMin = 32.0D;
public double camelMaxHealthMax = 32.0D;
public double camelJumpStrengthMin = 0.42D;
@@ -590,6 +595,7 @@ public class PurpurWorldConfig {
@@ -592,6 +597,7 @@ public class PurpurWorldConfig {
camelJumpStrengthMax = getDouble("mobs.camel.attributes.jump_strength.max", camelJumpStrengthMax);
camelMovementSpeedMin = getDouble("mobs.camel.attributes.movement_speed.min", camelMovementSpeedMin);
camelMovementSpeedMax = getDouble("mobs.camel.attributes.movement_speed.max", camelMovementSpeedMax);
@@ -573,7 +573,7 @@ index de9435f336643a0654796b2545210829569ec01f..b74313333e8bd1b0302f6c13e7effbb7
}
public boolean catRidable = false;
@@ -599,6 +605,7 @@ public class PurpurWorldConfig {
@@ -601,6 +607,7 @@ public class PurpurWorldConfig {
public int catSpawnDelay = 1200;
public int catSpawnSwampHutScanRange = 16;
public int catSpawnVillageScanRange = 48;
@@ -581,7 +581,7 @@ index de9435f336643a0654796b2545210829569ec01f..b74313333e8bd1b0302f6c13e7effbb7
private void catSettings() {
catRidable = getBoolean("mobs.cat.ridable", catRidable);
catRidableInWater = getBoolean("mobs.cat.ridable-in-water", catRidableInWater);
@@ -612,6 +619,7 @@ public class PurpurWorldConfig {
@@ -614,6 +621,7 @@ public class PurpurWorldConfig {
catSpawnDelay = getInt("mobs.cat.spawn-delay", catSpawnDelay);
catSpawnSwampHutScanRange = getInt("mobs.cat.scan-range-for-other-cats.swamp-hut", catSpawnSwampHutScanRange);
catSpawnVillageScanRange = getInt("mobs.cat.scan-range-for-other-cats.village", catSpawnVillageScanRange);
@@ -589,7 +589,7 @@ index de9435f336643a0654796b2545210829569ec01f..b74313333e8bd1b0302f6c13e7effbb7
}
public boolean caveSpiderRidable = false;
@@ -635,6 +643,7 @@ public class PurpurWorldConfig {
@@ -637,6 +645,7 @@ public class PurpurWorldConfig {
public boolean chickenControllable = true;
public double chickenMaxHealth = 4.0D;
public boolean chickenRetaliate = false;
@@ -597,7 +597,7 @@ index de9435f336643a0654796b2545210829569ec01f..b74313333e8bd1b0302f6c13e7effbb7
private void chickenSettings() {
chickenRidable = getBoolean("mobs.chicken.ridable", chickenRidable);
chickenRidableInWater = getBoolean("mobs.chicken.ridable-in-water", chickenRidableInWater);
@@ -646,6 +655,7 @@ public class PurpurWorldConfig {
@@ -648,6 +657,7 @@ public class PurpurWorldConfig {
}
chickenMaxHealth = getDouble("mobs.chicken.attributes.max_health", chickenMaxHealth);
chickenRetaliate = getBoolean("mobs.chicken.retaliate", chickenRetaliate);
@@ -605,7 +605,7 @@ index de9435f336643a0654796b2545210829569ec01f..b74313333e8bd1b0302f6c13e7effbb7
}
public boolean codRidable = false;
@@ -667,6 +677,7 @@ public class PurpurWorldConfig {
@@ -669,6 +679,7 @@ public class PurpurWorldConfig {
public boolean cowControllable = true;
public double cowMaxHealth = 10.0D;
public int cowFeedMushrooms = 0;
@@ -613,7 +613,7 @@ index de9435f336643a0654796b2545210829569ec01f..b74313333e8bd1b0302f6c13e7effbb7
private void cowSettings() {
cowRidable = getBoolean("mobs.cow.ridable", cowRidable);
cowRidableInWater = getBoolean("mobs.cow.ridable-in-water", cowRidableInWater);
@@ -678,6 +689,7 @@ public class PurpurWorldConfig {
@@ -680,6 +691,7 @@ public class PurpurWorldConfig {
}
cowMaxHealth = getDouble("mobs.cow.attributes.max_health", cowMaxHealth);
cowFeedMushrooms = getInt("mobs.cow.feed-mushrooms-for-mooshroom", cowFeedMushrooms);
@@ -621,7 +621,7 @@ index de9435f336643a0654796b2545210829569ec01f..b74313333e8bd1b0302f6c13e7effbb7
}
public boolean creeperRidable = false;
@@ -729,6 +741,7 @@ public class PurpurWorldConfig {
@@ -731,6 +743,7 @@ public class PurpurWorldConfig {
public double donkeyJumpStrengthMax = 0.5D;
public double donkeyMovementSpeedMin = 0.175D;
public double donkeyMovementSpeedMax = 0.175D;
@@ -629,7 +629,7 @@ index de9435f336643a0654796b2545210829569ec01f..b74313333e8bd1b0302f6c13e7effbb7
private void donkeySettings() {
donkeyRidableInWater = getBoolean("mobs.donkey.ridable-in-water", donkeyRidableInWater);
if (PurpurConfig.version < 10) {
@@ -744,6 +757,7 @@ public class PurpurWorldConfig {
@@ -746,6 +759,7 @@ public class PurpurWorldConfig {
donkeyJumpStrengthMax = getDouble("mobs.donkey.attributes.jump_strength.max", donkeyJumpStrengthMax);
donkeyMovementSpeedMin = getDouble("mobs.donkey.attributes.movement_speed.min", donkeyMovementSpeedMin);
donkeyMovementSpeedMax = getDouble("mobs.donkey.attributes.movement_speed.max", donkeyMovementSpeedMax);
@@ -637,7 +637,7 @@ index de9435f336643a0654796b2545210829569ec01f..b74313333e8bd1b0302f6c13e7effbb7
}
public boolean drownedRidable = false;
@@ -863,6 +877,7 @@ public class PurpurWorldConfig {
@@ -865,6 +879,7 @@ public class PurpurWorldConfig {
public boolean foxControllable = true;
public double foxMaxHealth = 10.0D;
public boolean foxTypeChangesWithTulips = false;
@@ -645,7 +645,7 @@ index de9435f336643a0654796b2545210829569ec01f..b74313333e8bd1b0302f6c13e7effbb7
private void foxSettings() {
foxRidable = getBoolean("mobs.fox.ridable", foxRidable);
foxRidableInWater = getBoolean("mobs.fox.ridable-in-water", foxRidableInWater);
@@ -874,17 +889,20 @@ public class PurpurWorldConfig {
@@ -876,17 +891,20 @@ public class PurpurWorldConfig {
}
foxMaxHealth = getDouble("mobs.fox.attributes.max_health", foxMaxHealth);
foxTypeChangesWithTulips = getBoolean("mobs.fox.tulips-change-type", foxTypeChangesWithTulips);
@@ -653,7 +653,7 @@ index de9435f336643a0654796b2545210829569ec01f..b74313333e8bd1b0302f6c13e7effbb7
}
public boolean frogRidable = false;
public boolean frogRidableInWater = false;
public boolean frogRidableInWater = true;
public boolean frogControllable = true;
public float frogRidableJumpHeight = 0.65F;
+ public int frogBreedingTicks = 6000;
@@ -666,8 +666,8 @@ index de9435f336643a0654796b2545210829569ec01f..b74313333e8bd1b0302f6c13e7effbb7
}
public boolean ghastRidable = false;
@@ -952,11 +970,13 @@ public class PurpurWorldConfig {
public boolean goatRidableInWater = false;
@@ -954,11 +972,13 @@ public class PurpurWorldConfig {
public boolean goatRidableInWater = true;
public boolean goatControllable = true;
public double goatMaxHealth = 10.0D;
+ public int goatBreedingTicks = 6000;
@@ -680,15 +680,15 @@ index de9435f336643a0654796b2545210829569ec01f..b74313333e8bd1b0302f6c13e7effbb7
}
public boolean guardianRidable = false;
@@ -977,6 +997,7 @@ public class PurpurWorldConfig {
public boolean hoglinRidableInWater = false;
@@ -979,6 +999,7 @@ public class PurpurWorldConfig {
public boolean hoglinRidableInWater = true;
public boolean hoglinControllable = true;
public double hoglinMaxHealth = 40.0D;
+ public int hoglinBreedingTicks = 6000;
private void hoglinSettings() {
hoglinRidable = getBoolean("mobs.hoglin.ridable", hoglinRidable);
hoglinRidableInWater = getBoolean("mobs.hoglin.ridable-in-water", hoglinRidableInWater);
@@ -987,6 +1008,7 @@ public class PurpurWorldConfig {
@@ -989,6 +1010,7 @@ public class PurpurWorldConfig {
set("mobs.hoglin.attributes.max_health", oldValue);
}
hoglinMaxHealth = getDouble("mobs.hoglin.attributes.max_health", hoglinMaxHealth);
@@ -696,7 +696,7 @@ index de9435f336643a0654796b2545210829569ec01f..b74313333e8bd1b0302f6c13e7effbb7
}
public boolean horseRidableInWater = false;
@@ -996,6 +1018,7 @@ public class PurpurWorldConfig {
@@ -998,6 +1020,7 @@ public class PurpurWorldConfig {
public double horseJumpStrengthMax = 1.0D;
public double horseMovementSpeedMin = 0.1125D;
public double horseMovementSpeedMax = 0.3375D;
@@ -704,7 +704,7 @@ index de9435f336643a0654796b2545210829569ec01f..b74313333e8bd1b0302f6c13e7effbb7
private void horseSettings() {
horseRidableInWater = getBoolean("mobs.horse.ridable-in-water", horseRidableInWater);
if (PurpurConfig.version < 10) {
@@ -1011,6 +1034,7 @@ public class PurpurWorldConfig {
@@ -1013,6 +1036,7 @@ public class PurpurWorldConfig {
horseJumpStrengthMax = getDouble("mobs.horse.attributes.jump_strength.max", horseJumpStrengthMax);
horseMovementSpeedMin = getDouble("mobs.horse.attributes.movement_speed.min", horseMovementSpeedMin);
horseMovementSpeedMax = getDouble("mobs.horse.attributes.movement_speed.max", horseMovementSpeedMax);
@@ -712,7 +712,7 @@ index de9435f336643a0654796b2545210829569ec01f..b74313333e8bd1b0302f6c13e7effbb7
}
public boolean huskRidable = false;
@@ -1088,6 +1112,7 @@ public class PurpurWorldConfig {
@@ -1090,6 +1114,7 @@ public class PurpurWorldConfig {
public double llamaJumpStrengthMax = 0.5D;
public double llamaMovementSpeedMin = 0.175D;
public double llamaMovementSpeedMax = 0.175D;
@@ -720,7 +720,7 @@ index de9435f336643a0654796b2545210829569ec01f..b74313333e8bd1b0302f6c13e7effbb7
private void llamaSettings() {
llamaRidable = getBoolean("mobs.llama.ridable", llamaRidable);
llamaRidableInWater = getBoolean("mobs.llama.ridable-in-water", llamaRidableInWater);
@@ -1105,6 +1130,7 @@ public class PurpurWorldConfig {
@@ -1107,6 +1132,7 @@ public class PurpurWorldConfig {
llamaJumpStrengthMax = getDouble("mobs.llama.attributes.jump_strength.max", llamaJumpStrengthMax);
llamaMovementSpeedMin = getDouble("mobs.llama.attributes.movement_speed.min", llamaMovementSpeedMin);
llamaMovementSpeedMax = getDouble("mobs.llama.attributes.movement_speed.max", llamaMovementSpeedMax);
@@ -728,15 +728,15 @@ index de9435f336643a0654796b2545210829569ec01f..b74313333e8bd1b0302f6c13e7effbb7
}
public boolean magmaCubeRidable = false;
@@ -1133,6 +1159,7 @@ public class PurpurWorldConfig {
public boolean mooshroomRidableInWater = false;
@@ -1135,6 +1161,7 @@ public class PurpurWorldConfig {
public boolean mooshroomRidableInWater = true;
public boolean mooshroomControllable = true;
public double mooshroomMaxHealth = 10.0D;
+ public int mooshroomBreedingTicks = 6000;
private void mooshroomSettings() {
mooshroomRidable = getBoolean("mobs.mooshroom.ridable", mooshroomRidable);
mooshroomRidableInWater = getBoolean("mobs.mooshroom.ridable-in-water", mooshroomRidableInWater);
@@ -1143,6 +1170,7 @@ public class PurpurWorldConfig {
@@ -1145,6 +1172,7 @@ public class PurpurWorldConfig {
set("mobs.mooshroom.attributes.max_health", oldValue);
}
mooshroomMaxHealth = getDouble("mobs.mooshroom.attributes.max_health", mooshroomMaxHealth);
@@ -744,7 +744,7 @@ index de9435f336643a0654796b2545210829569ec01f..b74313333e8bd1b0302f6c13e7effbb7
}
public boolean muleRidableInWater = false;
@@ -1152,6 +1180,7 @@ public class PurpurWorldConfig {
@@ -1154,6 +1182,7 @@ public class PurpurWorldConfig {
public double muleJumpStrengthMax = 0.5D;
public double muleMovementSpeedMin = 0.175D;
public double muleMovementSpeedMax = 0.175D;
@@ -752,7 +752,7 @@ index de9435f336643a0654796b2545210829569ec01f..b74313333e8bd1b0302f6c13e7effbb7
private void muleSettings() {
muleRidableInWater = getBoolean("mobs.mule.ridable-in-water", muleRidableInWater);
if (PurpurConfig.version < 10) {
@@ -1167,12 +1196,14 @@ public class PurpurWorldConfig {
@@ -1169,12 +1198,14 @@ public class PurpurWorldConfig {
muleJumpStrengthMax = getDouble("mobs.mule.attributes.jump_strength.max", muleJumpStrengthMax);
muleMovementSpeedMin = getDouble("mobs.mule.attributes.movement_speed.min", muleMovementSpeedMin);
muleMovementSpeedMax = getDouble("mobs.mule.attributes.movement_speed.max", muleMovementSpeedMax);
@@ -760,14 +760,14 @@ index de9435f336643a0654796b2545210829569ec01f..b74313333e8bd1b0302f6c13e7effbb7
}
public boolean ocelotRidable = false;
public boolean ocelotRidableInWater = false;
public boolean ocelotRidableInWater = true;
public boolean ocelotControllable = true;
public double ocelotMaxHealth = 10.0D;
+ public int ocelotBreedingTicks = 6000;
private void ocelotSettings() {
ocelotRidable = getBoolean("mobs.ocelot.ridable", ocelotRidable);
ocelotRidableInWater = getBoolean("mobs.ocelot.ridable-in-water", ocelotRidableInWater);
@@ -1183,12 +1214,14 @@ public class PurpurWorldConfig {
@@ -1185,12 +1216,14 @@ public class PurpurWorldConfig {
set("mobs.ocelot.attributes.max_health", oldValue);
}
ocelotMaxHealth = getDouble("mobs.ocelot.attributes.max_health", ocelotMaxHealth);
@@ -775,14 +775,14 @@ index de9435f336643a0654796b2545210829569ec01f..b74313333e8bd1b0302f6c13e7effbb7
}
public boolean pandaRidable = false;
public boolean pandaRidableInWater = false;
public boolean pandaRidableInWater = true;
public boolean pandaControllable = true;
public double pandaMaxHealth = 20.0D;
+ public int pandaBreedingTicks = 6000;
private void pandaSettings() {
pandaRidable = getBoolean("mobs.panda.ridable", pandaRidable);
pandaRidableInWater = getBoolean("mobs.panda.ridable-in-water", pandaRidableInWater);
@@ -1199,6 +1232,7 @@ public class PurpurWorldConfig {
@@ -1201,6 +1234,7 @@ public class PurpurWorldConfig {
set("mobs.panda.attributes.max_health", oldValue);
}
pandaMaxHealth = getDouble("mobs.panda.attributes.max_health", pandaMaxHealth);
@@ -790,7 +790,7 @@ index de9435f336643a0654796b2545210829569ec01f..b74313333e8bd1b0302f6c13e7effbb7
}
public boolean parrotRidable = false;
@@ -1282,6 +1316,7 @@ public class PurpurWorldConfig {
@@ -1284,6 +1318,7 @@ public class PurpurWorldConfig {
public boolean pigControllable = true;
public double pigMaxHealth = 10.0D;
public boolean pigGiveSaddleBack = false;
@@ -798,7 +798,7 @@ index de9435f336643a0654796b2545210829569ec01f..b74313333e8bd1b0302f6c13e7effbb7
private void pigSettings() {
pigRidable = getBoolean("mobs.pig.ridable", pigRidable);
pigRidableInWater = getBoolean("mobs.pig.ridable-in-water", pigRidableInWater);
@@ -1293,6 +1328,7 @@ public class PurpurWorldConfig {
@@ -1295,6 +1330,7 @@ public class PurpurWorldConfig {
}
pigMaxHealth = getDouble("mobs.pig.attributes.max_health", pigMaxHealth);
pigGiveSaddleBack = getBoolean("mobs.pig.give-saddle-back", pigGiveSaddleBack);
@@ -806,7 +806,7 @@ index de9435f336643a0654796b2545210829569ec01f..b74313333e8bd1b0302f6c13e7effbb7
}
public boolean piglinRidable = false;
@@ -1349,6 +1385,7 @@ public class PurpurWorldConfig {
@@ -1351,6 +1387,7 @@ public class PurpurWorldConfig {
public double polarBearMaxHealth = 30.0D;
public String polarBearBreedableItemString = "";
public Item polarBearBreedableItem = null;
@@ -814,7 +814,7 @@ index de9435f336643a0654796b2545210829569ec01f..b74313333e8bd1b0302f6c13e7effbb7
private void polarBearSettings() {
polarBearRidable = getBoolean("mobs.polar_bear.ridable", polarBearRidable);
polarBearRidableInWater = getBoolean("mobs.polar_bear.ridable-in-water", polarBearRidableInWater);
@@ -1362,6 +1399,7 @@ public class PurpurWorldConfig {
@@ -1364,6 +1401,7 @@ public class PurpurWorldConfig {
polarBearBreedableItemString = getString("mobs.polar_bear.breedable-item", polarBearBreedableItemString);
Item item = BuiltInRegistries.ITEM.get(new ResourceLocation(polarBearBreedableItemString));
if (item != Items.AIR) polarBearBreedableItem = item;
@@ -822,7 +822,7 @@ index de9435f336643a0654796b2545210829569ec01f..b74313333e8bd1b0302f6c13e7effbb7
}
public boolean pufferfishRidable = false;
@@ -1384,6 +1422,7 @@ public class PurpurWorldConfig {
@@ -1386,6 +1424,7 @@ public class PurpurWorldConfig {
public double rabbitMaxHealth = 3.0D;
public double rabbitNaturalToast = 0.0D;
public double rabbitNaturalKiller = 0.0D;
@@ -830,7 +830,7 @@ index de9435f336643a0654796b2545210829569ec01f..b74313333e8bd1b0302f6c13e7effbb7
private void rabbitSettings() {
rabbitRidable = getBoolean("mobs.rabbit.ridable", rabbitRidable);
rabbitRidableInWater = getBoolean("mobs.rabbit.ridable-in-water", rabbitRidableInWater);
@@ -1396,6 +1435,7 @@ public class PurpurWorldConfig {
@@ -1398,6 +1437,7 @@ public class PurpurWorldConfig {
rabbitMaxHealth = getDouble("mobs.rabbit.attributes.max_health", rabbitMaxHealth);
rabbitNaturalToast = getDouble("mobs.rabbit.spawn-toast-chance", rabbitNaturalToast);
rabbitNaturalKiller = getDouble("mobs.rabbit.spawn-killer-rabbit-chance", rabbitNaturalKiller);
@@ -838,15 +838,15 @@ index de9435f336643a0654796b2545210829569ec01f..b74313333e8bd1b0302f6c13e7effbb7
}
public boolean ravagerRidable = false;
@@ -1432,6 +1472,7 @@ public class PurpurWorldConfig {
public boolean sheepRidableInWater = false;
@@ -1434,6 +1474,7 @@ public class PurpurWorldConfig {
public boolean sheepRidableInWater = true;
public boolean sheepControllable = true;
public double sheepMaxHealth = 8.0D;
+ public int sheepBreedingTicks = 6000;
private void sheepSettings() {
sheepRidable = getBoolean("mobs.sheep.ridable", sheepRidable);
sheepRidableInWater = getBoolean("mobs.sheep.ridable-in-water", sheepRidableInWater);
@@ -1442,6 +1483,7 @@ public class PurpurWorldConfig {
@@ -1444,6 +1485,7 @@ public class PurpurWorldConfig {
set("mobs.sheep.attributes.max_health", oldValue);
}
sheepMaxHealth = getDouble("mobs.sheep.attributes.max_health", sheepMaxHealth);
@@ -854,8 +854,8 @@ index de9435f336643a0654796b2545210829569ec01f..b74313333e8bd1b0302f6c13e7effbb7
}
public boolean shulkerRidable = false;
@@ -1565,11 +1607,13 @@ public class PurpurWorldConfig {
public boolean snifferRidableInWater = false;
@@ -1567,11 +1609,13 @@ public class PurpurWorldConfig {
public boolean snifferRidableInWater = true;
public boolean snifferControllable = true;
public double snifferMaxHealth = 14.0D;
+ public int snifferBreedingTicks = 6000;
@@ -868,7 +868,7 @@ index de9435f336643a0654796b2545210829569ec01f..b74313333e8bd1b0302f6c13e7effbb7
}
public boolean squidRidable = false;
@@ -1628,6 +1672,7 @@ public class PurpurWorldConfig {
@@ -1630,6 +1674,7 @@ public class PurpurWorldConfig {
public boolean striderRidableInWater = false;
public boolean striderControllable = true;
public double striderMaxHealth = 20.0D;
@@ -876,7 +876,7 @@ index de9435f336643a0654796b2545210829569ec01f..b74313333e8bd1b0302f6c13e7effbb7
private void striderSettings() {
striderRidable = getBoolean("mobs.strider.ridable", striderRidable);
striderRidableInWater = getBoolean("mobs.strider.ridable-in-water", striderRidableInWater);
@@ -1638,6 +1683,7 @@ public class PurpurWorldConfig {
@@ -1640,6 +1685,7 @@ public class PurpurWorldConfig {
set("mobs.strider.attributes.max_health", oldValue);
}
striderMaxHealth = getDouble("mobs.strider.attributes.max_health", striderMaxHealth);
@@ -884,7 +884,7 @@ index de9435f336643a0654796b2545210829569ec01f..b74313333e8bd1b0302f6c13e7effbb7
}
public boolean tadpoleRidable = false;
@@ -1658,6 +1704,7 @@ public class PurpurWorldConfig {
@@ -1660,6 +1706,7 @@ public class PurpurWorldConfig {
public double traderLlamaJumpStrengthMax = 0.5D;
public double traderLlamaMovementSpeedMin = 0.175D;
public double traderLlamaMovementSpeedMax = 0.175D;
@@ -892,7 +892,7 @@ index de9435f336643a0654796b2545210829569ec01f..b74313333e8bd1b0302f6c13e7effbb7
private void traderLlamaSettings() {
traderLlamaRidable = getBoolean("mobs.trader_llama.ridable", traderLlamaRidable);
traderLlamaRidableInWater = getBoolean("mobs.trader_llama.ridable-in-water", traderLlamaRidableInWater);
@@ -1675,6 +1722,7 @@ public class PurpurWorldConfig {
@@ -1677,6 +1724,7 @@ public class PurpurWorldConfig {
traderLlamaJumpStrengthMax = getDouble("mobs.trader_llama.attributes.jump_strength.max", traderLlamaJumpStrengthMax);
traderLlamaMovementSpeedMin = getDouble("mobs.trader_llama.attributes.movement_speed.min", traderLlamaMovementSpeedMin);
traderLlamaMovementSpeedMax = getDouble("mobs.trader_llama.attributes.movement_speed.max", traderLlamaMovementSpeedMax);
@@ -900,15 +900,15 @@ index de9435f336643a0654796b2545210829569ec01f..b74313333e8bd1b0302f6c13e7effbb7
}
public boolean tropicalFishRidable = false;
@@ -1695,6 +1743,7 @@ public class PurpurWorldConfig {
public boolean turtleRidableInWater = false;
@@ -1697,6 +1745,7 @@ public class PurpurWorldConfig {
public boolean turtleRidableInWater = true;
public boolean turtleControllable = true;
public double turtleMaxHealth = 30.0D;
+ public int turtleBreedingTicks = 6000;
private void turtleSettings() {
turtleRidable = getBoolean("mobs.turtle.ridable", turtleRidable);
turtleRidableInWater = getBoolean("mobs.turtle.ridable-in-water", turtleRidableInWater);
@@ -1705,6 +1754,7 @@ public class PurpurWorldConfig {
@@ -1707,6 +1756,7 @@ public class PurpurWorldConfig {
set("mobs.turtle.attributes.max_health", oldValue);
}
turtleMaxHealth = getDouble("mobs.turtle.attributes.max_health", turtleMaxHealth);
@@ -916,7 +916,7 @@ index de9435f336643a0654796b2545210829569ec01f..b74313333e8bd1b0302f6c13e7effbb7
}
public boolean vexRidable = false;
@@ -1732,6 +1782,7 @@ public class PurpurWorldConfig {
@@ -1734,6 +1784,7 @@ public class PurpurWorldConfig {
public boolean villagerFollowEmeraldBlock = false;
public boolean villagerCanBeLeashed = false;
public boolean villagerCanBreed = true;
@@ -924,7 +924,7 @@ index de9435f336643a0654796b2545210829569ec01f..b74313333e8bd1b0302f6c13e7effbb7
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1745,6 +1796,7 @@ public class PurpurWorldConfig {
@@ -1747,6 +1798,7 @@ public class PurpurWorldConfig {
villagerFollowEmeraldBlock = getBoolean("mobs.villager.follow-emerald-blocks", villagerFollowEmeraldBlock);
villagerCanBeLeashed = getBoolean("mobs.villager.can-be-leashed", villagerCanBeLeashed);
villagerCanBreed = getBoolean("mobs.villager.can-breed", villagerCanBreed);
@@ -932,15 +932,15 @@ index de9435f336643a0654796b2545210829569ec01f..b74313333e8bd1b0302f6c13e7effbb7
}
public boolean vindicatorRidable = false;
@@ -1856,6 +1908,7 @@ public class PurpurWorldConfig {
public boolean wolfRidableInWater = false;
@@ -1858,6 +1910,7 @@ public class PurpurWorldConfig {
public boolean wolfRidableInWater = true;
public boolean wolfControllable = true;
public double wolfMaxHealth = 8.0D;
+ public int wolfBreedingTicks = 6000;
private void wolfSettings() {
wolfRidable = getBoolean("mobs.wolf.ridable", wolfRidable);
wolfRidableInWater = getBoolean("mobs.wolf.ridable-in-water", wolfRidableInWater);
@@ -1866,6 +1919,7 @@ public class PurpurWorldConfig {
@@ -1868,6 +1921,7 @@ public class PurpurWorldConfig {
set("mobs.wolf.attributes.max_health", oldValue);
}
wolfMaxHealth = getDouble("mobs.wolf.attributes.max_health", wolfMaxHealth);