[1.10.6-beta1]修复插件重载时,有概率堵塞网络的bug

YufiriaMazenta · Jul 27, 2024 · 6eb599a · 6eb599a
1 parent fd8cb2c
commit 6eb599a
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 28 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,5 +1,5 @@
 import java.text.SimpleDateFormat
-version = "1.10.6"
+version = "1.10.6-beta1"
 
 plugins {
     `java-library`

diff --git a/src/main/java/com/github/yufiriamazenta/craftorithm/menu/creator/RecipeCreator.java b/src/main/java/com/github/yufiriamazenta/craftorithm/menu/creator/RecipeCreator.java
@@ -9,11 +9,13 @@
 import com.github.yufiriamazenta.craftorithm.util.CollectionsUtil;
 import com.github.yufiriamazenta.craftorithm.util.ItemUtils;
 import com.github.yufiriamazenta.craftorithm.util.LangUtil;
+import crypticlib.CrypticLib;
 import crypticlib.config.ConfigWrapper;
 import crypticlib.ui.display.Icon;
 import crypticlib.ui.menu.StoredMenu;
 import crypticlib.util.FileUtil;
 import crypticlib.util.ItemUtil;
+import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.entity.Player;
@@ -112,6 +114,9 @@ public void regRecipeGroup(ConfigWrapper recipeConfig) {
         for (RecipeRegistry recipeRegistry : RecipeFactory.newRecipeRegistry(recipeConfig.config(), recipeName)) {
             recipeRegistry.register();
         }
+        if (CrypticLib.isPaper()) {
+            Bukkit.updateRecipes();
+        }
     }
 
 }
diff --git a/src/main/java/com/github/yufiriamazenta/craftorithm/recipe/RecipeManager.java b/src/main/java/com/github/yufiriamazenta/craftorithm/recipe/RecipeManager.java
@@ -11,7 +11,6 @@
 import com.github.yufiriamazenta.craftorithm.recipe.registry.RecipeRegistry;
 import com.github.yufiriamazenta.craftorithm.util.CollectionsUtil;
 import com.github.yufiriamazenta.craftorithm.util.LangUtil;
-import com.github.yufiriamazenta.craftorithm.util.RecipeUtil;
 import crypticlib.CrypticLib;
 import crypticlib.chat.MsgSender;
 import crypticlib.config.ConfigWrapper;
@@ -67,17 +66,17 @@ public enum RecipeManager {
         serverRecipesCache = new ConcurrentHashMap<>();
 
         //设置各类型配方的注册方法
-        recipeRegisterMap.put(RecipeType.SHAPED, RecipeUtil::regRecipe);
+        recipeRegisterMap.put(RecipeType.SHAPED, Bukkit::addRecipe);
         recipeRemoverMap.put(RecipeType.SHAPED, this::removeRecipes);
-        recipeRegisterMap.put(RecipeType.SHAPELESS, RecipeUtil::regRecipe);
+        recipeRegisterMap.put(RecipeType.SHAPELESS, Bukkit::addRecipe);
         recipeRemoverMap.put(RecipeType.SHAPELESS, this::removeRecipes);
-        recipeRegisterMap.put(RecipeType.COOKING, RecipeUtil::regRecipe);
+        recipeRegisterMap.put(RecipeType.COOKING, Bukkit::addRecipe);
         recipeRemoverMap.put(RecipeType.COOKING, this::removeRecipes);
-        recipeRegisterMap.put(RecipeType.STONE_CUTTING, RecipeUtil::regRecipe);
+        recipeRegisterMap.put(RecipeType.STONE_CUTTING, Bukkit::addRecipe);
         recipeRemoverMap.put(RecipeType.STONE_CUTTING, this::removeRecipes);
-        recipeRegisterMap.put(RecipeType.SMITHING, RecipeUtil::regRecipe);
+        recipeRegisterMap.put(RecipeType.SMITHING, Bukkit::addRecipe);
         recipeRemoverMap.put(RecipeType.SMITHING, this::removeRecipes);
-        recipeRegisterMap.put(RecipeType.RANDOM_COOKING, RecipeUtil::regRecipe);
+        recipeRegisterMap.put(RecipeType.RANDOM_COOKING, Bukkit::addRecipe);
         recipeRemoverMap.put(RecipeType.RANDOM_COOKING, this::removeRecipes);
 
         if (PluginConfigs.ENABLE_ANVIL_RECIPE.value()) {
@@ -118,6 +117,9 @@ private void loadRecipes() {
             Map<String, RecipeGroup> recipeGroupMap = pluginRecipeMapEntry.getValue();
             recipeGroupMap.forEach((recipeGroupName, recipeGroup) -> loadRecipeGroup(recipeGroup));
         }
+        if (CrypticLib.isPaper()) {
+            Bukkit.updateRecipes();
+        }
     }
 
     public void loadRecipeGroup(RecipeGroup recipeGroup) {

diff --git a/src/main/java/com/github/yufiriamazenta/craftorithm/util/RecipeUtil.java b/src/main/java/com/github/yufiriamazenta/craftorithm/util/RecipeUtil.java