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

[ci-skip] remove unused config option

Browse Source 
not sure why we didn't do this during the 1.19.2 update
This commit is contained in:
granny
2023-03-14 21:56:31 -07:00
parent 72b75798c5
commit 67066cdd46
86 changed files with 620 additions and 625 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0252-Lobotomize-stuck-villagers.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Lobotomize stuck villagers
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 07cc98c7582a02732bb9cedf1ba180069e621fab..ab1e841f14c6776644f8a2f92f6db98e83724afc 100644
index cd490eefb502435edab8d7ca871faf20adcfb9be..9792a346fe3bdfc3b7ea454d9ae489fa4e175101 100644
--- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
+++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
@@ -139,6 +139,8 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
@@ -110,10 +110,10 @@ index a1a8ac55e572156671e47317ba061855be79e5ac..ec3fb8865211bd7625103c37af7b96df
+ // Purpur end
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 2451f0b0590a21f6f7ee977f6fd096db208bbacc..8faf2f7d12520e9e7c79146ee7b4066d13983961 100644
index 18fc56102e68af4e7f0d208fa24c04f5f9b593ab..4e08046fda7ed1ea24f27a2db590c3be00a48e17 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2688,6 +2688,8 @@ public class PurpurWorldConfig {
@@ -2684,6 +2684,8 @@ public class PurpurWorldConfig {
public boolean villagerAllowTrading = true;
public boolean villagerAlwaysDropExp = false;
public int villagerMinimumDemand = 0;
@@ -122,7 +122,7 @@ index 2451f0b0590a21f6f7ee977f6fd096db208bbacc..8faf2f7d12520e9e7c79146ee7b4066d
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -2709,6 +2711,17 @@ public class PurpurWorldConfig {
@@ -2705,6 +2707,17 @@ public class PurpurWorldConfig {
villagerAllowTrading = getBoolean("mobs.villager.allow-trading", villagerAllowTrading);
villagerAlwaysDropExp = getBoolean("mobs.villager.always-drop-exp", villagerAlwaysDropExp);
villagerMinimumDemand = getInt("mobs.villager.minimum-demand", villagerMinimumDemand);