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

@@ -94,10 +94,10 @@ index 9b43150a00d7fac85aa69f5a2dbffd0dfdae4b86..f4a47ac2c86cc95178922cce7320ba1e
+ // Purpur end
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index eb1ef5a02900172f7228bcd25cac9be3b586e50c..4e7bd8ecb1571b5d986c70a12a2d2fdf151d6420 100644
index ef0fa2aed5a193228cdb15a14b0b44af1f7dcae9..5b01497069b8aa523cef28baf29bbf59fbe3b30c 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2407,6 +2407,7 @@ public class PurpurWorldConfig {
@@ -2412,6 +2412,7 @@ public class PurpurWorldConfig {
public boolean skeletonTakeDamageFromWater = false;
public boolean skeletonAlwaysDropExp = false;
public double skeletonHeadVisibilityPercent = 0.5D;
@@ -105,7 +105,7 @@ index eb1ef5a02900172f7228bcd25cac9be3b586e50c..4e7bd8ecb1571b5d986c70a12a2d2fdf
private void skeletonSettings() {
skeletonRidable = getBoolean("mobs.skeleton.ridable", skeletonRidable);
skeletonRidableInWater = getBoolean("mobs.skeleton.ridable-in-water", skeletonRidableInWater);
@@ -2420,6 +2421,7 @@ public class PurpurWorldConfig {
@@ -2425,6 +2426,7 @@ public class PurpurWorldConfig {
skeletonTakeDamageFromWater = getBoolean("mobs.skeleton.takes-damage-from-water", skeletonTakeDamageFromWater);
skeletonAlwaysDropExp = getBoolean("mobs.skeleton.always-drop-exp", skeletonAlwaysDropExp);
skeletonHeadVisibilityPercent = getDouble("mobs.skeleton.head-visibility-percent", skeletonHeadVisibilityPercent);