From ed40763dc244018a877e25d8cf9e4349eb62134d Mon Sep 17 00:00:00 2001
From: YufiriaMazenta <linjiayi357159@gmail.com>
Date: Sat, 26 Oct 2024 10:43:49 +0800
Subject: [PATCH] =?UTF-8?q?[1.10.12-beta1]=E6=9B=B4=E6=94=B9=E6=8F=92?=
 =?UTF-8?q?=E4=BB=B6=E5=8A=A0=E8=BD=BD=E6=B5=81=E7=A8=8B,=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8DItemsAdder4=E5=AD=98=E5=9C=A8=E6=97=B6=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E6=AD=A3=E7=A1=AE=E5=8A=A0=E8=BD=BD=E9=85=8D=E6=96=B9?=
 =?UTF-8?q?=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle.kts                              |  2 +-
 .../craftorithm/Craftorithm.java              | 24 +++++++++----------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index a7e4d66c..442cc53e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,5 +1,5 @@
 import java.text.SimpleDateFormat
-version = "1.10.11"
+version = "1.10.12-beta1"
 
 plugins {
     `java-library`
diff --git a/src/main/java/com/github/yufiriamazenta/craftorithm/Craftorithm.java b/src/main/java/com/github/yufiriamazenta/craftorithm/Craftorithm.java
index 6e871591..ba770848 100644
--- a/src/main/java/com/github/yufiriamazenta/craftorithm/Craftorithm.java
+++ b/src/main/java/com/github/yufiriamazenta/craftorithm/Craftorithm.java
@@ -36,14 +36,21 @@ public void enable() {
             throw new UnsupportedVersionException();
         }
         CrypticLib.setDebug(PluginConfigs.DEBUG.value());
+        PluginHookUtil.hookPlugins();
+
+        if (PluginHookUtil.isItemsAdderLoaded()) {
+            Bukkit.getPluginManager().registerEvents(ItemsAdderHandler.INSTANCE, this);
+        } else {
+            Bukkit.getPluginManager().registerEvents(this, this);
+        }
+
         ItemManager.INSTANCE.loadItemManager();
-        regListeners();
         initArcenciel();
         loadBStat();
 
         Bukkit.getPluginManager().registerEvents(OtherPluginsListenerProxy.INSTANCE, this);
-        PluginHookUtil.hookPlugins();
         LangUtil.info(Languages.LOAD_FINISH);
+        UpdateUtil.pullUpdateCheckRequest(Bukkit.getConsoleSender());
     }
 
     @Override
@@ -58,10 +65,6 @@ private void loadBStat() {
         metrics.addCustomChart(new Metrics.SingleLineChart("recipes", () -> RecipeManager.INSTANCE.getRecipeGroups().size()));
     }
 
-    private void regListeners() {
-        Bukkit.getPluginManager().registerEvents(this, this);
-    }
-
     private void initArcenciel() {
         ArcencielDispatcher.INSTANCE.loadFuncFile();
     }
@@ -83,12 +86,7 @@ public void onPlayerJoin(PlayerJoinEvent event) {
 
     @EventHandler
     public void onServerLoad(ServerLoadEvent event) {
-        if (!PluginHookUtil.isItemsAdderLoaded()) {
-            RecipeManager.INSTANCE.reloadRecipeManager();
-            OtherPluginsListenerProxy.INSTANCE.reloadOtherPluginsListener();
-            return;
-        }
-        Bukkit.getPluginManager().registerEvents(ItemsAdderHandler.INSTANCE, this);
-        UpdateUtil.pullUpdateCheckRequest(Bukkit.getConsoleSender());
+        RecipeManager.INSTANCE.reloadRecipeManager();
+        OtherPluginsListenerProxy.INSTANCE.reloadOtherPluginsListener();
     }
 }