Support Folia

main/src/main/java/net/citizensnpcs/Citizens.java

@@ -8,6 +8,7 @@
 import java.util.Map;
 import java.util.UUID;
 
+import net.citizensnpcs.api.util.schedulers.SchedulerTask;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.BlockCommandSender;
@@ -147,7 +148,7 @@ public void updateInventoryTitle(Player player, InventoryViewAPI view, String ne
     private CitizensNPCRegistry npcRegistry;
     private boolean packetEventsEnabled = true;
     private PacketEventsListener packetEventsListener;
-    private BukkitTask playerUpdateTask;
+    private SchedulerTask playerUpdateTask;
     private boolean saveOnDisable = true;
     private NPCDataStore saves;
     private NPCSelector selector;
@@ -192,6 +193,9 @@ private void despawnNPCs(boolean save) {
                     registry.saveToStore();
                 }
             }
+            if (net.citizensnpcs.api.util.SpigotUtil.isFoliaServer()) {
+                if (!this.isEnabled()) return;
+            }
             registry.despawnNPCs(DespawnReason.RELOAD);
         }
     }
@@ -463,7 +467,7 @@ public void onEnable() {
 
         // Setup NPCs after all plugins have been enabled (allows for multiworld
         // support and for NPCs to properly register external settings)
-        if (getServer().getScheduler().scheduleSyncDelayedTask(this, new CitizensLoadTask(), 1) == -1) {
+        if (CitizensAPI.getScheduler().runTaskLater(new CitizensLoadTask(), 1) == null) {
             Messaging.severeTr(Messages.LOAD_TASK_NOT_SCHEDULED);
             Bukkit.getPluginManager().disablePlugin(this);
         }
@@ -534,7 +538,7 @@ public void removeNamedNPCRegistry(String name) {
     }
 
     private void scheduleSaveTask(int delay) {
-        Bukkit.getScheduler().scheduleSyncRepeatingTask(this, new CitizensSaveTask(), delay, delay);
+        CitizensAPI.getScheduler().runTaskTimer(new CitizensSaveTask(), delay, delay);
     }
 
     @Override

main/src/main/java/net/citizensnpcs/EventListen.java

@@ -4,6 +4,7 @@
 import java.util.List;
 import java.util.Objects;
 
+import net.citizensnpcs.api.util.schedulers.SchedulerRunnable;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -63,7 +64,6 @@
 import org.bukkit.event.world.WorldUnloadEvent;
 import org.bukkit.plugin.PluginDescriptionFile;
 import org.bukkit.plugin.RegisteredListener;
-import org.bukkit.scheduler.BukkitRunnable;
 import org.bukkit.util.Vector;
 
 import com.google.common.base.Joiner;
@@ -264,7 +264,8 @@ void loadNPCs(ChunkEvent event) {
         if (event instanceof Cancellable) {
             runnable.run();
         } else {
-            Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, runnable);
+            final org.bukkit.Chunk chunk = event.getChunk();
+            CitizensAPI.getScheduler().runRegionTask(chunk.getWorld(), chunk.getX(), chunk.getZ(), runnable);
         }
     }
 
@@ -419,7 +420,7 @@ public void onEntityDeath(EntityDeathEvent event) {
             return;
 
         int deathAnimationTicks = event.getEntity() instanceof LivingEntity ? 20 : 2;
-        Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, () -> {
+        CitizensAPI.getScheduler().runRegionTaskLater(location, () -> {
             if (!npc.isSpawned() && npc.getOwningRegistry().getByUniqueId(npc.getUniqueId()) == npc) {
                 npc.spawn(location, SpawnReason.TIMED_RESPAWN);
             }
@@ -535,7 +536,7 @@ public void onNPCLinkToPlayer(NPCLinkToPlayerEvent event) {
         }
         if (npc.data().has(NPC.Metadata.HOLOGRAM_RENDERER)) {
             HologramRenderer hr = npc.data().get(NPC.Metadata.HOLOGRAM_RENDERER);
-            Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, () -> hr.onSeenByPlayer(npc, event.getPlayer()), 2);
+            CitizensAPI.getScheduler().runEntityTaskLater(event.getPlayer(), () -> hr.onSeenByPlayer(npc, event.getPlayer()), 2);
         }
     }
 
@@ -557,12 +558,12 @@ private void onNPCPlayerLinkToPlayer(NPCLinkToPlayerEvent event) {
         if (!sendTabRemove || !event.getNPC().shouldRemoveFromTabList()) {
             NMS.sendRotationPacket(tracker, ImmutableList.of(event.getPlayer()), null, null, NMS.getHeadYaw(tracker));
             if (resetYaw) {
-                Bukkit.getScheduler().scheduleSyncDelayedTask(plugin,
+                CitizensAPI.getScheduler().runEntityTask(tracker,
                         () -> PlayerAnimation.ARM_SWING.play((Player) tracker, event.getPlayer()));
             }
             return;
         }
-        Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, () -> {
+        CitizensAPI.getScheduler().runRegionTaskLater(tracker.getLocation(), () -> {
             if (!tracker.isValid() || !event.getPlayer().isValid())
                 return;
 
@@ -611,7 +612,7 @@ public void onPlayerChangedWorld(PlayerChangedWorldEvent event) {
         if (plugin.getNPCRegistry().getNPC(event.getPlayer()) == null)
             return;
 
-        Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, () -> {
+        CitizensAPI.getScheduler().runEntityTaskLater(event.getPlayer(), () -> {
             NMS.replaceTracker(event.getPlayer());
             NMS.removeFromServerPlayerList(event.getPlayer());
         }, 1);
@@ -674,7 +675,7 @@ public void onPlayerInteractEntity(PlayerInteractEntityEvent event) {
             if (SUPPORT_STOP_USE_ITEM) {
                 try {
                     PlayerAnimation.STOP_USE_ITEM.play(player);
-                    Bukkit.getScheduler().scheduleSyncDelayedTask(plugin,
+                    CitizensAPI.getScheduler().runEntityTask(player,
                             () -> PlayerAnimation.STOP_USE_ITEM.play(player));
                 } catch (UnsupportedOperationException e) {
                     SUPPORT_STOP_USE_ITEM = false;
@@ -778,7 +779,7 @@ public void onProjectileHit(ProjectileHitEvent event) {
         if (!(event.getEntity() instanceof FishHook))
             return;
         NMS.removeHookIfNecessary((FishHook) event.getEntity());
-        new BukkitRunnable() {
+        new SchedulerRunnable() {
             int n = 0;
 
             @Override
@@ -789,7 +790,7 @@ public void run() {
                 }
                 NMS.removeHookIfNecessary((FishHook) event.getEntity());
             }
-        }.runTaskTimer(plugin, 0, 1);
+        }.runEntityTaskTimer(plugin, event.getEntity(), null, 0, 1);
     }
 
     @EventHandler
@@ -899,7 +900,7 @@ private void registerKnockbackEvent(Class<?> kbc) {
         }
     }
 
-    private void registerMoveEvent(Class<?> clazz) {
+private void registerMoveEvent(Class<?> clazz) {
         try {
             final HandlerList handlers = (HandlerList) clazz.getMethod("getHandlerList").invoke(null);
             final Method getEntity = clazz.getMethod("getEntity");
@@ -920,12 +921,12 @@ private void registerMoveEvent(Class<?> clazz) {
                     Bukkit.getPluginManager().callEvent(npcMoveEvent);
                     if (npcMoveEvent.isCancelled()) {
                         final Location eventFrom = npcMoveEvent.getFrom();
-                        Bukkit.getScheduler().runTaskLater(plugin, () -> entity.teleport(eventFrom), 1L);
+                        CitizensAPI.getScheduler().runEntityTaskLater(entity, () -> SpigotUtil.teleportAsync(entity, eventFrom), 1L);
                         return;
                     }
                     final Location eventTo = npcMoveEvent.getTo();
                     if (eventTo.getWorld() != to.getWorld() || eventTo.distance(to) > 0.001) {
-                        Bukkit.getScheduler().runTaskLater(plugin, () -> entity.teleport(eventTo), 1L);
+                        CitizensAPI.getScheduler().runEntityTaskLater(entity, () -> SpigotUtil.teleportAsync(entity, eventTo), 1L);
                     }
                 } catch (Throwable ex) {
                     ex.printStackTrace();
@@ -1033,7 +1034,8 @@ private void unloadNPCs(ChunkEvent event, List<NPC> toDespawn) {
         }
         if (loadChunk) {
             Messaging.idebug(() -> Joiner.on(' ').join("Loading chunk in 10 ticks due to forced chunk load at", coord));
-            Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, () -> {
+            final org.bukkit.Chunk chunk = event.getChunk();
+            CitizensAPI.getScheduler().runRegionTaskLater(chunk.getWorld(), chunk.getX(), chunk.getZ(), () -> {
                 if (!event.getChunk().isLoaded()) {
                     event.getChunk().load();
                 }

main/src/main/java/net/citizensnpcs/Metrics.java

@@ -29,6 +29,7 @@
 
 import javax.net.ssl.HttpsURLConnection;
 
+import net.citizensnpcs.api.CitizensAPI;
 import org.bukkit.Bukkit;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Player;
@@ -88,7 +89,7 @@ public Metrics(JavaPlugin plugin, int serviceId) {
         boolean logSentData = config.getBoolean("logSentData", false);
         boolean logResponseStatusText = config.getBoolean("logResponseStatusText", false);
         metricsBase = new MetricsBase("bukkit", serverUUID, serviceId, enabled, this::appendPlatformData,
-                this::appendServiceData, submitDataTask -> Bukkit.getScheduler().runTask(plugin, submitDataTask),
+                this::appendServiceData, submitDataTask -> CitizensAPI.getScheduler().runTask(submitDataTask),
                 plugin::isEnabled, (message, error) -> this.plugin.getLogger().log(Level.WARNING, message, error),
                 message -> this.plugin.getLogger().log(Level.INFO, message), logErrors, logSentData,
                 logResponseStatusText);

main/src/main/java/net/citizensnpcs/commands/NPCCommands.java

@@ -900,7 +900,7 @@ else if (!EntityControllers.controllerExistsForType(type))
         }
         if (temporaryDuration != null) {
             NPC temp = npc;
-            Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), () -> {
+            CitizensAPI.getScheduler().runEntityTaskLater(temp.getEntity(), () -> {
                 if (temporaryRegistry.getByUniqueId(temp.getUniqueId()) == temp) {
                     temp.destroy();
                 }
@@ -3186,14 +3186,14 @@ public void skin(CommandContext args, CommandSender sender, NPC npc, @Flag("url"
             return;
         } else if (url != null || file != null) {
             Messaging.sendTr(sender, Messages.FETCHING_SKIN, url == null ? file : url);
-            Bukkit.getScheduler().runTaskAsynchronously(CitizensAPI.getPlugin(), () -> {
+            CitizensAPI.getScheduler().runTaskAsynchronously(() -> {
                 try {
                     JSONObject data = null;
                     if (file != null) {
                         File skinsFolder = new File(CitizensAPI.getDataFolder(), "skins");
                         File skin = new File(skinsFolder, Placeholders.replace(file, sender, npc));
                         if (!skin.exists() || !skin.isFile() || skin.isHidden() || !isInDirectory(skin, skinsFolder)) {
-                            Bukkit.getScheduler().runTask(CitizensAPI.getPlugin(),
+                            CitizensAPI.getScheduler().runTask(
                                     () -> Messaging.sendErrorTr(sender, Messages.INVALID_SKIN_FILE, file));
                             return;
                         }
@@ -3208,7 +3208,7 @@ public void skin(CommandContext args, CommandSender sender, NPC npc, @Flag("url"
                     String textureEncoded = (String) texture.get("value");
                     String signature = (String) texture.get("signature");
 
-                    Bukkit.getScheduler().runTask(CitizensAPI.getPlugin(), () -> {
+                    CitizensAPI.getScheduler().runEntityTask(npc.getEntity(), () -> {
                         try {
                             trait.setSkinPersistent(uuid, signature, textureEncoded);
                             Messaging.sendTr(sender, Messages.SKIN_URL_SET, npc.getName(), url == null ? file : url);
@@ -3220,7 +3220,7 @@ public void skin(CommandContext args, CommandSender sender, NPC npc, @Flag("url"
                     if (Messaging.isDebugging()) {
                         t.printStackTrace();
                     }
-                    Bukkit.getScheduler().runTask(CitizensAPI.getPlugin(), () -> Messaging.sendErrorTr(sender,
+                    CitizensAPI.getScheduler().runTask(() -> Messaging.sendErrorTr(sender,
                             Messages.ERROR_SETTING_SKIN_URL, url == null ? file : url));
                 }
             });
@@ -3599,7 +3599,7 @@ public void tp(CommandContext args, Player player, NPC npc) {
             to = to.clone().add(to.getDirection().setY(0));
             to.setDirection(to.getDirection().multiply(-1)).setPitch(0);
         }
-        player.teleport(to, TeleportCause.COMMAND);
+        SpigotUtil.teleportAsync(player, to, TeleportCause.COMMAND);
         Messaging.sendTr(player, Messages.TELEPORTED_TO_NPC, npc.getName());
     }
 
@@ -3700,7 +3700,7 @@ public void tpto(CommandContext args, CommandSender sender, NPC npc) throws Comm
             throw new CommandException(Messages.FROM_ENTITY_NOT_FOUND);
         if (to == null)
             throw new CommandException(Messages.TPTO_ENTITY_NOT_FOUND);
-        from.teleport(to);
+        SpigotUtil.teleportAsync(from, to.getLocation());
         Messaging.sendTr(sender, Messages.TPTO_SUCCESS);
     }
 

main/src/main/java/net/citizensnpcs/npc/AbstractEntityController.java

@@ -64,4 +64,9 @@ public void remove() {
     public boolean spawn(Location at) {
         return !Util.isLoaded(at) ? false : NMS.addEntityToWorld(bukkitEntity, CreatureSpawnEvent.SpawnReason.CUSTOM);
     }
+
+    @Override
+    public void spawn(Location at, java.util.function.Consumer<Boolean> isSpawned) {
+        NMS.addEntityToWorld(bukkitEntity, CreatureSpawnEvent.SpawnReason.CUSTOM, isSpawned);
+    }
 }

main/src/main/java/net/citizensnpcs/npc/CitizensNPC.java

@@ -7,6 +7,7 @@
 import java.util.UUID;
 import java.util.function.Consumer;
 
+import net.citizensnpcs.api.util.schedulers.SchedulerRunnable;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Registry;
@@ -187,7 +188,13 @@ public void load(DataKey root) {
         if (getOrAddTrait(Spawned.class).shouldSpawn()) {
             CurrentLocation current = getOrAddTrait(CurrentLocation.class);
             if (current.getLocation() != null) {
-                spawn(current.getLocation(), SpawnReason.RESPAWN);
+                if (CitizensAPI.getScheduler().isOnOwnerThread(current.getLocation())) {
+                    spawn(current.getLocation(), SpawnReason.RESPAWN);
+                } else {
+                    CitizensAPI.getScheduler().runRegionTask(current.getLocation(), () -> {
+                        spawn(current.getLocation(), SpawnReason.RESPAWN);
+                    });
+                }
             } else if (current.getChunkCoord() != null) {
                 Bukkit.getPluginManager().callEvent(new NPCNeedsRespawnEvent(this, current.getChunkCoord()));
             }
@@ -333,8 +340,19 @@ public boolean spawn(Location at, SpawnReason reason, Consumer<Entity> callback)
         }
         data().set(NPC.Metadata.NPC_SPAWNING_IN_PROGRESS, true);
         boolean wasLoaded = Messaging.isDebugging() ? Util.isLoaded(at) : false;
-        boolean couldSpawn = entityController.spawn(at);
+        final Location location = at;
+        if (net.citizensnpcs.api.util.SpigotUtil.isFoliaServer()) {
+            entityController.spawn(location, couldSpawn -> {
+                this.spawn(couldSpawn, reason, wasLoaded, location, callback);
+            });
+            return true;
+        } else {
+            boolean couldSpawn = entityController.spawn(location);
+            return spawn(couldSpawn, reason, wasLoaded, at, callback);
+        }
+    }
 
+    private boolean spawn(boolean couldSpawn, SpawnReason reason, boolean wasLoaded, Location at, Consumer<Entity> callback) {
         if (!couldSpawn) {
             if (Messaging.isDebugging()) {
                 Messaging.debug("Retrying spawn of", this, "later, SpawnReason." + reason + ". Was loaded", wasLoaded,
@@ -436,12 +454,12 @@ public void accept(Runnable cancel) {
             postSpawn.accept(() -> {
             });
         } else {
-            new BukkitRunnable() {
+            new SchedulerRunnable() {
                 @Override
                 public void run() {
                     postSpawn.accept(this::cancel);
                 }
-            }.runTaskTimer(CitizensAPI.getPlugin(), 0, 1);
+            }.runEntityTaskTimer(CitizensAPI.getPlugin(), getEntity(), null, 0, 1);
         }
         return true;
     }

main/src/main/java/net/citizensnpcs/npc/CitizensNPCRegistry.java

@@ -37,7 +37,7 @@ public class CitizensNPCRegistry implements NPCRegistry {
     private final String name;
     private final Int2ObjectOpenHashMap<NPC> npcs = new Int2ObjectOpenHashMap<>();
     private final NPCDataStore saves;
-    private final Map<UUID, NPC> uniqueNPCs = Maps.newHashMap();
+    private final Map<UUID, NPC> uniqueNPCs = Maps.newConcurrentMap();
 
     public CitizensNPCRegistry(NPCDataStore store) {
         this(store, "");

main/src/main/java/net/citizensnpcs/npc/CitizensTraitFactory.java

@@ -79,8 +79,8 @@
 import net.citizensnpcs.util.NMS;
 
 public class CitizensTraitFactory implements TraitFactory {
-    private final List<TraitInfo> defaultTraits = Lists.newArrayList();
-    private final Map<String, TraitInfo> registered = Maps.newHashMap();
+    private final List<TraitInfo> defaultTraits = Lists.newCopyOnWriteArrayList();
+    private final Map<String, TraitInfo> registered = Maps.newConcurrentMap();
 
     public CitizensTraitFactory(Citizens plugin) {
         registerTrait(TraitInfo.create(Age.class));

main/src/main/java/net/citizensnpcs/npc/EntityController.java

@@ -15,4 +15,6 @@ public interface EntityController {
     void remove();
 
     boolean spawn(Location at);
+
+    void spawn(Location at, java.util.function.Consumer<Boolean> callback);
 }

main/src/main/java/net/citizensnpcs/npc/ai/CitizensNavigator.java

@@ -8,6 +8,7 @@
 import org.bukkit.Bukkit;
 import org.bukkit.Chunk;
 import org.bukkit.Location;
+import org.bukkit.World;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
@@ -534,14 +535,30 @@ private void updateTicket(Location target) {
 
         // switch ticket to the new chunk
         if (activeTicket != null) {
-            activeTicket.getChunk().removePluginChunkTicket(CitizensAPI.getPlugin());
+            final ChunkCoord tempTicket = activeTicket;
+            final World tempWorld = tempTicket.getWorld();
+            if (CitizensAPI.getScheduler().isOnOwnerThread(tempWorld, tempTicket.x, tempTicket.z)) {
+                tempTicket.getChunk().removePluginChunkTicket(CitizensAPI.getPlugin());
+            } else {
+                CitizensAPI.getScheduler().runRegionTask(tempWorld, tempTicket.x, tempTicket.z, () -> {
+                    tempTicket.getChunk().removePluginChunkTicket(CitizensAPI.getPlugin());
+                });
+            }
         }
         if (target == null) {
             activeTicket = null;
             return;
         }
         activeTicket = coord;
-        activeTicket.getChunk().addPluginChunkTicket(CitizensAPI.getPlugin());
+        final ChunkCoord tempTicket = activeTicket;
+        final World tempTicketWorld = tempTicket.getWorld();
+        if (CitizensAPI.getScheduler().isOnOwnerThread(tempTicketWorld, tempTicket.x, tempTicket.z)) {
+            tempTicket.getChunk().addPluginChunkTicket(CitizensAPI.getPlugin());
+        } else {
+            CitizensAPI.getScheduler().runRegionTask(tempTicketWorld, tempTicket.x, tempTicket.z, () -> {
+                tempTicket.getChunk().addPluginChunkTicket(CitizensAPI.getPlugin());
+            });
+        }
     }
 
     private static boolean SUPPORT_CHUNK_TICKETS = true;