From 5773ea83e58ed5e62cac4f227f0d5bd351f0fbaf Mon Sep 17 00:00:00 2001
From: Xiao-MoMi <70987828+Xiao-MoMi@users.noreply.github.com>
Date: Sat, 22 Oct 2022 10:08:29 +0800
Subject: [PATCH] 2.0.7

---
 .../customnameplates/CustomNameplates.java         |  1 -
 .../customnameplates/api/events/BubblesEvent.java  |  9 +++++++--
 .../customnameplates/data/DataManager.java         | 14 +-------------
 3 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/src/main/java/net/momirealms/customnameplates/CustomNameplates.java b/src/main/java/net/momirealms/customnameplates/CustomNameplates.java
index 350ab58..bb8d0ec 100644
--- a/src/main/java/net/momirealms/customnameplates/CustomNameplates.java
+++ b/src/main/java/net/momirealms/customnameplates/CustomNameplates.java
@@ -110,7 +110,6 @@ public final class CustomNameplates extends JavaPlugin {
     @Override
     public void onDisable() {
         if (ConfigManager.Module.nameplate){
-            SqlHandler.saveAll();
             SqlHandler.close();
             if (!ConfigManager.Nameplate.fakeTeam && !ConfigManager.Main.tab && !ConfigManager.Main.tab_bc) {
                 for (Team team : Bukkit.getScoreboardManager().getMainScoreboard().getTeams()) {
diff --git a/src/main/java/net/momirealms/customnameplates/api/events/BubblesEvent.java b/src/main/java/net/momirealms/customnameplates/api/events/BubblesEvent.java
index 3b3f996..4c3fad2 100644
--- a/src/main/java/net/momirealms/customnameplates/api/events/BubblesEvent.java
+++ b/src/main/java/net/momirealms/customnameplates/api/events/BubblesEvent.java
@@ -30,11 +30,16 @@ public class BubblesEvent extends PlayerEvent implements Cancellable {
         cancelled = cancel;
     }
 
-    @Override
-    public @NotNull HandlerList getHandlers() {
+    public static HandlerList getHandlerList() {
         return handlerList;
     }
 
+    @NotNull
+    @Override
+    public HandlerList getHandlers() {
+        return getHandlerList();
+    }
+
     public String getBubble() {
         return bubble;
     }
diff --git a/src/main/java/net/momirealms/customnameplates/data/DataManager.java b/src/main/java/net/momirealms/customnameplates/data/DataManager.java
index 15faf5a..5ccfa29 100644
--- a/src/main/java/net/momirealms/customnameplates/data/DataManager.java
+++ b/src/main/java/net/momirealms/customnameplates/data/DataManager.java
@@ -70,19 +70,7 @@ public class DataManager {
     }
 
     public void unloadPlayer(UUID uuid) {
-        if (!cache.containsKey(uuid)) {
-            return;
-        }
-        if (ConfigManager.Database.async){
-            Bukkit.getScheduler().runTaskAsynchronously(CustomNameplates.instance, ()-> {
-                SqlHandler.save(cache.get(uuid), uuid);
-                cache.remove(uuid);
-            });
-        }
-        else {
-            SqlHandler.save(cache.get(uuid), uuid);
-            cache.remove(uuid);
-        }
+        cache.remove(uuid);
     }
 
     public void savePlayer(UUID uuid) {