diff --git a/src/main/java/net/momirealms/customcrops/CommandHandler.java b/src/main/java/net/momirealms/customcrops/CommandHandler.java index c41ed14..17dc1bb 100644 --- a/src/main/java/net/momirealms/customcrops/CommandHandler.java +++ b/src/main/java/net/momirealms/customcrops/CommandHandler.java @@ -3,7 +3,6 @@ package net.momirealms.customcrops; import net.momirealms.customcrops.DataManager.BackUp; import net.momirealms.customcrops.DataManager.CropManager; import net.momirealms.customcrops.DataManager.SprinklerManager; -import net.momirealms.customcrops.Integrations.KingdomsXIntegrations; import org.bukkit.Bukkit; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; diff --git a/src/main/java/net/momirealms/customcrops/listener/RightClickBlock.java b/src/main/java/net/momirealms/customcrops/listener/RightClickBlock.java index ceefe96..001f3e7 100644 --- a/src/main/java/net/momirealms/customcrops/listener/RightClickBlock.java +++ b/src/main/java/net/momirealms/customcrops/listener/RightClickBlock.java @@ -54,30 +54,28 @@ public class RightClickBlock implements Listener { if(event.getAction() != Action.RIGHT_CLICK_BLOCK) return; if(event.getBlockFace() != BlockFace.UP) return; - FileConfiguration config = CustomCrops.instance.getConfig(); Location location = event.getClickedBlock().getLocation(); - //res兼容 - if(config.getBoolean("config.integration.residence")){ - if(ResidenceIntegrations.checkResBuild(location,player)){ - return; - } - } - //wg兼容 - if(config.getBoolean("config.integration.worldguard")){ - if(WorldGuardIntegrations.checkWGBuild(location,player)){ - return; - } - } - //kingdomsX兼容 - if(config.getBoolean("config.integration.kingdomsX")){ - if(KingdomsXIntegrations.checkKDBuild(location,player)){ - return; - } - } - //是否过高过低 if(CustomStack.byItemStack(event.getItem()).getNamespacedID().equalsIgnoreCase(config.getString("config.sprinkler-1-item"))){ + //res兼容 + if(config.getBoolean("config.integration.residence")){ + if(ResidenceIntegrations.checkResBuild(location,player)){ + return; + } + } + //wg兼容 + if(config.getBoolean("config.integration.worldguard")){ + if(WorldGuardIntegrations.checkWGBuild(location,player)){ + return; + } + } + //kingdomsX兼容 + if(config.getBoolean("config.integration.kingdomsX")){ + if(KingdomsXIntegrations.checkKDBuild(location,player)){ + return; + } + } if(event.getClickedBlock().getY() > config.getInt("config.height.max") || event.getClickedBlock().getY() < config.getInt("config.height.min")){ MessageManager.playerMessage(config.getString("messages.prefix") + config.getString("messages.not-a-good-place"),player); return; @@ -93,6 +91,24 @@ public class RightClickBlock implements Listener { IAFurniture.placeFurniture(config.getString("config.sprinkler-1"),location.clone().add(0,1,0)); SprinklerManager.putInstance(location.clone().add(0,1,0),"s1"); }else if(CustomStack.byItemStack(event.getItem()).getNamespacedID().equalsIgnoreCase(config.getString("config.sprinkler-2-item"))){ + //res兼容 + if(config.getBoolean("config.integration.residence")){ + if(ResidenceIntegrations.checkResBuild(location,player)){ + return; + } + } + //wg兼容 + if(config.getBoolean("config.integration.worldguard")){ + if(WorldGuardIntegrations.checkWGBuild(location,player)){ + return; + } + } + //kingdomsX兼容 + if(config.getBoolean("config.integration.kingdomsX")){ + if(KingdomsXIntegrations.checkKDBuild(location,player)){ + return; + } + } if(event.getClickedBlock().getY() > config.getInt("config.height.max") || event.getClickedBlock().getY() < config.getInt("config.height.min")){ MessageManager.playerMessage(config.getString("messages.prefix") + config.getString("messages.not-a-good-place"),player); return;