Updated Upstream(Folia)

This commit is contained in:
2026-07-18 19:48:30 +08:00
parent 9af4757cdb
commit 221b1474c5
29 changed files with 68 additions and 68 deletions
@@ -240,7 +240,7 @@ index 6e08d50794c4af4405f3e164a3fd46f376b3f78f..dd2d0940eece3e85078e574f66f71a4c
int getContainerSize();
diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
index 15d3a39795b6505ba96c27f591d58001e2a73db1..baacd1713177e96a19ecdbf7ba3a95898a791d2f 100644
index d03267acc5209512e15065fcfb2dd32e9eb2f878..17129f6c094b976a209e25773bef24d4b38f4156 100644
--- a/net/minecraft/world/entity/Entity.java
+++ b/net/minecraft/world/entity/Entity.java
@@ -324,7 +324,7 @@ public abstract class Entity
@@ -266,7 +266,7 @@ index 15d3a39795b6505ba96c27f591d58001e2a73db1..baacd1713177e96a19ecdbf7ba3a9589
if (copy instanceof net.minecraft.world.entity.boss.enderdragon.EnderDragon dragon) dragon.syncDragonPartsAfterTeleportTransform(); // Shiroha - Fix dragon part desync
// 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
@@ -5953,8 +5955,29 @@ public abstract class Entity
@@ -6027,8 +6029,29 @@ public abstract class Entity
this.setBoundingBox(this.makeBoundingBox());
}
// Paper end - Block invalid positions and bounding box