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

@@ -44,10 +44,10 @@ index 15c4531865d829ea90d060ee83122a80ab39028b..379d168eb4ba958622398efa79fa43d5
private boolean allayConsidersItemEqual(ItemStack stack, ItemStack stack2) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 2d9f50dea1c686af49a79c6ffe9c34928e725a2a..54ca27fcf2b5c21218c6a97408e5940d49ab18aa 100644
index 9c29305e24186a35999765784d46768d9b4459cf..c89c3855902f2e7f4c7b4c56a3dfab238e68f85f 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1063,10 +1063,13 @@ public class PurpurWorldConfig {
@@ -1068,10 +1068,13 @@ public class PurpurWorldConfig {
public boolean allayRidable = false;
public boolean allayRidableInWater = true;
public boolean allayControllable = true;