Repo-Mirror/Leaf
9
0
Fork 0
mirror of https://github.com/Winds-Studio/Leaf.git synced 2026-01-04 15:41:40 +00:00
Code Issues Releases Activity

Updated Upstream (Purpur)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Purpur Changes:
PurpurMC/Purpur@be61a07 Updated Upstream (Paper)
PurpurMC/Purpur@f154903 Updated Upstream (Paper)
PurpurMC/Purpur@0fa9a50 Updated Upstream (Paper)
PurpurMC/Purpur@d7a7c91 Updated Upstream (Paper)
PurpurMC/Purpur@20fa61e Updated Upstream (Paper)
PurpurMC/Purpur@501e7c5 Updated Upstream (Paper)
PurpurMC/Purpur@2a50638 Updated Upstream (Paper)
PurpurMC/Purpur@639bcbd Updated Upstream (Paper)
PurpurMC/Purpur@bcf8103 remove obsolete allowUnsafeEnchants config option
PurpurMC/Purpur@51f15ee fully remove obsolete allowUnsafeEnchants config option
PurpurMC/Purpur@3d0716d Fix colored shulker box contents not dropping when destroyed, supercedes #1594
PurpurMC/Purpur@12e2926 [ci skip] drop old migration patch
PurpurMC/Purpur@212c942 delegate itemstack convenience methods
PurpurMC/Purpur@2eaea6a switch to JSpecify annotations
This commit is contained in:
Dreeam
2024-10-05 12:25:41 -04:00
parent f15d5c5cef
commit 387edb77c1
17 changed files with 847 additions and 568 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
patches/server/0046-Configurable-movement-speed-of-more-entities.patch
View File

@@ -97,10 +97,10 @@ index 1c04fbea0dce4167a0902b92b95d470f562825c2..4f1f816496f8f8564c1dc53ceae5cfb3
@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 bdf39717d78f3a7867b6e3586f11b594e2c54f1f..7fd05a585705234d9b025281bd54671b6bb1d97e 100644
index 92b6f335157da49583b4ecac54de6e51dd032867..58b9768f53c102858443a04604d7d37f05224ed5 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1575,6 +1575,7 @@ public class PurpurWorldConfig {
@@ -1541,6 +1541,7 @@ public class PurpurWorldConfig {
public boolean drownedTakeDamageFromWater = false;
public boolean drownedBreakDoors = false;
public boolean drownedAlwaysDropExp = false;
@@ -108,7 +108,7 @@ index bdf39717d78f3a7867b6e3586f11b594e2c54f1f..7fd05a585705234d9b025281bd54671b
private void drownedSettings() {
drownedRidable = getBoolean("mobs.drowned.ridable", drownedRidable);
drownedRidableInWater = getBoolean("mobs.drowned.ridable-in-water", drownedRidableInWater);
@@ -1593,6 +1594,7 @@ public class PurpurWorldConfig {
@@ -1559,6 +1560,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 bdf39717d78f3a7867b6e3586f11b594e2c54f1f..7fd05a585705234d9b025281bd54671b
}
public boolean elderGuardianRidable = false;
@@ -1962,6 +1964,7 @@ public class PurpurWorldConfig {
@@ -1928,6 +1930,7 @@ public class PurpurWorldConfig {
public boolean huskJockeyTryExistingChickens = true;
public boolean huskTakeDamageFromWater = false;
public boolean huskAlwaysDropExp = false;
@@ -124,7 +124,7 @@ index bdf39717d78f3a7867b6e3586f11b594e2c54f1f..7fd05a585705234d9b025281bd54671b
private void huskSettings() {
huskRidable = getBoolean("mobs.husk.ridable", huskRidable);
huskRidableInWater = getBoolean("mobs.husk.ridable-in-water", huskRidableInWater);
@@ -1979,6 +1982,7 @@ public class PurpurWorldConfig {
@@ -1945,6 +1948,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 bdf39717d78f3a7867b6e3586f11b594e2c54f1f..7fd05a585705234d9b025281bd54671b
}
public boolean illusionerRidable = false;
@@ -3272,6 +3276,7 @@ public class PurpurWorldConfig {
@@ -3238,6 +3242,7 @@ public class PurpurWorldConfig {
public boolean zombieTakeDamageFromWater = false;
public boolean zombieAlwaysDropExp = false;
public double zombieHeadVisibilityPercent = 0.5D;
@@ -140,7 +140,7 @@ index bdf39717d78f3a7867b6e3586f11b594e2c54f1f..7fd05a585705234d9b025281bd54671b
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -3292,6 +3297,7 @@ public class PurpurWorldConfig {
@@ -3258,6 +3263,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 bdf39717d78f3a7867b6e3586f11b594e2c54f1f..7fd05a585705234d9b025281bd54671b
}
public boolean zombieHorseRidable = false;
@@ -3341,6 +3347,7 @@ public class PurpurWorldConfig {
@@ -3307,6 +3313,7 @@ public class PurpurWorldConfig {
public int zombieVillagerCuringTimeMax = 6000;
public boolean zombieVillagerCureEnabled = true;
public boolean zombieVillagerAlwaysDropExp = false;
@@ -156,7 +156,7 @@ index bdf39717d78f3a7867b6e3586f11b594e2c54f1f..7fd05a585705234d9b025281bd54671b
private void zombieVillagerSettings() {
zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable);
zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater);
@@ -3361,6 +3368,7 @@ public class PurpurWorldConfig {
@@ -3327,6 +3334,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 bdf39717d78f3a7867b6e3586f11b594e2c54f1f..7fd05a585705234d9b025281bd54671b
}
public boolean zombifiedPiglinRidable = false;
@@ -3375,6 +3383,7 @@ public class PurpurWorldConfig {
@@ -3341,6 +3349,7 @@ public class PurpurWorldConfig {
public boolean zombifiedPiglinCountAsPlayerKillWhenAngry = true;
public boolean zombifiedPiglinTakeDamageFromWater = false;
public boolean zombifiedPiglinAlwaysDropExp = false;
@@ -172,7 +172,7 @@ index bdf39717d78f3a7867b6e3586f11b594e2c54f1f..7fd05a585705234d9b025281bd54671b
private void zombifiedPiglinSettings() {
zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable);
zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater);
@@ -3393,6 +3402,7 @@ public class PurpurWorldConfig {
@@ -3359,6 +3368,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);