diff --git a/src/main/java/net/momirealms/customcrops/datamanager/ConfigManager.java b/src/main/java/net/momirealms/customcrops/datamanager/ConfigManager.java index 5892707..9d8254c 100644 --- a/src/main/java/net/momirealms/customcrops/datamanager/ConfigManager.java +++ b/src/main/java/net/momirealms/customcrops/datamanager/ConfigManager.java @@ -8,6 +8,7 @@ import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.YamlConfiguration; import java.io.File; +import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Set; @@ -81,7 +82,6 @@ public class ConfigManager { CustomCrops.instance.saveDefaultConfig(); CustomCrops.instance.reloadConfig(); FileConfiguration configuration = CustomCrops.instance.getConfig(); - cropLoad(); //处理配置 Config.res = configuration.getBoolean("config.integration.residence",false); Config.king = configuration.getBoolean("config.integration.kingdomsX",false); @@ -174,6 +174,8 @@ public class ConfigManager { Config.summer = configuration.getString("messages.summer"); Config.autumn = configuration.getString("messages.autumn"); Config.winter = configuration.getString("messages.winter"); + + cropLoad(); } /* diff --git a/src/main/java/net/momirealms/customcrops/utils/IAFurniture.java b/src/main/java/net/momirealms/customcrops/utils/IAFurniture.java index 911affa..dfe13e2 100644 --- a/src/main/java/net/momirealms/customcrops/utils/IAFurniture.java +++ b/src/main/java/net/momirealms/customcrops/utils/IAFurniture.java @@ -18,8 +18,8 @@ public class IAFurniture { public static boolean getFromLocation(Location location, World world){ for(Entity entity : world.getNearbyEntities(location,0,0,0)){ if(entity instanceof ArmorStand){ - if(CustomFurniture.byAlreadySpawned((ArmorStand) entity) != null){ - if(CustomFurniture.byAlreadySpawned((ArmorStand) entity).getNamespacedID().equalsIgnoreCase(ConfigManager.Config.sprinkler_1) || CustomFurniture.byAlreadySpawned((ArmorStand) entity).getNamespacedID().equalsIgnoreCase(ConfigManager.Config.sprinkler_2)){ + if(CustomFurniture.byAlreadySpawned(entity) != null){ + if(CustomFurniture.byAlreadySpawned(entity).getNamespacedID().equalsIgnoreCase(ConfigManager.Config.sprinkler_1) || CustomFurniture.byAlreadySpawned(entity).getNamespacedID().equalsIgnoreCase(ConfigManager.Config.sprinkler_2)){ return true; } } diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 2a844a5..5de88c6 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -111,5 +111,4 @@ messages: spring: '&f春' summer: '&f夏' autumn: '&f秋' - winter: '&f冬' - noperm: '&f权限不足.' + winter: '&f冬' \ No newline at end of file diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index d98d822..142b7fe 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,5 +1,5 @@ name: CustomCrops -version: '1.4.7' +version: '1.4.8' main: net.momirealms.customcrops.CustomCrops api-version: 1.16 depend: