9
0
mirror of https://github.com/Winds-Studio/Leaf.git synced 2026-01-03 22:26:19 +00:00

Updated Upstream (Gale/Purpur)

This commit is contained in:
Dreeam
2024-05-07 08:32:10 -04:00
parent 234d7e311a
commit b81d95630e
20 changed files with 282 additions and 120 deletions

View File

@@ -97,10 +97,10 @@ index 5bae3215ee0bf222c3bd77b3131f3d01ac6c9c41..8a643108954698425413d14eb9a2c86c
@Override
public EntityDimensions getDefaultDimensions(Pose pose) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index dde2e82e8f3686f6b77fefdaad9beaeb90059c23..3416c6778faf56666a521a69382799bb1bee1497 100644
index 4a385c42da7ab3be46d5e47d00daee5e0b6da88f..7a3017177f68111c0de9b197b0bf8e4159fd561d 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1525,6 +1525,7 @@ public class PurpurWorldConfig {
@@ -1530,6 +1530,7 @@ public class PurpurWorldConfig {
public boolean drownedTakeDamageFromWater = false;
public boolean drownedBreakDoors = false;
public boolean drownedAlwaysDropExp = false;
@@ -108,7 +108,7 @@ index dde2e82e8f3686f6b77fefdaad9beaeb90059c23..3416c6778faf56666a521a69382799bb
private void drownedSettings() {
drownedRidable = getBoolean("mobs.drowned.ridable", drownedRidable);
drownedRidableInWater = getBoolean("mobs.drowned.ridable-in-water", drownedRidableInWater);
@@ -1542,6 +1543,7 @@ public class PurpurWorldConfig {
@@ -1547,6 +1548,7 @@ public class PurpurWorldConfig {
drownedTakeDamageFromWater = getBoolean("mobs.drowned.takes-damage-from-water", drownedTakeDamageFromWater);
drownedBreakDoors = getBoolean("mobs.drowned.can-break-doors", drownedBreakDoors);
drownedAlwaysDropExp = getBoolean("mobs.drowned.always-drop-exp", drownedAlwaysDropExp);
@@ -116,7 +116,7 @@ index dde2e82e8f3686f6b77fefdaad9beaeb90059c23..3416c6778faf56666a521a69382799bb
}
public boolean elderGuardianRidable = false;
@@ -1888,6 +1890,7 @@ public class PurpurWorldConfig {
@@ -1893,6 +1895,7 @@ public class PurpurWorldConfig {
public boolean huskJockeyTryExistingChickens = true;
public boolean huskTakeDamageFromWater = false;
public boolean huskAlwaysDropExp = false;
@@ -124,7 +124,7 @@ index dde2e82e8f3686f6b77fefdaad9beaeb90059c23..3416c6778faf56666a521a69382799bb
private void huskSettings() {
huskRidable = getBoolean("mobs.husk.ridable", huskRidable);
huskRidableInWater = getBoolean("mobs.husk.ridable-in-water", huskRidableInWater);
@@ -1904,6 +1907,7 @@ public class PurpurWorldConfig {
@@ -1909,6 +1912,7 @@ public class PurpurWorldConfig {
huskJockeyTryExistingChickens = getBoolean("mobs.husk.jockey.try-existing-chickens", huskJockeyTryExistingChickens);
huskTakeDamageFromWater = getBoolean("mobs.husk.takes-damage-from-water", huskTakeDamageFromWater);
huskAlwaysDropExp = getBoolean("mobs.husk.always-drop-exp", huskAlwaysDropExp);
@@ -132,7 +132,7 @@ index dde2e82e8f3686f6b77fefdaad9beaeb90059c23..3416c6778faf56666a521a69382799bb
}
public boolean illusionerRidable = false;
@@ -3118,6 +3122,7 @@ public class PurpurWorldConfig {
@@ -3125,6 +3129,7 @@ public class PurpurWorldConfig {
public boolean zombieTakeDamageFromWater = false;
public boolean zombieAlwaysDropExp = false;
public double zombieHeadVisibilityPercent = 0.5D;
@@ -140,7 +140,7 @@ index dde2e82e8f3686f6b77fefdaad9beaeb90059c23..3416c6778faf56666a521a69382799bb
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -3137,6 +3142,7 @@ public class PurpurWorldConfig {
@@ -3144,6 +3149,7 @@ public class PurpurWorldConfig {
zombieTakeDamageFromWater = getBoolean("mobs.zombie.takes-damage-from-water", zombieTakeDamageFromWater);
zombieAlwaysDropExp = getBoolean("mobs.zombie.always-drop-exp", zombieAlwaysDropExp);
zombieHeadVisibilityPercent = getDouble("mobs.zombie.head-visibility-percent", zombieHeadVisibilityPercent);
@@ -148,7 +148,7 @@ index dde2e82e8f3686f6b77fefdaad9beaeb90059c23..3416c6778faf56666a521a69382799bb
}
public boolean zombieHorseRidable = false;
@@ -3185,6 +3191,7 @@ public class PurpurWorldConfig {
@@ -3192,6 +3198,7 @@ public class PurpurWorldConfig {
public int zombieVillagerCuringTimeMax = 6000;
public boolean zombieVillagerCureEnabled = true;
public boolean zombieVillagerAlwaysDropExp = false;
@@ -156,7 +156,7 @@ index dde2e82e8f3686f6b77fefdaad9beaeb90059c23..3416c6778faf56666a521a69382799bb
private void zombieVillagerSettings() {
zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable);
zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater);
@@ -3204,6 +3211,7 @@ public class PurpurWorldConfig {
@@ -3211,6 +3218,7 @@ public class PurpurWorldConfig {
zombieVillagerCuringTimeMax = getInt("mobs.zombie_villager.curing_time.max", zombieVillagerCuringTimeMax);
zombieVillagerCureEnabled = getBoolean("mobs.zombie_villager.cure.enabled", zombieVillagerCureEnabled);
zombieVillagerAlwaysDropExp = getBoolean("mobs.zombie_villager.always-drop-exp", zombieVillagerAlwaysDropExp);
@@ -164,7 +164,7 @@ index dde2e82e8f3686f6b77fefdaad9beaeb90059c23..3416c6778faf56666a521a69382799bb
}
public boolean zombifiedPiglinRidable = false;
@@ -3217,6 +3225,7 @@ public class PurpurWorldConfig {
@@ -3224,6 +3232,7 @@ public class PurpurWorldConfig {
public boolean zombifiedPiglinCountAsPlayerKillWhenAngry = true;
public boolean zombifiedPiglinTakeDamageFromWater = false;
public boolean zombifiedPiglinAlwaysDropExp = false;
@@ -172,7 +172,7 @@ index dde2e82e8f3686f6b77fefdaad9beaeb90059c23..3416c6778faf56666a521a69382799bb
private void zombifiedPiglinSettings() {
zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable);
zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater);
@@ -3234,6 +3243,7 @@ public class PurpurWorldConfig {
@@ -3241,6 +3250,7 @@ public class PurpurWorldConfig {
zombifiedPiglinCountAsPlayerKillWhenAngry = getBoolean("mobs.zombified_piglin.count-as-player-kill-when-angry", zombifiedPiglinCountAsPlayerKillWhenAngry);
zombifiedPiglinTakeDamageFromWater = getBoolean("mobs.zombified_piglin.takes-damage-from-water", zombifiedPiglinTakeDamageFromWater);
zombifiedPiglinAlwaysDropExp = getBoolean("mobs.zombified_piglin.always-drop-exp", zombifiedPiglinAlwaysDropExp);