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

Rebase on latest Purpur (#230)

Browse Source
This commit is contained in:
Encode42
2021-03-24 20:26:18 -04:00
committed by GitHub
parent 754948e524
commit b6235af624
94 changed files with 261 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,10 +31,10 @@ index b84916c0c58fd208ef5547299f8db8462d1c42fe..0b6b6aa6b358759c45bbcf4a9ffa5377
this.openTrade(entityhuman, this.getScoreboardDisplayName(), 1);
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index fcf6095d1ff6deb4231866cd482f7d5d3040ad19..adb9166b15654a81b2a852b518beea52a1ee8327 100644
index bcebbb0ada90236edc22602884076c47c68a49b1..ae2137017cd149812e3e51d513d8768026a37a9c 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1712,6 +1712,7 @@ public class PurpurWorldConfig {
@@ -1724,6 +1724,7 @@ public class PurpurWorldConfig {
public boolean villagerClericsFarmWarts = false;
public boolean villagerClericFarmersThrowWarts = true;
public double villagerMaxHealth = 20.0D;
@@ -42,7 +42,7 @@ index fcf6095d1ff6deb4231866cd482f7d5d3040ad19..adb9166b15654a81b2a852b518beea52
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1739,6 +1740,7 @@ public class PurpurWorldConfig {
@@ -1751,6 +1752,7 @@ public class PurpurWorldConfig {
set("mobs.villager.attributes.max_health", oldValue);
}
villagerMaxHealth = getDouble("mobs.villager.attributes.max_health", villagerMaxHealth);
@@ -50,7 +50,7 @@ index fcf6095d1ff6deb4231866cd482f7d5d3040ad19..adb9166b15654a81b2a852b518beea52
}
public boolean villagerTraderRidable = false;
@@ -1746,6 +1748,7 @@ public class PurpurWorldConfig {
@@ -1758,6 +1760,7 @@ public class PurpurWorldConfig {
public boolean villagerTraderCanBeLeashed = false;
public boolean villagerTraderFollowEmeraldBlock = false;
public double villagerTraderMaxHealth = 20.0D;
@@ -58,7 +58,7 @@ index fcf6095d1ff6deb4231866cd482f7d5d3040ad19..adb9166b15654a81b2a852b518beea52
private void villagerTraderSettings() {
villagerTraderRidable = getBoolean("mobs.wandering_trader.ridable", villagerTraderRidable);
villagerTraderRidableInWater = getBoolean("mobs.wandering_trader.ridable-in-water", villagerTraderRidableInWater);
@@ -1757,6 +1760,7 @@ public class PurpurWorldConfig {
@@ -1769,6 +1772,7 @@ public class PurpurWorldConfig {
set("mobs.wandering_trader.attributes.max_health", oldValue);
}
villagerTraderMaxHealth = getDouble("mobs.wandering_trader.attributes.max_health", villagerTraderMaxHealth);