From 13c0b45d2a21bd358b9c66908912efef5b3af9d6 Mon Sep 17 00:00:00 2001
From: TheLividaProject <56977759+TheLividaProject@users.noreply.github.com>
Date: Mon, 21 Jul 2025 21:57:06 +0100
Subject: [PATCH] 1.21.8 support

---
 .idea/workspace.xml                                  |  4 ++--
 build.gradle.kts                                     |  9 ++++-----
 .../managers/model/data/ModelEntityData.java         |  1 -
 .../runnables/EntityTaskRunnable.java                | 12 ++----------
 4 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index c49d851..9238fa3 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,8 +5,8 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ff2e9770-ec88-4715-adeb-b9dbda130e1a" name="Changes" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/build.gradle.kts" beforeDir="false" afterPath="$PROJECT_DIR$/build.gradle.kts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/re/imc/geysermodelengine/managers/model/data/ModelEntityData.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/re/imc/geysermodelengine/managers/model/data/ModelEntityData.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/re/imc/geysermodelengine/runnables/EntityTaskRunnable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/re/imc/geysermodelengine/runnables/EntityTaskRunnable.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/build.gradle.kts b/build.gradle.kts
index 97b4556..e607db7 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -20,8 +20,8 @@ repositories {
 }
 
 dependencies {
-    compileOnly("io.papermc.paper:paper-api:1.21.7-R0.1-SNAPSHOT")
-    implementation("dev.jorel:commandapi-bukkit-shade-mojang-mapped:10.1.1")
+    compileOnly("io.papermc.paper:paper-api:1.21.8-R0.1-SNAPSHOT")
+    implementation("dev.jorel:commandapi-bukkit-shade-mojang-mapped:10.1.2")
 
     compileOnly("com.ticxo.modelengine:ModelEngine:R4.0.9")
 
@@ -51,7 +51,6 @@ tasks.shadowJar {
     relocate("org.reflections", "re.imc.geysermodelengine.libs.reflections")
 }
 
-tasks.jar {
-    enabled = false
-    dependsOn(tasks.shadowJar)
+tasks.build {
+    dependsOn("shadowJar")
 }
\ No newline at end of file
diff --git a/src/main/java/re/imc/geysermodelengine/managers/model/data/ModelEntityData.java b/src/main/java/re/imc/geysermodelengine/managers/model/data/ModelEntityData.java
index 541a08b..eadfd1b 100644
--- a/src/main/java/re/imc/geysermodelengine/managers/model/data/ModelEntityData.java
+++ b/src/main/java/re/imc/geysermodelengine/managers/model/data/ModelEntityData.java
@@ -48,7 +48,6 @@ public class ModelEntityData {
 
     public void runEntityTask() {
         entityTask = new EntityTaskRunnable(plugin, this);
-        entityTask.run();
     }
 
     public PacketEntity getEntity() {
diff --git a/src/main/java/re/imc/geysermodelengine/runnables/EntityTaskRunnable.java b/src/main/java/re/imc/geysermodelengine/runnables/EntityTaskRunnable.java
index 40843a8..c995060 100644
--- a/src/main/java/re/imc/geysermodelengine/runnables/EntityTaskRunnable.java
+++ b/src/main/java/re/imc/geysermodelengine/runnables/EntityTaskRunnable.java
@@ -41,24 +41,16 @@ public class EntityTaskRunnable {
 
     private final BooleanPacker booleanPacker = new BooleanPacker();
 
-    private ScheduledFuture scheduledFuture;
+    private final ScheduledFuture scheduledFuture;
 
     public EntityTaskRunnable(GeyserModelEngine plugin, ModelEntityData model) {
         this.plugin = plugin;
 
         this.model = model;
-    }
 
-    public void run() {
         plugin.getEntityTaskManager().sendHitBoxToAll(model);
 
-        Runnable asyncTask = () -> {
-            try {
-                runAsync();
-            } catch (Throwable ignored) {}
-        };
-
-        scheduledFuture = plugin.getSchedulerPool().scheduleAtFixedRate(asyncTask, 0, 20, TimeUnit.MILLISECONDS);
+        scheduledFuture = plugin.getSchedulerPool().scheduleAtFixedRate(this::runAsync, 0, 20, TimeUnit.MILLISECONDS);
     }
 
     public void runAsync() {