Repo-Mirror/Custom-Crops
9
0
Fork 0
mirror of https://github.com/Xiao-MoMi/Custom-Crops.git synced 2025-12-22 16:39:36 +00:00
Code Issues Releases Activity

1.4.8

Browse Source
This commit is contained in:
Xiao-MoMi
2022-06-28 13:20:03 +08:00
parent df0020ace1
commit f1a2bd6d1c
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/net/momirealms/customcrops/datamanager/ConfigManager.java
View File

@@ -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();
}
/*

4
src/main/java/net/momirealms/customcrops/utils/IAFurniture.java
View File

@@ -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;
}
}