synchronize patches

This commit is contained in:
granny
2023-06-09 05:07:46 -07:00
parent 9bed3af997
commit e4edcee766
113 changed files with 703 additions and 715 deletions

View File

@@ -18,10 +18,10 @@ index 813b9708d218589afaaa2d0578affcc78f0c075f..52a84f354cc51b3ca875756514588b2e
private boolean hungry() {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 61864baa60313dcff327720adb3a316079430306..883489dc77c0d157045f443345df8063af61a15f 100644
index 5a834dee8903db6062bcb6c9c73def6e1c1cf831..03f32bd89a72a9549e5d9313595ad163b56d4fbd 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1610,6 +1610,7 @@ public class PurpurWorldConfig {
@@ -1615,6 +1615,7 @@ public class PurpurWorldConfig {
public double villagerMaxHealth = 20.0D;
public boolean villagerFollowEmeraldBlock = false;
public boolean villagerCanBeLeashed = false;
@@ -29,7 +29,7 @@ index 61864baa60313dcff327720adb3a316079430306..883489dc77c0d157045f443345df8063
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1622,6 +1623,7 @@ public class PurpurWorldConfig {
@@ -1627,6 +1628,7 @@ public class PurpurWorldConfig {
villagerMaxHealth = getDouble("mobs.villager.attributes.max_health", villagerMaxHealth);
villagerFollowEmeraldBlock = getBoolean("mobs.villager.follow-emerald-blocks", villagerFollowEmeraldBlock);
villagerCanBeLeashed = getBoolean("mobs.villager.can-be-leashed", villagerCanBeLeashed);