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

Fix #462 - also renamed option for clarity

Browse Source
This commit is contained in:
William Blake Galbreath
2021-07-03 08:00:18 -05:00
parent 1ca029cdcc
commit c69c0bcadf
46 changed files with 225 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,10 +31,10 @@ index c48935d35a6141c41db22e3ec172d5994fd317a2..fa4644c11cbb252734a6f5dc21c861d2
this.openTradingScreen(player, this.getDisplayName(), 1);
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index fa9c318e229b74b5aabf1a43245d1a125f55c4c6..294211ce6652726b4b71e2c3c537b7dd26ac9a3d 100644
index 51dee2334645564520e1caadeb84513df38d4b3d..8db9f5a20a3cfffcb89f9fb0b1e664cc3ef45d13 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1828,6 +1828,7 @@ public class PurpurWorldConfig {
@@ -1834,6 +1834,7 @@ public class PurpurWorldConfig {
public boolean villagerClericsFarmWarts = false;
public boolean villagerClericFarmersThrowWarts = true;
public boolean villagerBypassMobGriefing = false;
@@ -42,7 +42,7 @@ index fa9c318e229b74b5aabf1a43245d1a125f55c4c6..294211ce6652726b4b71e2c3c537b7dd
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1855,6 +1856,7 @@ public class PurpurWorldConfig {
@@ -1861,6 +1862,7 @@ public class PurpurWorldConfig {
villagerClericsFarmWarts = getBoolean("mobs.villager.clerics-farm-warts", villagerClericsFarmWarts);
villagerClericFarmersThrowWarts = getBoolean("mobs.villager.cleric-wart-farmers-throw-warts-at-villagers", villagerClericFarmersThrowWarts);
villagerBypassMobGriefing = getBoolean("mobs.villager.bypass-mob-griefing", villagerBypassMobGriefing);
@@ -50,7 +50,7 @@ index fa9c318e229b74b5aabf1a43245d1a125f55c4c6..294211ce6652726b4b71e2c3c537b7dd
}
public boolean vindicatorRidable = false;
@@ -1878,6 +1880,7 @@ public class PurpurWorldConfig {
@@ -1884,6 +1886,7 @@ public class PurpurWorldConfig {
public double wanderingTraderMaxHealth = 20.0D;
public boolean wanderingTraderFollowEmeraldBlock = false;
public boolean wanderingTraderCanBeLeashed = false;
@@ -58,7 +58,7 @@ index fa9c318e229b74b5aabf1a43245d1a125f55c4c6..294211ce6652726b4b71e2c3c537b7dd
private void wanderingTraderSettings() {
wanderingTraderRidable = getBoolean("mobs.wandering_trader.ridable", wanderingTraderRidable);
wanderingTraderRidableInWater = getBoolean("mobs.wandering_trader.ridable-in-water", wanderingTraderRidableInWater);
@@ -1889,6 +1892,7 @@ public class PurpurWorldConfig {
@@ -1895,6 +1898,7 @@ public class PurpurWorldConfig {
wanderingTraderMaxHealth = getDouble("mobs.wandering_trader.attributes.max_health", wanderingTraderMaxHealth);
wanderingTraderFollowEmeraldBlock = getBoolean("mobs.wandering_trader.follow-emerald-blocks", wanderingTraderFollowEmeraldBlock);
wanderingTraderCanBeLeashed = getBoolean("mobs.wandering_trader.can-be-leashed", wanderingTraderCanBeLeashed);