68 lines
3.1 KiB
Diff
68 lines
3.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: MrHua269 <mrhua269@gmail.com>
|
|
Date: Wed, 8 Jul 2026 21:32:08 +0800
|
|
Subject: [PATCH] Entity portal-teleport speed fix
|
|
|
|
|
|
diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
|
|
index 35ab432bbd59aba80a6eaca1769e6aa82c8a7e46..9933e59dfebf5d731ea73585c2b08f9e4ff42d53 100644
|
|
--- a/net/minecraft/server/level/ServerLevel.java
|
|
+++ b/net/minecraft/server/level/ServerLevel.java
|
|
@@ -1492,7 +1492,35 @@ public class ServerLevel extends Level implements WorldGenLevel, ServerEntityGet
|
|
foliaProfiler.startTimer(timerId);
|
|
try {
|
|
// Folia end - profiler
|
|
+ // Shiroha start - Entity portal-teleport speed fix
|
|
if (isActive) { // Paper - EAR 2
|
|
+ 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
|
|
+ return;
|
|
+ }
|
|
+ if (entity.handlePortal()) {
|
|
+ // portalled
|
|
+ return;
|
|
+ }
|
|
+ entity.tick();
|
|
+ entity.teleportTickType = 0;
|
|
+ if (!ca.spottedleaf.moonrise.common.util.TickThread.isTickThreadFor(entity)) {
|
|
+ return;
|
|
+ }
|
|
+ if (entity.handlePortal()) {
|
|
+ return;
|
|
+ }
|
|
+ } else if (!(entity instanceof Player) && entity.teleportTickType == 1) { // Shiroha - portal teleport only
|
|
+ entity.teleportTickType++;
|
|
+ if (!ca.spottedleaf.moonrise.common.util.TickThread.isTickThreadFor(entity)) {
|
|
+ return;
|
|
+ }
|
|
+ if (entity.handlePortal()) {
|
|
+ return;
|
|
+ }
|
|
+ } else {
|
|
entity.tick();
|
|
// Folia start - region threading
|
|
if (!ca.spottedleaf.moonrise.common.util.TickThread.isTickThreadFor(entity)) {
|
|
@@ -1503,6 +1531,8 @@ public class ServerLevel extends Level implements WorldGenLevel, ServerEntityGet
|
|
// portalled
|
|
return;
|
|
}
|
|
+ }
|
|
+ // Shiroha end - Entity portal-teleport speed fix
|
|
// Folia end - region threading
|
|
} 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 75dabd3e7b6077b5ae8ee30048786442742b93f9..55263dcdb3ba4d754ad9aa36ce7af3718db98e73 100644
|
|
--- a/net/minecraft/world/entity/Entity.java
|
|
+++ b/net/minecraft/world/entity/Entity.java
|
|
@@ -388,6 +388,7 @@ public abstract class Entity
|
|
public long activatedTick = Integer.MIN_VALUE;
|
|
public boolean isTemporarilyActive;
|
|
public long activatedImmunityTick = Integer.MIN_VALUE;
|
|
+ public int teleportTickType = 0; // Shiroha - Entity portal-teleport speed fix
|
|
|
|
public void inactiveTick() {
|
|
}
|