emanondev · GenOpenDiesel · Jun 18, 2026
diff --git a/src/main/java/emanondev/itemtag/actions/DelayedAction.java b/src/main/java/emanondev/itemtag/actions/DelayedAction.java
@@ -1,10 +1,10 @@
 package emanondev.itemtag.actions;
 
 import emanondev.itemedit.utility.CompleteUtility;
+import emanondev.itemedit.utility.SchedulerUtils;
 import emanondev.itemtag.ItemTag;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
-import org.bukkit.scheduler.BukkitRunnable;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -48,11 +48,8 @@ public String fixActionInfo(String actionInfo) {
     @Override
     public void execute(Player player, String text) {
         String[] args = text.split(" ");
-        new BukkitRunnable() {
-            public void run() {
-                ActionHandler.handleAction(player, args[1], text.substring(args[0].length() + args[1].length() + 2));
-            }
-        }.runTaskLater(ItemTag.get(), Long.parseLong(args[0]));
+        SchedulerUtils.runLater(ItemTag.get(), player, Long.parseLong(args[0]), () ->
+                ActionHandler.handleAction(player, args[1], text.substring(args[0].length() + args[1].length() + 2)));
     }
 
     @Override

diff --git a/src/main/java/emanondev/itemtag/activity/action/DelayedActionType.java b/src/main/java/emanondev/itemtag/activity/action/DelayedActionType.java
@@ -1,12 +1,12 @@
 package emanondev.itemtag.activity.action;
 
+import emanondev.itemedit.utility.SchedulerUtils;
 import emanondev.itemtag.ItemTag;
 import emanondev.itemtag.activity.ActionManager;
 import emanondev.itemtag.activity.ActionType;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
 import org.bukkit.inventory.ItemStack;
-import org.bukkit.scheduler.BukkitRunnable;
 import org.jetbrains.annotations.NotNull;
 
 public class DelayedActionType extends ActionType {
@@ -37,12 +37,7 @@ public DelayedAction(@NotNull String info) {
 
         @Override
         public boolean execute(@NotNull Player player, @NotNull ItemStack item, Event event) {
-            new BukkitRunnable() {
-                @Override
-                public void run() {
-                    action.execute(player, item, event);
-                }
-            }.runTaskLater(ItemTag.get(), delay);
+            SchedulerUtils.runLater(ItemTag.get(), player, delay, () -> action.execute(player, item, event));
             return true;
         }
     }

diff --git a/src/main/java/emanondev/itemtag/command/itemtag/Effects.java b/src/main/java/emanondev/itemtag/command/itemtag/Effects.java
@@ -3,6 +3,7 @@
 import emanondev.itemedit.aliases.Aliases;
 import emanondev.itemedit.utility.CompleteUtility;
 import emanondev.itemedit.utility.ItemUtils;
+import emanondev.itemedit.utility.SchedulerUtils;
 import emanondev.itemedit.utility.VersionUtils;
 import emanondev.itemtag.EffectsInfo;
 import emanondev.itemtag.ItemTag;
@@ -11,7 +12,6 @@
 import emanondev.itemtag.command.ListenerSubCmd;
 import emanondev.itemtag.equipmentchange.EquipmentChangeEvent;
 import emanondev.itemtag.gui.EffectsGui;
-import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -22,7 +22,6 @@
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;
-import org.bukkit.scheduler.BukkitRunnable;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -269,8 +268,7 @@ public void onEquipChange(EquipmentChangeEvent event) {
 
     @EventHandler
     private void onPlayerRespawn(PlayerRespawnEvent event) {
-        new BukkitRunnable() {
-            public void run() {
+        SchedulerUtils.runLater(ItemTag.get(), event.getPlayer(), 1L, () -> {
                 for (EquipmentSlot slot : ItemTagUtility.getPlayerEquipmentSlots()) {
                     ItemStack equip = getEquip(event.getPlayer(), slot);
                     if (ItemUtils.isAirOrNull(equip))
@@ -301,8 +299,7 @@ else if (currentEffect.getAmplifier() <= effect.getAmplifier())
                         }
                     }
                 }
-            }
-        }.runTaskLater(ItemTag.get(), 1L); //effect are resetted just after playerrespawnevent
+        }); //effect are resetted just after playerrespawnevent
 
     }
 
@@ -327,7 +324,7 @@ private void addEffect(@NotNull Player target, @NotNull PotionEffectType type, @
     @EventHandler(ignoreCancelled = true)
     private void event(PlayerItemConsumeEvent event) {
         if (event.getItem().getType() == Material.MILK_BUCKET)
-            Bukkit.getScheduler().runTaskLater(this.getPlugin(), () -> restoreEffects(event.getPlayer()), 1L);
+            SchedulerUtils.runLater(this.getPlugin(), event.getPlayer(), 1L, () -> restoreEffects(event.getPlayer()));
     }
 
     public void restoreEffects(Player p) {

diff --git a/src/main/java/emanondev/itemtag/command/itemtag/EffectsResurrectListener.java b/src/main/java/emanondev/itemtag/command/itemtag/EffectsResurrectListener.java
@@ -1,6 +1,6 @@
 package emanondev.itemtag.command.itemtag;
 
-import org.bukkit.Bukkit;
+import emanondev.itemedit.utility.SchedulerUtils;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
@@ -21,7 +21,7 @@ public class EffectsResurrectListener implements Listener {
     @EventHandler(ignoreCancelled = true)
     private void event(EntityResurrectEvent event) {
         if (event.getEntity() instanceof Player)
-            Bukkit.getScheduler().runTaskLater(parent.getPlugin(),
+            SchedulerUtils.runLater(parent.getPlugin(), (Player) event.getEntity(), 1L,
                     () -> {
                         List<PotionEffect> l = new ArrayList<>(event.getEntity().getActivePotionEffects());
                         l.forEach((e) -> event.getEntity().removePotionEffect(e.getType()));
@@ -31,8 +31,7 @@ private void event(EntityResurrectEvent event) {
                                     e.getAmplifier() > event.getEntity().getPotionEffect(e.getType()).getAmplifier())
                                 event.getEntity().addPotionEffect(e);
                         });
-                    }
-                    , 1L);
+                    });
     }
 
 }
