Repo-Mirror/Leaf
9
0
Fork 0
mirror of https://github.com/Winds-Studio/Leaf.git synced 2025-12-31 04:46:38 +00:00
Code Issues Releases Activity

Updated Upstream (Gale)

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

Gale Changes:
Dreeam-qwq/Gale@8fe4d47 Cleanup Predict Halloween
This commit is contained in:
Dreeam
2024-10-28 06:18:13 -04:00
parent d3b1401426
commit 4fe2676d33
3 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -2,7 +2,7 @@ group = cn.dreeam.leaf
mcVersion = 1.21.1
version = 1.21.1-R0.1-SNAPSHOT
galeCommit = 761682257b3c425ec0d1ec96fda00f7e9c304a7e
galeCommit = 8fe4d471848f4d3f6b45758e77bb17edfd68ecbc
org.gradle.caching = true
org.gradle.parallel = true

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

@@ -29,7 +29,7 @@ index a9285aac811067313c5609d2d5708783736e6cb5..53114ceb212ea341b227f59ebd302d7c
@Override
diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
index 77cc311e2b9aea6cb4d014fa93aac2d362bc8cd3..ac9a63c70b5ddfb528eff559ca1464051d8865f4 100644
index 479232d8dfaabdb3da5b825969d377aa437ea7d3..aa1fd8f2fba06292e93aba279cf18640b6909add 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
@@ -130,6 +130,7 @@ public class Zombie extends Monster {
@@ -97,7 +97,7 @@ 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 92b6f335157da49583b4ecac54de6e51dd032867..58b9768f53c102858443a04604d7d37f05224ed5 100644
index d2021197a100279f2e9bcad4cadd715ac0bb9d4a..58ec0b2158052f81c00a78d3bd29244478037909 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1541,6 +1541,7 @@ public class PurpurWorldConfig {
@@ -116,7 +116,7 @@ index 92b6f335157da49583b4ecac54de6e51dd032867..58b9768f53c102858443a04604d7d37f
}
public boolean elderGuardianRidable = false;
@@ -1928,6 +1930,7 @@ public class PurpurWorldConfig {
@@ -1935,6 +1937,7 @@ public class PurpurWorldConfig {
public boolean huskJockeyTryExistingChickens = true;
public boolean huskTakeDamageFromWater = false;
public boolean huskAlwaysDropExp = false;
@@ -124,7 +124,7 @@ index 92b6f335157da49583b4ecac54de6e51dd032867..58b9768f53c102858443a04604d7d37f
private void huskSettings() {
huskRidable = getBoolean("mobs.husk.ridable", huskRidable);
huskRidableInWater = getBoolean("mobs.husk.ridable-in-water", huskRidableInWater);
@@ -1945,6 +1948,7 @@ public class PurpurWorldConfig {
@@ -1952,6 +1955,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 92b6f335157da49583b4ecac54de6e51dd032867..58b9768f53c102858443a04604d7d37f
}
public boolean illusionerRidable = false;
@@ -3238,6 +3242,7 @@ public class PurpurWorldConfig {
@@ -3245,6 +3249,7 @@ public class PurpurWorldConfig {
public boolean zombieTakeDamageFromWater = false;
public boolean zombieAlwaysDropExp = false;
public double zombieHeadVisibilityPercent = 0.5D;
@@ -140,7 +140,7 @@ index 92b6f335157da49583b4ecac54de6e51dd032867..58b9768f53c102858443a04604d7d37f
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -3258,6 +3263,7 @@ public class PurpurWorldConfig {
@@ -3265,6 +3270,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 92b6f335157da49583b4ecac54de6e51dd032867..58b9768f53c102858443a04604d7d37f
}
public boolean zombieHorseRidable = false;
@@ -3307,6 +3313,7 @@ public class PurpurWorldConfig {
@@ -3314,6 +3320,7 @@ public class PurpurWorldConfig {
public int zombieVillagerCuringTimeMax = 6000;
public boolean zombieVillagerCureEnabled = true;
public boolean zombieVillagerAlwaysDropExp = false;
@@ -156,7 +156,7 @@ index 92b6f335157da49583b4ecac54de6e51dd032867..58b9768f53c102858443a04604d7d37f
private void zombieVillagerSettings() {
zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable);
zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater);
@@ -3327,6 +3334,7 @@ public class PurpurWorldConfig {
@@ -3334,6 +3341,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 92b6f335157da49583b4ecac54de6e51dd032867..58b9768f53c102858443a04604d7d37f
}
public boolean zombifiedPiglinRidable = false;
@@ -3341,6 +3349,7 @@ public class PurpurWorldConfig {
@@ -3348,6 +3356,7 @@ public class PurpurWorldConfig {
public boolean zombifiedPiglinCountAsPlayerKillWhenAngry = true;
public boolean zombifiedPiglinTakeDamageFromWater = false;
public boolean zombifiedPiglinAlwaysDropExp = false;
@@ -172,7 +172,7 @@ index 92b6f335157da49583b4ecac54de6e51dd032867..58b9768f53c102858443a04604d7d37f
private void zombifiedPiglinSettings() {
zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable);
zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater);
@@ -3359,6 +3368,7 @@ public class PurpurWorldConfig {
@@ -3366,6 +3375,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);

12
patches/server/0051-Plazma-Add-missing-purpur-configuration-options.patch
View File

@@ -211,7 +211,7 @@ index c14019a131c90c699b8a76bada82592b66f0fa89..bc0f0fd4b356a2f5b212c7d4a2007e12
@Override
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index 7701482804e9ba88fb0b1e8f9d56b2e1a8fc31ad..4d92d7b02732cd7a73d6a7f30975555c5f3b540f 100644
index 3700904b82d3116c1336b86907ce1c2c4644b0ab..654e838d9a77e0dd8fe9fb1d4804785ad0f463c8 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -320,6 +320,7 @@ public class PurpurConfig {
@@ -231,7 +231,7 @@ index 7701482804e9ba88fb0b1e8f9d56b2e1a8fc31ad..4d92d7b02732cd7a73d6a7f30975555c
org.bukkit.event.inventory.InventoryType.ENDER_CHEST.setDefaultSize(enderChestSixRows ? 54 : 27);
enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 58b9768f53c102858443a04604d7d37f05224ed5..ee64e3607782e70cc0708046de5dbd8f87ee8797 100644
index 58ec0b2158052f81c00a78d3bd29244478037909..c3612a5d62bdd6f84319b58f99cdb82d24c9132a 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1128,12 +1128,20 @@ public class PurpurWorldConfig {
@@ -300,7 +300,7 @@ index 58b9768f53c102858443a04604d7d37f05224ed5..ee64e3607782e70cc0708046de5dbd8f
}
public boolean ghastRidable = false;
@@ -2746,6 +2772,10 @@ public class PurpurWorldConfig {
@@ -2753,6 +2779,10 @@ public class PurpurWorldConfig {
public double snifferMaxHealth = 14.0D;
public double snifferScale = 1.0D;
public int snifferBreedingTicks = 6000;
@@ -311,7 +311,7 @@ index 58b9768f53c102858443a04604d7d37f05224ed5..ee64e3607782e70cc0708046de5dbd8f
private void snifferSettings() {
snifferRidable = getBoolean("mobs.sniffer.ridable", snifferRidable);
snifferRidableInWater = getBoolean("mobs.sniffer.ridable-in-water", snifferRidableInWater);
@@ -2753,6 +2783,10 @@ public class PurpurWorldConfig {
@@ -2760,6 +2790,10 @@ public class PurpurWorldConfig {
snifferMaxHealth = getDouble("mobs.sniffer.attributes.max_health", snifferMaxHealth);
snifferScale = Mth.clamp(getDouble("mobs.sniffer.attributes.scale", snifferScale), 0.0625D, 16.0D);
snifferBreedingTicks = getInt("mobs.sniffer.breeding-delay-ticks", snifferBreedingTicks);
@@ -322,7 +322,7 @@ index 58b9768f53c102858443a04604d7d37f05224ed5..ee64e3607782e70cc0708046de5dbd8f
}
public boolean squidRidable = false;
@@ -2854,10 +2888,20 @@ public class PurpurWorldConfig {
@@ -2861,10 +2895,20 @@ public class PurpurWorldConfig {
public boolean tadpoleRidable = false;
public boolean tadpoleRidableInWater = true;
public boolean tadpoleControllable = true;
@@ -343,7 +343,7 @@ index 58b9768f53c102858443a04604d7d37f05224ed5..ee64e3607782e70cc0708046de5dbd8f
}
public boolean traderLlamaRidable = false;
@@ -3082,10 +3126,20 @@ public class PurpurWorldConfig {
@@ -3089,10 +3133,20 @@ public class PurpurWorldConfig {
public boolean wardenRidable = false;
public boolean wardenRidableInWater = true;
public boolean wardenControllable = true;