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

Add hoe tilling options

Browse Source
This commit is contained in:
William Blake Galbreath
2021-07-02 21:09:45 -05:00
parent c0244ecd2e
commit 1a325f68dc
181 changed files with 845 additions and 620 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,7 +5,7 @@ Subject: [PATCH] Add config for villager trading
diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
index 3b404c12ba12d75caaeb2161eb18abaf3c14ae57..65124562a96e1e1e601b790db7a5c5e128c75e5e 100644
index 1cc8349d08ab6877a15075cf71236b7ae07314cc..fd5c077628733365527f339efc96f0a8620b8e1a 100644
--- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
+++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
@@ -375,7 +375,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
@@ -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 8084386be71afd0138c7092e9a8a57bf7a0fc99b..763b4087eb9325aa4b34a4e47aa126dd9bcbfcbe 100644
index fa9c318e229b74b5aabf1a43245d1a125f55c4c6..294211ce6652726b4b71e2c3c537b7dd26ac9a3d 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1821,6 +1821,7 @@ public class PurpurWorldConfig {
@@ -1828,6 +1828,7 @@ public class PurpurWorldConfig {
public boolean villagerClericsFarmWarts = false;
public boolean villagerClericFarmersThrowWarts = true;
public boolean villagerBypassMobGriefing = false;
@@ -42,7 +42,7 @@ index 8084386be71afd0138c7092e9a8a57bf7a0fc99b..763b4087eb9325aa4b34a4e47aa126dd
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1848,6 +1849,7 @@ public class PurpurWorldConfig {
@@ -1855,6 +1856,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 8084386be71afd0138c7092e9a8a57bf7a0fc99b..763b4087eb9325aa4b34a4e47aa126dd
}
public boolean vindicatorRidable = false;
@@ -1871,6 +1873,7 @@ public class PurpurWorldConfig {
@@ -1878,6 +1880,7 @@ public class PurpurWorldConfig {
public double wanderingTraderMaxHealth = 20.0D;
public boolean wanderingTraderFollowEmeraldBlock = false;
public boolean wanderingTraderCanBeLeashed = false;
@@ -58,7 +58,7 @@ index 8084386be71afd0138c7092e9a8a57bf7a0fc99b..763b4087eb9325aa4b34a4e47aa126dd
private void wanderingTraderSettings() {
wanderingTraderRidable = getBoolean("mobs.wandering_trader.ridable", wanderingTraderRidable);
wanderingTraderRidableInWater = getBoolean("mobs.wandering_trader.ridable-in-water", wanderingTraderRidableInWater);
@@ -1882,6 +1885,7 @@ public class PurpurWorldConfig {
@@ -1889,6 +1892,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);