add ridable 1.19 mobs

This commit is contained in:
BillyGalbreath
2022-06-12 09:06:50 -05:00
parent 99b1dd738d
commit 0045a57c5d
83 changed files with 995 additions and 689 deletions

View File

@@ -31,10 +31,10 @@ index 6dd8856816bebb2766203589048cc68b3f5c8f5c..8d6930868a42b9fc98d7672bff433ec5
this.openTradingScreen(player, this.getDisplayName(), 1);
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index ea1a37575f69472f504fd688b8568f4a8d6fc6cc..bed116f39309d6aa7f34ba7a5e939d294a5ff5c1 100644
index f07c2a1a3cfa05e500e581297e663c7e00dc7496..fd22332802f798142d25b90b324741ca4319ae16 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2049,6 +2049,7 @@ public class PurpurWorldConfig {
@@ -2075,6 +2075,7 @@ public class PurpurWorldConfig {
public boolean villagerClericFarmersThrowWarts = true;
public boolean villagerBypassMobGriefing = false;
public boolean villagerTakeDamageFromWater = false;
@@ -42,7 +42,7 @@ index ea1a37575f69472f504fd688b8568f4a8d6fc6cc..bed116f39309d6aa7f34ba7a5e939d29
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -2069,6 +2070,7 @@ public class PurpurWorldConfig {
@@ -2095,6 +2096,7 @@ public class PurpurWorldConfig {
villagerClericFarmersThrowWarts = getBoolean("mobs.villager.cleric-wart-farmers-throw-warts-at-villagers", villagerClericFarmersThrowWarts);
villagerBypassMobGriefing = getBoolean("mobs.villager.bypass-mob-griefing", villagerBypassMobGriefing);
villagerTakeDamageFromWater = getBoolean("mobs.villager.takes-damage-from-water", villagerTakeDamageFromWater);
@@ -50,7 +50,7 @@ index ea1a37575f69472f504fd688b8568f4a8d6fc6cc..bed116f39309d6aa7f34ba7a5e939d29
}
public boolean vindicatorRidable = false;
@@ -2098,6 +2100,7 @@ public class PurpurWorldConfig {
@@ -2124,6 +2126,7 @@ public class PurpurWorldConfig {
public boolean wanderingTraderFollowEmeraldBlock = false;
public boolean wanderingTraderCanBeLeashed = false;
public boolean wanderingTraderTakeDamageFromWater = false;
@@ -58,11 +58,11 @@ index ea1a37575f69472f504fd688b8568f4a8d6fc6cc..bed116f39309d6aa7f34ba7a5e939d29
private void wanderingTraderSettings() {
wanderingTraderRidable = getBoolean("mobs.wandering_trader.ridable", wanderingTraderRidable);
wanderingTraderRidableInWater = getBoolean("mobs.wandering_trader.ridable-in-water", wanderingTraderRidableInWater);
@@ -2111,6 +2114,7 @@ public class PurpurWorldConfig {
@@ -2137,6 +2140,7 @@ public class PurpurWorldConfig {
wanderingTraderFollowEmeraldBlock = getBoolean("mobs.wandering_trader.follow-emerald-blocks", wanderingTraderFollowEmeraldBlock);
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);
}
public boolean witchRidable = false;
public boolean wardenRidable = false;