2026-07-09 00:03:09 +08:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: MrHua269 <mrhua269@gmail.com>
|
|
|
|
|
Date: Wed, 8 Jul 2026 21:23:24 +0800
|
|
|
|
|
Subject: [PATCH] Fix dragon part desync
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/ca/spottedleaf/moonrise/patches/chunk_system/level/entity/server/ServerEntityLookup.java b/ca/spottedleaf/moonrise/patches/chunk_system/level/entity/server/ServerEntityLookup.java
|
2026-07-14 15:09:17 +08:00
|
|
|
index b31b55f00e2ce1bd6c1011fe852bd1dbb37de524..772e07af051b0f88582434b4cfcba42a666ab7a0 100644
|
2026-07-09 00:03:09 +08:00
|
|
|
--- a/ca/spottedleaf/moonrise/patches/chunk_system/level/entity/server/ServerEntityLookup.java
|
|
|
|
|
+++ b/ca/spottedleaf/moonrise/patches/chunk_system/level/entity/server/ServerEntityLookup.java
|
|
|
|
|
@@ -97,6 +97,7 @@ public final class ServerEntityLookup extends EntityLookup {
|
|
|
|
|
if (entity instanceof ThrownEnderpearl enderpearl) {
|
|
|
|
|
this.addEnderPearl(CoordinateUtils.getChunkKey(enderpearl.chunkPosition()), enderpearl.getId()); // Folia - region threading
|
|
|
|
|
}
|
2026-07-14 11:32:51 +08:00
|
|
|
+ if (entity instanceof net.minecraft.world.entity.boss.enderdragon.EnderDragon dragon) dragon.syncDragonPartsAfterTeleportTransform(); // Shiroha - Fix dragon part desync
|
2026-07-09 00:03:09 +08:00
|
|
|
entity.registerScheduler(); // Paper - optimise Folia entity scheduler
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
|
2026-07-18 19:48:30 +08:00
|
|
|
index aa3ed23fbfd85117101e4ef15123b48d9673c5b0..fee93b64bc42cd49ea9ff007e2fbd7d4ef80d58b 100644
|
2026-07-09 00:03:09 +08:00
|
|
|
--- a/net/minecraft/world/entity/Entity.java
|
|
|
|
|
+++ b/net/minecraft/world/entity/Entity.java
|
|
|
|
|
@@ -4459,6 +4459,7 @@ public abstract class Entity
|
|
|
|
|
Entity copy = this.getType().create(destination, EntitySpawnReason.DIMENSION_TRAVEL);
|
|
|
|
|
copy.restoreFrom(this);
|
|
|
|
|
copy.transform(pos, yaw, pitch, velocity);
|
2026-07-14 11:32:51 +08:00
|
|
|
+ if (copy instanceof net.minecraft.world.entity.boss.enderdragon.EnderDragon dragon) dragon.syncDragonPartsAfterTeleportTransform(); // Shiroha - Fix dragon part desync
|
2026-07-09 00:03:09 +08:00
|
|
|
// vanilla code used to call remove _after_ copying, and some stuff is required to be after copy - so add hook here
|
|
|
|
|
// for example, clearing of inventory after switching dimensions
|
|
|
|
|
this.postRemoveAfterChangingDimensions();
|
|
|
|
|
diff --git a/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
|
2026-07-14 15:09:17 +08:00
|
|
|
index ab921ab4b4cc860abd77744f2bd201013e136e51..0ddf5ef000103b1ef88f3d3e232d734b2e198944 100644
|
2026-07-09 00:03:09 +08:00
|
|
|
--- a/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
|
|
|
|
|
+++ b/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
|
|
|
|
|
@@ -1011,4 +1011,12 @@ public class EnderDragon extends Mob implements Enemy {
|
|
|
|
|
return 500;
|
|
|
|
|
}
|
|
|
|
|
// Paper end - init expToDrop for already dying spawned dragon
|
|
|
|
|
+
|
2026-07-14 11:32:51 +08:00
|
|
|
+ // Shiroha start - Fix dragon part desync
|
2026-07-09 00:03:09 +08:00
|
|
|
+ public void syncDragonPartsAfterTeleportTransform() {
|
|
|
|
|
+ for (EnderDragonPart part : this.subEntities) {
|
|
|
|
|
+ this.tickPart(part, 0.0, 0.0, 0.0); // offset -> 0.0
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
2026-07-14 11:32:51 +08:00
|
|
|
+ // Shiroha end
|
2026-07-09 00:03:09 +08:00
|
|
|
}
|