diff --git a/src/main/java/emanondev/itemtag/command/itemtag/WearPermission.java b/src/main/java/emanondev/itemtag/command/itemtag/WearPermission.java
@@ -7,11 +7,11 @@
 import emanondev.itemedit.utility.CompleteUtility;
 import emanondev.itemedit.utility.InventoryUtils;
 import emanondev.itemedit.utility.ItemUtils;
+import emanondev.itemedit.utility.SchedulerUtils;
 import emanondev.itemtag.ItemTag;
 import emanondev.itemtag.TagItem;
 import emanondev.itemtag.command.ListenerSubCmd;
 import emanondev.itemtag.equipmentchange.EquipmentChangeEvent;
-import org.bukkit.Bukkit;
 import org.bukkit.Sound;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -114,7 +114,7 @@ public void event(final EquipmentChangeEvent event) {
             return;
         }
 
-        Bukkit.getScheduler().runTaskLater(getPlugin(), () -> {
+        SchedulerUtils.runLater(getPlugin(), player, 1L, () -> {
             if (!player.isOnline())
                 return;
             ItemStack originalItem = InventoryUtils.getItem(player, event.getSlotType());
@@ -141,7 +141,7 @@ public void event(final EquipmentChangeEvent event) {
                 api.setCooldown(player,cooldownKey,1, TimeUnit.SECONDS);
                 Util.sendMessage(player, UtilsString.fix(tagItem.getString(WEARMSG_KEY), player, true, "%permission%", perm));
             }
-        }, 1L);
+        });
 
     }
 

diff --git a/src/main/java/emanondev/itemtag/command/itemtag/customflags/EquipmentFlag.java b/src/main/java/emanondev/itemtag/command/itemtag/customflags/EquipmentFlag.java
@@ -2,10 +2,10 @@
 
 import emanondev.itemedit.utility.InventoryUtils;
 import emanondev.itemedit.utility.ItemUtils;
+import emanondev.itemedit.utility.SchedulerUtils;
 import emanondev.itemtag.ItemTag;
 import emanondev.itemtag.command.itemtag.Flag;
 import emanondev.itemtag.equipmentchange.EquipmentChangeEvent;
-import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.Sound;
 import org.bukkit.event.EventHandler;
@@ -48,7 +48,7 @@ public void event(EquipmentChangeEvent event) {
         if (this.getValue(ItemTag.getTagItem(event.getTo()))) {
             return;
         }
-        Bukkit.getScheduler().runTaskLater(getPlugin(), () -> {
+        SchedulerUtils.runLater(getPlugin(), event.getPlayer(), 1L, () -> {
             if (!event.getPlayer().isOnline()) {
                 return;
             }
@@ -94,6 +94,6 @@ public void event(EquipmentChangeEvent event) {
             InventoryUtils.giveAmount(event.getPlayer(), item, item.getAmount(), InventoryUtils.ExcessMode.DROP_EXCESS);
             ItemTag.get().getEquipChangeListener().onEquipChange(event.getPlayer(), EquipmentChangeEvent.EquipMethod.UNKNOWN
                     , event.getSlotType(), item, null);
-        }, 1L);
+        });
     }
 }
diff --git a/src/main/java/emanondev/itemtag/command/itemtag/customflags/RenamableOld.java b/src/main/java/emanondev/itemtag/command/itemtag/customflags/RenamableOld.java
@@ -1,9 +1,10 @@
 package emanondev.itemtag.command.itemtag.customflags;
 
+import emanondev.itemedit.utility.SchedulerUtils;
 import emanondev.itemtag.ItemTag;
 import emanondev.itemtag.command.itemtag.Flag;
-import org.bukkit.Bukkit;
 import org.bukkit.Material;
