move getEntityModifier to globalRegionScheduler

EpsilonNetWorkGroup · Jun 5, 2024 · 1cb9c2b · 1cb9c2b
1 parent 1f6108e
commit 1cb9c2b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -21,7 +21,7 @@ dependencies {
 }
 
 group = "net.playl.scccpdebris"
-version = "1.7.4-folia-SNAPSHOT"
+version = "1.7.5-folia-SNAPSHOT"
 description = "scccpdebris-folia"
 
 tasks {

diff --git a/src/main/java/net/playl/scccpdebris/Listen/SecurityPacket.java b/src/main/java/net/playl/scccpdebris/Listen/SecurityPacket.java
@@ -9,7 +9,9 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
+import java.util.concurrent.CompletableFuture;
 
+import org.bukkit.Bukkit;
 import org.bukkit.World;
 import org.bukkit.World.Environment;
 import org.bukkit.attribute.Attribute;
@@ -74,7 +76,12 @@ public void onPacketSending(PacketEvent event) {
     private void entityMetaData(PacketEvent e) {
         PacketContainer packet = e.getPacket();
         Player p = e.getPlayer();
-        Entity entity = packet.getEntityModifier(e).read(0);
+        CompletableFuture<Entity> completableFuture = new CompletableFuture<>();
+        Bukkit.getGlobalRegionScheduler().execute(plugin, () -> {
+            completableFuture.complete(packet.getEntityModifier(p.getWorld()).read(0));
+        });
+
+        Entity entity = completableFuture.join();
         List<WrappedDataValue> modifier = packet.getDataValueCollectionModifier().read(0);
         if (!(entity instanceof LivingEntity) || e.isPlayerTemporary()) {
             return;