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

add camel attributes to config, fixes #1224

Browse Source
This commit is contained in:
granny
2023-01-20 02:44:41 -08:00
parent a1238c38b2
commit 15a76c78b1
78 changed files with 641 additions and 608 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/server/0149-Add-config-for-villager-trading.patch
View File

@@ -31,10 +31,10 @@ index a028732368cdc6b249135742b4a86920d95fa76e..eed9fed34fde4d27e424507f2f05510d
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 4d9f2529245958ddd9f6b74e758f73420b8a7ed6..6a915354f9f3fd0fc18ea0f44cc242623c989477 100644
index 036e1350b4ea235aa4a8fc73cec8fa84f9c41be3..2cdb2ea411cf35be1b758a8d134a8af06dc55390 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2099,6 +2099,7 @@ public class PurpurWorldConfig {
@@ -2111,6 +2111,7 @@ public class PurpurWorldConfig {
public boolean villagerClericFarmersThrowWarts = true;
public boolean villagerBypassMobGriefing = false;
public boolean villagerTakeDamageFromWater = false;
@@ -42,7 +42,7 @@ index 4d9f2529245958ddd9f6b74e758f73420b8a7ed6..6a915354f9f3fd0fc18ea0f44cc24262
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -2117,6 +2118,7 @@ public class PurpurWorldConfig {
@@ -2129,6 +2130,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 4d9f2529245958ddd9f6b74e758f73420b8a7ed6..6a915354f9f3fd0fc18ea0f44cc24262
}
public boolean vindicatorRidable = false;
@@ -2146,6 +2148,7 @@ public class PurpurWorldConfig {
@@ -2158,6 +2160,7 @@ public class PurpurWorldConfig {
public boolean wanderingTraderFollowEmeraldBlock = false;
public boolean wanderingTraderCanBeLeashed = false;
public boolean wanderingTraderTakeDamageFromWater = false;
@@ -58,7 +58,7 @@ index 4d9f2529245958ddd9f6b74e758f73420b8a7ed6..6a915354f9f3fd0fc18ea0f44cc24262
private void wanderingTraderSettings() {
wanderingTraderRidable = getBoolean("mobs.wandering_trader.ridable", wanderingTraderRidable);
wanderingTraderRidableInWater = getBoolean("mobs.wandering_trader.ridable-in-water", wanderingTraderRidableInWater);
@@ -2159,6 +2162,7 @@ public class PurpurWorldConfig {
@@ -2171,6 +2174,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);