Fix patch conflict

2026-07-27 20:47:44 +08:00
parent 10cc76bbff
commit 484990074d
20 changed files with 45 additions and 41 deletions
@@ -54,7 +54,7 @@ index c6434ff2e5c211887c2e98c8462a49e0e1cb5b21..d25b1c7d1347b2731cd12cdcea719027
         } else {entity.inactiveTick();} // Paper - EAR 2
         profiler.pop();
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index a2b57f62b745dd21e215f919d335f14f5cb1706f..af3a85087d292d3782acf4c7d15fbfb9f749868d 100644
+index 07310ae30817fc88227355739074615969b48184..fe95ab473e8a7b3a9e7a571028d3d8af01000f0b 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
@@ -387,6 +387,7 @@ public abstract class Entity