From 94028484cf16ec7aab977892397af28564462b26 Mon Sep 17 00:00:00 2001
From: HaHaWTH <id_cn00@outlook.com>
Date: Sat, 14 Oct 2023 19:15:49 +0800
Subject: [PATCH] Revert changes

---
 .../xephi/authme/events/GUICaptchaEvent.java  | 38 -------------------
 .../authme/listener/GuiCaptchaHandler.java    |  5 ---
 .../listener/LoginLocationFixListener.java    |  3 --
 3 files changed, 46 deletions(-)
 delete mode 100644 src/main/java/fr/xephi/authme/events/GUICaptchaEvent.java

diff --git a/src/main/java/fr/xephi/authme/events/GUICaptchaEvent.java b/src/main/java/fr/xephi/authme/events/GUICaptchaEvent.java
deleted file mode 100644
index 0b0f3d1c..00000000
--- a/src/main/java/fr/xephi/authme/events/GUICaptchaEvent.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package fr.xephi.authme.events;
-
-import org.bukkit.entity.Player;
-import org.bukkit.event.Event;
-import org.bukkit.event.HandlerList;
-import org.jetbrains.annotations.NotNull;
-
-import static fr.xephi.authme.listener.GuiCaptchaHandler.closeReasonMap;
-
-public class GUICaptchaEvent extends Event {
-    private static final HandlerList handlers = new HandlerList();
-
-    private final Player player;
-
-    public GUICaptchaEvent(Player player) {
-        this.player = player;
-    }
-
-    public Player getPlayer() {
-        return player;
-    }
-
-    public boolean isCaptchaVerified(Player player){
-        return closeReasonMap.containsKey(player);
-
-    }
-
-    public static HandlerList getHandlerList() {
-        return handlers;
-    }
-
-    @Override
-    public @NotNull HandlerList getHandlers() {
-        return handlers;
-    }
-
-
-}
diff --git a/src/main/java/fr/xephi/authme/listener/GuiCaptchaHandler.java b/src/main/java/fr/xephi/authme/listener/GuiCaptchaHandler.java
index a27499c7..de8e27dd 100644
--- a/src/main/java/fr/xephi/authme/listener/GuiCaptchaHandler.java
+++ b/src/main/java/fr/xephi/authme/listener/GuiCaptchaHandler.java
@@ -6,7 +6,6 @@ import com.comphenix.protocol.events.PacketAdapter;
 import com.comphenix.protocol.events.PacketEvent;
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.api.v3.AuthMeApi;
-import fr.xephi.authme.events.GUICaptchaEvent;
 import fr.xephi.authme.settings.properties.HooksSettings;
 import fr.xephi.authme.settings.properties.RestrictionSettings;
 import fr.xephi.authme.settings.properties.SecuritySettings;
@@ -24,7 +23,6 @@ import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.plugin.Plugin;
 import java.io.File;
-import java.util.Objects;
 import java.util.Random;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
@@ -65,7 +63,6 @@ public class GuiCaptchaHandler implements Listener{
                 if (AuthMe.settings.getProperty(HooksSettings.HOOK_FLOODGATE_PLAYER) && AuthMe.settings.getProperty(SecuritySettings.GUI_CAPTCHA_BE_COMPATIBILITY) && org.geysermc.floodgate.api.FloodgateApi.getInstance().isFloodgateId(event.getWhoClicked().getUniqueId()) && (getServer().getPluginManager().isPluginEnabled("floodgate") || getServer().getPluginManager().getPlugin("floodgate") != null)) {
                     if (!closeReasonMap.containsKey(player)) {
                         closeReasonMap.put(player,"verified");
-                        Bukkit.getPluginManager().callEvent(new GUICaptchaEvent(player));
                         return;
                     }
                     return;
@@ -73,7 +70,6 @@ public class GuiCaptchaHandler implements Listener{
                 if (currentItem != null && currentItem.getType().equals(Material.REDSTONE_BLOCK)){
                     event.setCancelled(true);
                     closeReasonMap.put(player, "verified");
-                    Bukkit.getPluginManager().callEvent(new GUICaptchaEvent(player));
                     player.closeInventory();
                     player.sendMessage("§a验证完成");
                 } else {
@@ -94,7 +90,6 @@ public class GuiCaptchaHandler implements Listener{
         if (!authmeApi.isRegistered(name)) {
             if (AuthMe.settings.getProperty(HooksSettings.HOOK_FLOODGATE_PLAYER) && AuthMe.settings.getProperty(SecuritySettings.GUI_CAPTCHA_BE_COMPATIBILITY) && org.geysermc.floodgate.api.FloodgateApi.getInstance().isFloodgateId(event.getPlayer().getUniqueId()) && (getServer().getPluginManager().isPluginEnabled("floodgate") || getServer().getPluginManager().getPlugin("floodgate") != null)) {
                 closeReasonMap.put(playerunreg, "verified");
-                Bukkit.getPluginManager().callEvent(new GUICaptchaEvent(playerunreg));
                 playerunreg.sendMessage("§a基岩版自动验证完成");
                 return;
             }
diff --git a/src/main/java/fr/xephi/authme/listener/LoginLocationFixListener.java b/src/main/java/fr/xephi/authme/listener/LoginLocationFixListener.java
index 02d0deb6..75915919 100644
--- a/src/main/java/fr/xephi/authme/listener/LoginLocationFixListener.java
+++ b/src/main/java/fr/xephi/authme/listener/LoginLocationFixListener.java
@@ -1,10 +1,7 @@
 package fr.xephi.authme.listener;
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.api.v3.AuthMeApi;
-import fr.xephi.authme.events.GUICaptchaEvent;
-import fr.xephi.authme.events.LoginEvent;
 import fr.xephi.authme.settings.properties.SecuritySettings;
-import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.World;