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 002ea677568e4d4a13509bb5c880341a742dac83..1e544c8fa21d028f7c3ac66d66c2362c
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 5829cd48c964ead93500a31b145ddf0370287ee4..387ffc7265eb312a938f9ea5a8bd34048da9985b 100644
index ea13c885b9dd48590d32d2bd41aa0cba21b406a0..d8c011df48dea4aa70614c60ff544b21b790582e 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -996,6 +996,8 @@ public class PurpurWorldConfig {
@@ -1001,6 +1001,8 @@ public class PurpurWorldConfig {
public boolean endermanDespawnEvenWithBlock = false;
public boolean endermanBypassMobGriefing = false;
public boolean endermanTakeDamageFromWater = true;
@@ -30,7 +30,7 @@ index 5829cd48c964ead93500a31b145ddf0370287ee4..387ffc7265eb312a938f9ea5a8bd3404
private void endermanSettings() {
endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
@@ -1005,11 +1007,17 @@ public class PurpurWorldConfig {
@@ -1010,11 +1012,17 @@ public class PurpurWorldConfig {
set("mobs.enderman.attributes.max-health", null);
set("mobs.enderman.attributes.max_health", oldValue);
}