adds ridable option to zombie horse and skeleton horse, fixes #1458

only set as tamable if already tamed or if ridable option is enabled
This commit is contained in:
granny
2023-11-13 23:41:37 -08:00
parent 1adf78b91a
commit 2a38801aeb
41 changed files with 309 additions and 301 deletions

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable villager breeding
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 616a6c78a056839575b4dabfeebb7cb2dce25026..1754c88d9b3bdbce721062c564a5f61c2ad14e86 100644
index 4dac757aec546c2128506ee899ee9517441595d1..cf4950ae95e18f64856e4bce8e70772268f3fa3a 100644
--- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
+++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
@@ -786,7 +786,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
@@ -18,10 +18,10 @@ index 616a6c78a056839575b4dabfeebb7cb2dce25026..1754c88d9b3bdbce721062c564a5f61c
private boolean hungry() {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 35be76739cda5aa4a075dc665e7702a9269d4333..9cd4d38da512f209db7196f632031d51acc5947c 100644
index 81dd8666fd997f92972da2c6980c6ce515582fbc..51dd20665e5cdf1e76a63367d75890d4ae8f55b6 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1611,6 +1611,7 @@ public class PurpurWorldConfig {
@@ -1613,6 +1613,7 @@ public class PurpurWorldConfig {
public double villagerMaxHealth = 20.0D;
public boolean villagerFollowEmeraldBlock = false;
public boolean villagerCanBeLeashed = false;
@@ -29,7 +29,7 @@ index 35be76739cda5aa4a075dc665e7702a9269d4333..9cd4d38da512f209db7196f632031d51
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1623,6 +1624,7 @@ public class PurpurWorldConfig {
@@ -1625,6 +1626,7 @@ public class PurpurWorldConfig {
villagerMaxHealth = getDouble("mobs.villager.attributes.max_health", villagerMaxHealth);
villagerFollowEmeraldBlock = getBoolean("mobs.villager.follow-emerald-blocks", villagerFollowEmeraldBlock);
villagerCanBeLeashed = getBoolean("mobs.villager.can-be-leashed", villagerCanBeLeashed);