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

Flying glow squids

Browse Source
This commit is contained in:
William Blake Galbreath
2021-06-21 22:55:45 -05:00
parent 9e531fe333
commit afabb3c5b6
21 changed files with 157 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/server/0173-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 a133696790f9f78f80de5de906e04b36fa09ce32..b6a32174aa55585d28340d0f9883e57e95deec41 100644
index c8f4b025a20bd8d6dee4808e597e1e5e295149cc..3ebb64879cf8e920e9ae967791cd62bfdfcbd192 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1808,6 +1808,7 @@ public class PurpurWorldConfig {
@@ -1810,6 +1810,7 @@ public class PurpurWorldConfig {
public boolean villagerClericsFarmWarts = false;
public boolean villagerClericFarmersThrowWarts = true;
public boolean villagerBypassMobGriefing = false;
@@ -42,7 +42,7 @@ index a133696790f9f78f80de5de906e04b36fa09ce32..b6a32174aa55585d28340d0f9883e57e
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1835,6 +1836,7 @@ public class PurpurWorldConfig {
@@ -1837,6 +1838,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 a133696790f9f78f80de5de906e04b36fa09ce32..b6a32174aa55585d28340d0f9883e57e
}
public boolean vindicatorRidable = false;
@@ -1858,6 +1860,7 @@ public class PurpurWorldConfig {
@@ -1860,6 +1862,7 @@ public class PurpurWorldConfig {
public double wanderingTraderMaxHealth = 20.0D;
public boolean wanderingTraderFollowEmeraldBlock = false;
public boolean wanderingTraderCanBeLeashed = false;
@@ -58,7 +58,7 @@ index a133696790f9f78f80de5de906e04b36fa09ce32..b6a32174aa55585d28340d0f9883e57e
private void wanderingTraderSettings() {
wanderingTraderRidable = getBoolean("mobs.wandering_trader.ridable", wanderingTraderRidable);
wanderingTraderRidableInWater = getBoolean("mobs.wandering_trader.ridable-in-water", wanderingTraderRidableInWater);
@@ -1869,6 +1872,7 @@ public class PurpurWorldConfig {
@@ -1871,6 +1874,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);