From da2caa74374bce5ad81fce53976116e8ccb75229 Mon Sep 17 00:00:00 2001 From: SubtypeZero Date: Fri, 13 Oct 2017 14:57:27 -0500 Subject: [PATCH 1/2] Remove Island Home help text if home integration is disabled --- .../java/net/mohron/skyclaims/command/CommandIsland.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/mohron/skyclaims/command/CommandIsland.java b/src/main/java/net/mohron/skyclaims/command/CommandIsland.java index 4f193cac..d67d3c20 100644 --- a/src/main/java/net/mohron/skyclaims/command/CommandIsland.java +++ b/src/main/java/net/mohron/skyclaims/command/CommandIsland.java @@ -24,6 +24,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import com.google.common.collect.Maps; +import io.github.nucleuspowered.nucleus.api.NucleusAPI; import net.mohron.skyclaims.PluginInfo; import net.mohron.skyclaims.command.team.CommandDemote; import net.mohron.skyclaims.command.team.CommandInvite; @@ -160,7 +161,9 @@ public CommandResult execute(CommandSource src, CommandContext args) throws Comm )); } - if (src.hasPermission(Permissions.COMMAND_HOME)) { + if (src.hasPermission(Permissions.COMMAND_HOME) + && PLUGIN.getConfig().getIntegrationConfig().getNucleus().isHomesEnabled() + && NucleusAPI.getHomeService().isPresent()) { helpText.add(Text.of( TextColors.AQUA, Text.builder("is home").onClick(TextActions.runCommand("/is home")), TextColors.DARK_GRAY, " - ", From 5d8bc234ce5c2d8d04ca214bbfc010335fc5e3e9 Mon Sep 17 00:00:00 2001 From: SubtypeZero Date: Fri, 13 Oct 2017 14:57:27 -0500 Subject: [PATCH 2/2] Remove Island Home help text if home integration is disabled --- .../java/net/mohron/skyclaims/command/CommandIsland.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/mohron/skyclaims/command/CommandIsland.java b/src/main/java/net/mohron/skyclaims/command/CommandIsland.java index 4f193cac..d67d3c20 100644 --- a/src/main/java/net/mohron/skyclaims/command/CommandIsland.java +++ b/src/main/java/net/mohron/skyclaims/command/CommandIsland.java @@ -24,6 +24,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import com.google.common.collect.Maps; +import io.github.nucleuspowered.nucleus.api.NucleusAPI; import net.mohron.skyclaims.PluginInfo; import net.mohron.skyclaims.command.team.CommandDemote; import net.mohron.skyclaims.command.team.CommandInvite; @@ -160,7 +161,9 @@ public CommandResult execute(CommandSource src, CommandContext args) throws Comm )); } - if (src.hasPermission(Permissions.COMMAND_HOME)) { + if (src.hasPermission(Permissions.COMMAND_HOME) + && PLUGIN.getConfig().getIntegrationConfig().getNucleus().isHomesEnabled() + && NucleusAPI.getHomeService().isPresent()) { helpText.add(Text.of( TextColors.AQUA, Text.builder("is home").onClick(TextActions.runCommand("/is home")), TextColors.DARK_GRAY, " - ",