NanaChiyo0721/Shiroha
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Updated Upstream(Folia)

Browse Source
This commit is contained in:
NanaChiyo0721
2026-07-18 19:48:30 +08:00
parent 9af4757cdb
commit 221b1474c5
29 changed files with 68 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shiroha-server/minecraft-patches/features/0009-Entity-portal-teleport-speed-fix.patch
+4 -4
View File
@@ -5,10 +5,10 @@ Subject: [PATCH] Entity portal-teleport speed fix
diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
index 3db75ac3f7f111b94178cc29684f24dd55ac5847..ed4024b744f7913cfd423617936f9affe7c2c46e 100644
index c6434ff2e5c211887c2e98c8462a49e0e1cb5b21..d25b1c7d1347b2731cd12cdcea7190276913de49 100644
--- a/net/minecraft/server/level/ServerLevel.java
+++ b/net/minecraft/server/level/ServerLevel.java
@@ -1491,7 +1491,35 @@ public class ServerLevel extends Level implements WorldGenLevel, ServerEntityGet
@@ -1492,7 +1492,35 @@ public class ServerLevel extends Level implements WorldGenLevel, ServerEntityGet
foliaProfiler.startTimer(timerId);
try {
// Folia end - profiler
@@ -44,7 +44,7 @@ index 3db75ac3f7f111b94178cc29684f24dd55ac5847..ed4024b744f7913cfd423617936f9aff
entity.tick();
// Folia start - region threading
if (!ca.spottedleaf.moonrise.common.util.TickThread.isTickThreadFor(entity)) {
@@ -1502,6 +1530,8 @@ public class ServerLevel extends Level implements WorldGenLevel, ServerEntityGet
@@ -1503,6 +1531,8 @@ public class ServerLevel extends Level implements WorldGenLevel, ServerEntityGet
// portalled
return;
}
@@ -54,7 +54,7 @@ index 3db75ac3f7f111b94178cc29684f24dd55ac5847..ed4024b744f7913cfd423617936f9aff
} 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 2a8a7aeddffdfed31cd6e1162c0756986049fbab..bc26de6e58d9d315122c7f8721ab30490f382c18 100644
index a2b57f62b745dd21e215f919d335f14f5cb1706f..af3a85087d292d3782acf4c7d15fbfb9f749868d 100644
--- a/net/minecraft/world/entity/Entity.java
+++ b/net/minecraft/world/entity/Entity.java
@@ -387,6 +387,7 @@ public abstract class Entity