From 24415dabcedc65c680afe1bb1ce546238f6838bd Mon Sep 17 00:00:00 2001
From: zimzaza4 <mc_zimzaza4@outlook.com>
Date: Thu, 14 Nov 2024 08:01:14 +0800
Subject: [PATCH 1/2] add a world check

---
 pom.xml                                                      | 2 +-
 src/main/java/re/imc/geysermodelengine/model/EntityTask.java | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e80c745..f1cf533 100644
--- a/pom.xml
+++ b/pom.xml
@@ -125,7 +125,7 @@
         <dependency>
             <groupId>com.comphenix.protocol</groupId>
             <artifactId>ProtocolLib</artifactId>
-            <version>5.3.0-SNAPSHOT</version>
+            <version>5.3.0</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/src/main/java/re/imc/geysermodelengine/model/EntityTask.java b/src/main/java/re/imc/geysermodelengine/model/EntityTask.java
index a265aed..51b8d80 100644
--- a/src/main/java/re/imc/geysermodelengine/model/EntityTask.java
+++ b/src/main/java/re/imc/geysermodelengine/model/EntityTask.java
@@ -329,10 +329,14 @@ public class EntityTask {
         if (GeyserModelEngine.getInstance().getJoinedPlayer() != null && GeyserModelEngine.getInstance().getJoinedPlayer().getIfPresent(player) != null) {
             return false;
         }
+
         Location playerLocation = player.getLocation().clone();
         Location entityLocation = entity.getLocation().clone();
         playerLocation.setY(0);
         entityLocation.setY(0);
+        if (playerLocation.getWorld() != entityLocation.getWorld()) {
+            return false;
+        }
         if (playerLocation.distanceSquared(entityLocation) > player.getSendViewDistance() * player.getSendViewDistance() * 16) {
             return false;
         }

From da6e885d02e6281e8ffb3081c770da133eb208ba Mon Sep 17 00:00:00 2001
From: zimzaza4 <mc_zimzaza4@outlook.com>
Date: Thu, 14 Nov 2024 09:00:33 +0800
Subject: [PATCH 2/2] delay

---
 .../java/re/imc/geysermodelengine/model/EntityTask.java     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/re/imc/geysermodelengine/model/EntityTask.java b/src/main/java/re/imc/geysermodelengine/model/EntityTask.java
index 51b8d80..6965553 100644
--- a/src/main/java/re/imc/geysermodelengine/model/EntityTask.java
+++ b/src/main/java/re/imc/geysermodelengine/model/EntityTask.java
@@ -131,7 +131,7 @@ public class EntityTask {
 
     private void sendSpawnPacket(Player onlinePlayer) {
         EntityTask task = model.getTask();
-        int delay = 1;
+        int delay = 50;
         boolean firstJoined = GeyserModelEngine.getInstance().getJoinedPlayer().getIfPresent(onlinePlayer) != null;
         if (firstJoined) {
             delay = GeyserModelEngine.getInstance().getJoinSendDelay();
@@ -154,8 +154,8 @@ public class EntityTask {
                 sendScale(Collections.singleton(player), true);
                 sendColor(Collections.singleton(player), true);
                 updateEntityProperties(Collections.singleton(player), true);
-            }, 20, TimeUnit.MILLISECONDS);
-        }, delay * 20L, TimeUnit.MILLISECONDS);
+            }, 1000, TimeUnit.MILLISECONDS);
+        }, delay * 50L, TimeUnit.MILLISECONDS);
     }
 
     public void sendScale(Collection<Player> players, boolean firstSend) {