From 345c8db233215cf46bd71b2ac5ff05bd6e078fdb Mon Sep 17 00:00:00 2001
From: sky <sky@asgard.me>
Date: Tue, 17 Mar 2020 00:03:29 +0800
Subject: [PATCH] Fix Hologram & TFunction Injector

---
 src/main/scala/io/izzel/taboolib/PluginLoader.java         | 4 ++--
 .../izzel/taboolib/module/hologram/THologramHandler.java   | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/main/scala/io/izzel/taboolib/PluginLoader.java b/src/main/scala/io/izzel/taboolib/PluginLoader.java
index 201c938..45ba37c 100644
--- a/src/main/scala/io/izzel/taboolib/PluginLoader.java
+++ b/src/main/scala/io/izzel/taboolib/PluginLoader.java
@@ -70,10 +70,10 @@ public abstract class PluginLoader {
                 // 保存数据
                 Local.saveFiles(plugin.getName());
                 Local.clearFiles(plugin.getName());
-                // 注销监听器
-                TListenerHandler.cancelListener(plugin);
                 // 注销插件类
                 TabooLibLoader.unloadClass(plugin, TabooLibLoader.getPluginClassSafely(plugin));
+                // 注销监听器
+                TListenerHandler.cancelListener(plugin);
                 // 释放文检读取
                 Optional.ofNullable(TConfig.getFiles().remove(plugin.getName())).ifPresent(files -> files.forEach(file -> TConfigWatcher.getInst().removeListener(file)));
                 // 注销数据库连接
diff --git a/src/main/scala/io/izzel/taboolib/module/hologram/THologramHandler.java b/src/main/scala/io/izzel/taboolib/module/hologram/THologramHandler.java
index d50d562..ab265c2 100644
--- a/src/main/scala/io/izzel/taboolib/module/hologram/THologramHandler.java
+++ b/src/main/scala/io/izzel/taboolib/module/hologram/THologramHandler.java
@@ -5,6 +5,7 @@ import com.google.common.collect.Queues;
 import io.izzel.taboolib.TabooLib;
 import io.izzel.taboolib.Version;
 import io.izzel.taboolib.module.inject.TListener;
+import io.izzel.taboolib.module.inject.TSchedule;
 import io.izzel.taboolib.module.lite.SimpleReflection;
 import io.izzel.taboolib.module.nms.NMS;
 import io.izzel.taboolib.module.packet.Packet;
@@ -210,11 +211,9 @@ class THologramHandler implements Listener {
         THologram.refresh(e.getPlayer());
     }
 
-    @EventHandler
+    @TSchedule(period = 200, async = true)
     public void e(PlayerMoveEvent e) {
-        if (!e.getFrom().getBlock().equals(e.getTo().getBlock())) {
-            Bukkit.getScheduler().runTaskAsynchronously(TabooLib.getPlugin(), () -> THologram.refresh(e.getPlayer()));
-        }
+        Bukkit.getOnlinePlayers().forEach(THologram::refresh);
     }
 
     // *********************************