Merge pull request #3 from ItsSyfe/1.21.4

Folia support
Mrbysco · Feb 7, 2025 · 685d753 · 685d753
2 parents be444bc + b44159a
commit 685d753
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/src/main/java/com/mrbysco/armorposer/ArmorPoserPlugin.java b/src/main/java/com/mrbysco/armorposer/ArmorPoserPlugin.java
@@ -51,4 +51,13 @@ private void setupConfig() {
 	public void onDisable() {
 		// Plugin shutdown logic
 	}
+
+	public static boolean isFolia() {
+		try {
+			Class.forName("io.papermc.paper.threadedregions.ThreadedRegionizer");
+		} catch (Exception e) {
+			return false;
+		}
+		return true;
+	}
 }
diff --git a/src/main/java/com/mrbysco/armorposer/handler/SyncHandler.java b/src/main/java/com/mrbysco/armorposer/handler/SyncHandler.java
@@ -2,6 +2,7 @@
 
 import com.mrbysco.armorposer.ArmorPoserPlugin;
 import io.netty.buffer.Unpooled;
+import io.papermc.paper.threadedregions.scheduler.FoliaEntityScheduler;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.ListTag;
 import net.minecraft.nbt.Tag;
@@ -79,9 +80,15 @@ public void onPluginMessageReceived(@NotNull String channel, @NotNull Player pla
 				double y = tagList.getDouble(1);
 				double z = tagList.getDouble(2);
 				if (x != 0 || y != 0 || z != 0)
-					armorStand.teleport(new Location(armorStand.getWorld(), armorStand.getX() + x,
-							armorStand.getY() + y,
-							armorStand.getZ() + z), PlayerTeleportEvent.TeleportCause.PLUGIN);
+					if (ArmorPoserPlugin.isFolia()) {
+						armorStand.teleportAsync(new Location(armorStand.getWorld(), armorStand.getX() + x,
+								armorStand.getY() + y,
+								armorStand.getZ() + z), PlayerTeleportEvent.TeleportCause.PLUGIN);
+					} else {
+						armorStand.teleport(new Location(armorStand.getWorld(), armorStand.getX() + x,
+								armorStand.getY() + y,
+								armorStand.getZ() + z), PlayerTeleportEvent.TeleportCause.PLUGIN);
+					}
 			}
 		}
 	}

diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -2,6 +2,7 @@ name: ArmorPoser
 version: '${version}'
 main: com.mrbysco.armorposer.ArmorPoserPlugin
 api-version: 1.21
+folia-supported: true
 author: "Mrbysco"
 description: "A paper plugin that allows clients to use Armor Poser to pose armor stands"
 website: "https://www.curseforge.com/minecraft/bukkit-plugins/armor-poser-plugin"