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

Begin remigrate to Shiroha

Browse Source 
uhm
This commit is contained in:
NanaChiyo0721
2026-07-14 11:32:51 +08:00
parent 5661499e95
commit 576a9a44c8
60 changed files with 379 additions and 379 deletions
Download Patch File Download Diff File Expand all files Collapse all files
camellia-server/minecraft-patches/features/0009-Entity-portal-teleport-speed-fix.patch
+5 -5
View File
@@ -12,9 +12,9 @@ index 3db75ac3f7f111b94178cc29684f24dd55ac5847..39e511061d11039a1027320de624be07
foliaProfiler.startTimer(timerId);
try {
// Folia end - profiler
+ // Camellia start - Entity portal-teleport speed fix
+ // Shiroha start - Entity portal-teleport speed fix
if (isActive) { // Paper - EAR 2
+ if (!(entity instanceof Player) && entity.teleportTickType == 2) { // Camellia - after portal compensate tick
+ if (!(entity instanceof Player) && entity.teleportTickType == 2) { // Shiroha - after portal compensate tick
+ entity.tick();
+ if (!ca.spottedleaf.moonrise.common.util.TickThread.isTickThreadFor(entity)) {
+ // removed from region while ticking
@@ -32,7 +32,7 @@ index 3db75ac3f7f111b94178cc29684f24dd55ac5847..39e511061d11039a1027320de624be07
+ if (entity.handlePortal()) {
+ return;
+ }
+ } else if (!(entity instanceof Player) && entity.teleportTickType == 1) { // Camellia - portal teleport only
+ } else if (!(entity instanceof Player) && entity.teleportTickType == 1) { // Shiroha - portal teleport only
+ entity.teleportTickType++;
+ if (!ca.spottedleaf.moonrise.common.util.TickThread.isTickThreadFor(entity)) {
+ return;
@@ -49,7 +49,7 @@ index 3db75ac3f7f111b94178cc29684f24dd55ac5847..39e511061d11039a1027320de624be07
return;
}
+ }
+ // Camellia end - Entity portal-teleport speed fix
+ // Shiroha end - Entity portal-teleport speed fix
// Folia end - region threading
} else {entity.inactiveTick();} // Paper - EAR 2
profiler.pop();
@@ -61,7 +61,7 @@ index 2a8a7aeddffdfed31cd6e1162c0756986049fbab..a3f473cab6a37e65de233c7f77d9de7c
public long activatedTick = Integer.MIN_VALUE;
public boolean isTemporarilyActive;
public long activatedImmunityTick = Integer.MIN_VALUE;
+ public int teleportTickType = 0; // Camellia - Entity portal-teleport speed fix
+ public int teleportTickType = 0; // Shiroha - Entity portal-teleport speed fix
public void inactiveTick() {
}