From 4855a4f76fd9ea8c62ac07a9e59ef027e790e449 Mon Sep 17 00:00:00 2001 From: MrHua269 Date: Sun, 15 Jun 2025 10:06:11 +0800 Subject: [PATCH] Updated Upstream(Folia) --- gradle.properties | 2 +- ...egion-thrown-egg-new-entity-creating.patch | 26 ------------------- 2 files changed, 1 insertion(+), 27 deletions(-) delete mode 100644 luminol-server/minecraft-patches/features/0055-Fix-off-region-thrown-egg-new-entity-creating.patch diff --git a/gradle.properties b/gradle.properties index b4c26ac..8d3a277 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group = me.earthme.luminol version=1.21.5-R0.1-SNAPSHOT mcVersion=1.21.5 -foliaRef=77316d48f7d96ed7812cf36036fb85d790d20e6e +foliaRef=dfa3ca475215e9c496e5aa6629f1897f93f7a7d4 org.gradle.configuration-cache=true org.gradle.caching=true diff --git a/luminol-server/minecraft-patches/features/0055-Fix-off-region-thrown-egg-new-entity-creating.patch b/luminol-server/minecraft-patches/features/0055-Fix-off-region-thrown-egg-new-entity-creating.patch deleted file mode 100644 index cbfb278..0000000 --- a/luminol-server/minecraft-patches/features/0055-Fix-off-region-thrown-egg-new-entity-creating.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MrHua269 -Date: Thu, 5 Jun 2025 21:11:31 +0800 -Subject: [PATCH] Fix off region thrown egg new entity creating - -should set pos before so that we could correctly modify the entity's other attribute on-region without triggering the async catchers - -diff --git a/net/minecraft/world/entity/projectile/ThrownEgg.java b/net/minecraft/world/entity/projectile/ThrownEgg.java -index 73ec34b43f3fb2aa3edc3f1cb48a923d1fa32036..5760ae39e8c452b8291353ed59ce7f8ef4d43dc1 100644 ---- a/net/minecraft/world/entity/projectile/ThrownEgg.java -+++ b/net/minecraft/world/entity/projectile/ThrownEgg.java -@@ -97,12 +97,13 @@ public class ThrownEgg extends ThrowableItemProjectile { - for (int i1 = 0; i1 < i; i1++) { - net.minecraft.world.entity.Entity chicken = newEntityType.create(this.level(), net.minecraft.world.entity.EntitySpawnReason.TRIGGERED); // CraftBukkit - if (chicken != null) { -+ chicken.snapTo(this.getX(), this.getY(), this.getZ(), this.getYRot(), 0.0F); // Luminol - Fix off region thrown egg - move up - // CraftBukkit start - if (chicken.getBukkitEntity() instanceof org.bukkit.entity.Ageable ageable) { - ageable.setBaby(); - } - // CraftBukkit end -- chicken.snapTo(this.getX(), this.getY(), this.getZ(), this.getYRot(), 0.0F); -+ // chicken.snapTo(this.getX(), this.getY(), this.getZ(), this.getYRot(), 0.0F); // Luminol - Fix off region thrown egg - move up - // CraftBukkit start - if (chicken instanceof Chicken realChicken) { - Optional.ofNullable(this.getItem().get(DataComponents.CHICKEN_VARIANT))