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

fix compile

Browse Source
This commit is contained in:
Ben Kerllenevich
2021-12-05 18:18:14 -05:00
parent 7fe89b5a84
commit 0ae1daa043
12 changed files with 72 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,10 +31,10 @@ index e5b78c9d6fb326771d65ea9afd9da38c204922f0..1a8df13b06b1ac5e5a7d63033b4a5326
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 63e74fc0f42e5cfe2cb60434959d4c76e6b76093..a3204f9a70846a589c54bda34d1575648e4a48aa 100644
index c757abcb7238a4105646b17ff618ac226dc9597b..49ec4ebc95c4b9fbec333109ff0548a51dfcbe1a 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1921,6 +1921,7 @@ public class PurpurWorldConfig {
@@ -1926,6 +1926,7 @@ public class PurpurWorldConfig {
public boolean villagerClericFarmersThrowWarts = true;
public boolean villagerBypassMobGriefing = false;
public boolean villagerTakeDamageFromWater = false;
@@ -42,7 +42,7 @@ index 63e74fc0f42e5cfe2cb60434959d4c76e6b76093..a3204f9a70846a589c54bda34d157564
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1942,6 +1943,7 @@ public class PurpurWorldConfig {
@@ -1947,6 +1948,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 63e74fc0f42e5cfe2cb60434959d4c76e6b76093..a3204f9a70846a589c54bda34d157564
}
public boolean vindicatorRidable = false;
@@ -1968,6 +1970,7 @@ public class PurpurWorldConfig {
@@ -1973,6 +1975,7 @@ public class PurpurWorldConfig {
public boolean wanderingTraderFollowEmeraldBlock = false;
public boolean wanderingTraderCanBeLeashed = false;
public boolean wanderingTraderTakeDamageFromWater = false;
@@ -58,7 +58,7 @@ index 63e74fc0f42e5cfe2cb60434959d4c76e6b76093..a3204f9a70846a589c54bda34d157564
private void wanderingTraderSettings() {
wanderingTraderRidable = getBoolean("mobs.wandering_trader.ridable", wanderingTraderRidable);
wanderingTraderRidableInWater = getBoolean("mobs.wandering_trader.ridable-in-water", wanderingTraderRidableInWater);
@@ -1980,6 +1983,7 @@ public class PurpurWorldConfig {
@@ -1985,6 +1988,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);