diff --git a/leaves-server/unapplied/0061-Store-mob-counts-in-an-array.patch b/leaves-server/minecraft-patches/features/0061-Store-mob-counts-in-an-array.patch similarity index 100% rename from leaves-server/unapplied/0061-Store-mob-counts-in-an-array.patch rename to leaves-server/minecraft-patches/features/0061-Store-mob-counts-in-an-array.patch diff --git a/leaves-server/unapplied/0062-Optimize-noise-generation.patch b/leaves-server/minecraft-patches/features/0062-Optimize-noise-generation.patch similarity index 100% rename from leaves-server/unapplied/0062-Optimize-noise-generation.patch rename to leaves-server/minecraft-patches/features/0062-Optimize-noise-generation.patch diff --git a/leaves-server/unapplied/0063-Optimize-sun-burn-tick.patch b/leaves-server/minecraft-patches/features/0063-Optimize-sun-burn-tick.patch similarity index 92% rename from leaves-server/unapplied/0063-Optimize-sun-burn-tick.patch rename to leaves-server/minecraft-patches/features/0063-Optimize-sun-burn-tick.patch index f9a09bce..54ef9da1 100644 --- a/leaves-server/unapplied/0063-Optimize-sun-burn-tick.patch +++ b/leaves-server/minecraft-patches/features/0063-Optimize-sun-burn-tick.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Optimize sun burn tick This patch is Powered by Gale(https://github.com/GaleMC/Gale) diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index 0c1a50d293638c319b34f757c0ba41d31a1538ac..127d306218247ad7da3ebfff2fc5fd20115da365 100644 +index 0484649d8835e16b71f9ba3e0da16198fa94cb73..2df9769eb76db2fb0e552716183ee1e899a59fbf 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java -@@ -2038,9 +2038,20 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -2112,9 +2112,20 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess @Deprecated public float getLightLevelDependentMagicValue() { @@ -33,7 +33,7 @@ index 0c1a50d293638c319b34f757c0ba41d31a1538ac..127d306218247ad7da3ebfff2fc5fd20 } public void absSnapTo(double x, double y, double z, float yRot, float xRot) { -@@ -2055,6 +2066,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -2129,6 +2140,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess this.xRotO = this.getXRot(); this.setYHeadRot(yRot); // Paper - Update head rotation } @@ -42,10 +42,10 @@ index 0c1a50d293638c319b34f757c0ba41d31a1538ac..127d306218247ad7da3ebfff2fc5fd20 public void absSnapTo(double x, double y, double z) { double d = Mth.clamp(x, -3.0E7, 3.0E7); diff --git a/net/minecraft/world/entity/Mob.java b/net/minecraft/world/entity/Mob.java -index c83ad2553145b66aad000be3b82fec57f56359ce..c7df4f3a9fb1c3e34a737af1c80e62220abf7edb 100644 +index a8bb9822e963d7d8245c8d6589604fd92b424f18..c05803a72b5db05f9a0b6119b57f665a25e1277a 100644 --- a/net/minecraft/world/entity/Mob.java +++ b/net/minecraft/world/entity/Mob.java -@@ -1507,17 +1507,39 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab +@@ -1533,17 +1533,39 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab protected void playAttackSound() { } diff --git a/leaves-server/unapplied/0064-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch b/leaves-server/minecraft-patches/features/0064-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch similarity index 100% rename from leaves-server/unapplied/0064-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch rename to leaves-server/minecraft-patches/features/0064-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch diff --git a/leaves-server/unapplied/0065-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch b/leaves-server/minecraft-patches/features/0065-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch similarity index 100% rename from leaves-server/unapplied/0065-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch rename to leaves-server/minecraft-patches/features/0065-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch diff --git a/leaves-server/unapplied/0066-Optimized-CubePointRange.patch b/leaves-server/minecraft-patches/features/0066-Optimized-CubePointRange.patch similarity index 100% rename from leaves-server/unapplied/0066-Optimized-CubePointRange.patch rename to leaves-server/minecraft-patches/features/0066-Optimized-CubePointRange.patch diff --git a/leaves-server/unapplied/0067-Check-frozen-ticks-before-landing-block.patch b/leaves-server/minecraft-patches/features/0067-Check-frozen-ticks-before-landing-block.patch similarity index 87% rename from leaves-server/unapplied/0067-Check-frozen-ticks-before-landing-block.patch rename to leaves-server/minecraft-patches/features/0067-Check-frozen-ticks-before-landing-block.patch index 7ebf4d9d..8a6bb147 100644 --- a/leaves-server/unapplied/0067-Check-frozen-ticks-before-landing-block.patch +++ b/leaves-server/minecraft-patches/features/0067-Check-frozen-ticks-before-landing-block.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Check frozen ticks before landing block This patch is Powered by Gale(https://github.com/GaleMC/Gale) diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java -index a95fec1506af042bd3d4424e93aa3f4de9627487..ce624ed17bc5c9b5e13d280f8dda736581b21821 100644 +index c25cdcebfdd2697da927d55420ab9f02bd4c792a..305c099d32f1472a6e8909cdf2a53cec8a31afb5 100644 --- a/net/minecraft/world/entity/LivingEntity.java +++ b/net/minecraft/world/entity/LivingEntity.java -@@ -523,10 +523,10 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -537,10 +537,10 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin } protected void tryAddFrost() { diff --git a/leaves-server/unapplied/0068-Skip-entity-move-if-movement-is-zero.patch b/leaves-server/minecraft-patches/features/0068-Skip-entity-move-if-movement-is-zero.patch similarity index 86% rename from leaves-server/unapplied/0068-Skip-entity-move-if-movement-is-zero.patch rename to leaves-server/minecraft-patches/features/0068-Skip-entity-move-if-movement-is-zero.patch index 4ca3e218..8f377eb7 100644 --- a/leaves-server/unapplied/0068-Skip-entity-move-if-movement-is-zero.patch +++ b/leaves-server/minecraft-patches/features/0068-Skip-entity-move-if-movement-is-zero.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Skip entity move if movement is zero This patch is Powered by Gale(https://github.com/GaleMC/Gale) diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index 127d306218247ad7da3ebfff2fc5fd20115da365..392c1dd211d901a066dac83f15f03e1738a2478b 100644 +index 2df9769eb76db2fb0e552716183ee1e899a59fbf..8cc7dff9c0843fd474df00d08aa2bc0721f91349 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java -@@ -242,6 +242,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -262,6 +262,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess public float yRotO; public float xRotO; private AABB bb = INITIAL_AABB; @@ -17,7 +17,7 @@ index 127d306218247ad7da3ebfff2fc5fd20115da365..392c1dd211d901a066dac83f15f03e17 public boolean onGround; public boolean horizontalCollision; public boolean verticalCollision; -@@ -1068,6 +1069,13 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -1094,6 +1095,13 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess // Paper end - detailed watchdog information public void move(MoverType type, Vec3 movement) { @@ -31,7 +31,7 @@ index 127d306218247ad7da3ebfff2fc5fd20115da365..392c1dd211d901a066dac83f15f03e17 final Vec3 originalMovement = movement; // Paper - Expose pre-collision velocity // Paper start - detailed watchdog information ca.spottedleaf.moonrise.common.util.TickThread.ensureTickThread("Cannot move an entity off-main"); -@@ -4195,6 +4203,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -4416,6 +4424,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess } public final void setBoundingBox(AABB bb) { diff --git a/leaves-server/unapplied/0069-Skip-cloning-advancement-criteria.patch b/leaves-server/minecraft-patches/features/0069-Skip-cloning-advancement-criteria.patch similarity index 92% rename from leaves-server/unapplied/0069-Skip-cloning-advancement-criteria.patch rename to leaves-server/minecraft-patches/features/0069-Skip-cloning-advancement-criteria.patch index 786eff64..a4e8fe18 100644 --- a/leaves-server/unapplied/0069-Skip-cloning-advancement-criteria.patch +++ b/leaves-server/minecraft-patches/features/0069-Skip-cloning-advancement-criteria.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Skip cloning advancement criteria This patch is Powered by Gale(https://github.com/GaleMC/Gale) diff --git a/net/minecraft/advancements/Advancement.java b/net/minecraft/advancements/Advancement.java -index a1abe9a798e459798ac18d8a9b4756c66eba9721..4bd3babe69b516a1f4938cc3b75ef6e4c6fffe55 100644 +index ac6a85ddf6eb326b3fd53341a4a5db7bd00b7ce2..e677a81e7005b5c596a2cef3b14e2c738559e586 100644 --- a/net/minecraft/advancements/Advancement.java +++ b/net/minecraft/advancements/Advancement.java @@ -61,7 +61,7 @@ public record Advancement( diff --git a/leaves-server/unapplied/0070-Fix-villagers-dont-release-memory.patch b/leaves-server/minecraft-patches/features/0070-Fix-villagers-dont-release-memory.patch similarity index 77% rename from leaves-server/unapplied/0070-Fix-villagers-dont-release-memory.patch rename to leaves-server/minecraft-patches/features/0070-Fix-villagers-dont-release-memory.patch index fd55748e..a0bbecb3 100644 --- a/leaves-server/unapplied/0070-Fix-villagers-dont-release-memory.patch +++ b/leaves-server/minecraft-patches/features/0070-Fix-villagers-dont-release-memory.patch @@ -5,20 +5,20 @@ Subject: [PATCH] Fix villagers dont release memory diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index 392c1dd211d901a066dac83f15f03e1738a2478b..0227bb06cfd7d5280a2b7c09e7e659806bedadcd 100644 +index 8cc7dff9c0843fd474df00d08aa2bc0721f91349..e3256e6358aa9bcbc943d427a295ebeab9b73951 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java -@@ -3826,7 +3826,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -4033,7 +4033,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess return this; } -- private Entity teleportCrossDimension(ServerLevel level, TeleportTransition teleportTransition) { -+ protected Entity teleportCrossDimension(ServerLevel level, TeleportTransition teleportTransition) { // Leaves - private -> protected +- private Entity teleportCrossDimension(ServerLevel oldLevel, ServerLevel newLevel, TeleportTransition teleportTransition) { ++ protected Entity teleportCrossDimension(ServerLevel oldLevel, ServerLevel newLevel, TeleportTransition teleportTransition) { // Leaves - private -> protected List passengers = this.getPassengers(); List list = new ArrayList<>(passengers.size()); this.ejectPassengers(); diff --git a/net/minecraft/world/entity/npc/Villager.java b/net/minecraft/world/entity/npc/Villager.java -index e0e0d2ea7fc60e3142c675404d152eca60263240..956b949b42a7041290838dde816d3b79e1f9e0d4 100644 +index e1e2bdb35866a8f32a41f6efd24ad77cf916b2e9..2330415f8e3bc021e43facff4c99177cc0c9fc5c 100644 --- a/net/minecraft/world/entity/npc/Villager.java +++ b/net/minecraft/world/entity/npc/Villager.java @@ -1033,4 +1033,19 @@ public class Villager extends AbstractVillager implements ReputationEventHandler