+import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.inventory.InventoryClickEvent;
@@ -27,12 +28,12 @@ public void event(InventoryClickEvent event) {
         }
         if (ItemTag.getTagItem(event.getInventory().getItem(0)).hasBooleanTag(RENAMABLE_KEY) ||
                 ItemTag.getTagItem(event.getInventory().getItem(1)).hasBooleanTag(RENAMABLE_KEY)) {
-            Bukkit.getScheduler().runTaskLater(ItemTag.get(), () -> {
+            SchedulerUtils.runLater(ItemTag.get(), (Player) event.getWhoClicked(), 1L, () -> {
                 if (ItemTag.getTagItem(event.getInventory().getItem(0)).hasBooleanTag(RENAMABLE_KEY) ||
                         ItemTag.getTagItem(event.getInventory().getItem(1)).hasBooleanTag(RENAMABLE_KEY)) {
                     event.getInventory().setItem(2, null);
                 }
-            }, 1L);
+            });
             if (event.getSlot() == 2) {
                 event.setCancelled(true);
             }

diff --git a/src/main/java/emanondev/itemtag/command/itemtag/customflags/Usable.java b/src/main/java/emanondev/itemtag/command/itemtag/customflags/Usable.java
@@ -1,10 +1,10 @@
 package emanondev.itemtag.command.itemtag.customflags;
 
 import emanondev.itemedit.utility.InventoryUtils;
+import emanondev.itemedit.utility.SchedulerUtils;
 import emanondev.itemedit.utility.VersionUtils;
 import emanondev.itemtag.ItemTag;
 import emanondev.itemtag.command.itemtag.Flag;
-import org.bukkit.Bukkit;
 import org.bukkit.FluidCollisionMode;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
@@ -37,14 +37,14 @@ private void event(PlayerInteractEvent event) {
                         b = event.getPlayer().getTargetBlockExact(7, FluidCollisionMode.SOURCE_ONLY);
                     } else
                         b = null;
-                    Bukkit.getScheduler().runTaskLater(ItemTag.get(), () -> { //TODO folia fix
+                    SchedulerUtils.runLater(ItemTag.get(), event.getPlayer(), 1L, () -> {
                         if (!VersionUtils.isVersionAfter(1, 20)) {
                             InventoryUtils.updateView(event.getPlayer());
                         }
                         if (b != null) {//reduce clientside visual glich on liquids only for 1.14+
                             event.getPlayer().sendBlockChange(b.getLocation(), b.getBlockData());
                         }
-                    }, 1L);
+                    });
                 }
             default:
         }

diff --git a/src/main/java/emanondev/itemtag/equipmentchange/EquipmentChangeListener.java b/src/main/java/emanondev/itemtag/equipmentchange/EquipmentChangeListener.java
@@ -2,7 +2,6 @@
 
 import emanondev.itemedit.utility.InventoryUtils;
 import emanondev.itemedit.utility.ItemUtils;
-import emanondev.itemtag.ItemTag;
 import emanondev.itemtag.ItemTagUtility;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -110,10 +109,9 @@ else if (event.getHotbarButton() == p.getInventory().getHeldItemSlot())
                     onEquipChange(p, EquipmentChangeEvent.EquipMethod.INVENTORY_MOVE_TO_OTHER_INVENTORY, slot, null, event.getCurrentItem());
                 if (clickedSlot == null || clickedSlot == EquipmentSlot.HAND)
                     new SlotCheck(p, EquipmentChangeEvent.EquipMethod.INVENTORY_MOVE_TO_OTHER_INVENTORY, EquipmentSlot.HAND)
-                            .runTaskLater(ItemTag.get(), 1L);
+                            .schedule();
                 else
-                    new SlotCheck(p, EquipmentChangeEvent.EquipMethod.INVENTORY_MOVE_TO_OTHER_INVENTORY, clickedSlot).runTaskLater(ItemTag.get(),
-                            1L);
+                    new SlotCheck(p, EquipmentChangeEvent.EquipMethod.INVENTORY_MOVE_TO_OTHER_INVENTORY, clickedSlot).schedule();
                 return;
             }
             case COLLECT_TO_CURSOR:
@@ -126,7 +124,7 @@ else if (event.getHotbarButton() == p.getInventory().getHeldItemSlot())
                 else if (event.getCursor().isSimilar(getEquip(p, EquipmentSlot.HAND)))
                     slots.add(EquipmentSlot.HAND);
                 if (!slots.isEmpty())
-                    new SlotCheck(p, EquipmentChangeEvent.EquipMethod.INVENTORY_COLLECT_TO_CURSOR, slots).runTaskLater(ItemTag.get(), 1L);
+                    new SlotCheck(p, EquipmentChangeEvent.EquipMethod.INVENTORY_COLLECT_TO_CURSOR, slots).schedule();
                 return;
             case PICKUP_SOME:
             case UNKNOWN:
@@ -255,6 +253,6 @@ private void event(EntityPickupItemEvent event) {
         for (int i = 0; i < p.getInventory().getHeldItemSlot(); i++)
             if (ItemUtils.isAirOrNull(p.getInventory().getItem(i)))
                 return;
-        new SlotCheck(p, EquipmentChangeEvent.EquipMethod.PICKUP, EquipmentSlot.HAND).runTaskLater(ItemTag.get(), 1L);
+        new SlotCheck(p, EquipmentChangeEvent.EquipMethod.PICKUP, EquipmentSlot.HAND).schedule();
     }
 }