it compiles \o/

This commit is contained in:
granny
2023-03-16 02:12:43 -07:00
parent 3c0d4f1d84
commit 55dbafe799
64 changed files with 599 additions and 814 deletions

View File

@@ -9,7 +9,7 @@ This patch adds a config option to allow the minimum demand to instead
be configurable.
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 1e3bc16aee307948e6d42a39aa17db96d14bd43b..a74498a97eb486a2bda63beb96ee0b8075122d2a 100644
index 92adb537f342f3da41c91cf2c3141425e68e3cb7..598f03c777c729b13a97d328ffb4a450415b66d6 100644
--- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
+++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
@@ -535,7 +535,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
@@ -40,10 +40,10 @@ index fd50d1c2435b82215bc5b3fdbe5044d426bc342e..68ffea572045634f1ad67a6954d480e6
public ItemStack assemble() {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 94a6a30f186b0080920d1260df896cf62ef85ed4..10c4d336ccee50d1849c84c08536747169495ba7 100644
index b76778dde88408667e43c0ea54906051157067b0..12aac9a21d8ded7429bcda4dc62fcd52787982a8 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2678,6 +2678,7 @@ public class PurpurWorldConfig {
@@ -2683,6 +2683,7 @@ public class PurpurWorldConfig {
public boolean villagerTakeDamageFromWater = false;
public boolean villagerAllowTrading = true;
public boolean villagerAlwaysDropExp = false;
@@ -51,7 +51,7 @@ index 94a6a30f186b0080920d1260df896cf62ef85ed4..10c4d336ccee50d1849c84c085367471
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -2698,6 +2699,7 @@ public class PurpurWorldConfig {
@@ -2703,6 +2704,7 @@ public class PurpurWorldConfig {
villagerTakeDamageFromWater = getBoolean("mobs.villager.takes-damage-from-water", villagerTakeDamageFromWater);
villagerAllowTrading = getBoolean("mobs.villager.allow-trading", villagerAllowTrading);
villagerAlwaysDropExp = getBoolean("mobs.villager.always-drop-exp", villagerAlwaysDropExp);