From 01df9b7e443eaa869d447f0bc526721326cff9ee Mon Sep 17 00:00:00 2001 From: AlexTheCoder Date: Thu, 15 Jun 2017 23:07:21 -0400 Subject: [PATCH] Prevent claiming via gui in nether or raid worlds --- .../clans/gui/button/ClanTerritoryButton.java | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/gui/button/ClanTerritoryButton.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/gui/button/ClanTerritoryButton.java index 363c78f01..ebcff0611 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/gui/button/ClanTerritoryButton.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/gui/button/ClanTerritoryButton.java @@ -9,6 +9,7 @@ import org.bukkit.event.inventory.ClickType; import mineplex.core.common.util.C; import mineplex.core.common.util.F; +import mineplex.core.common.util.UtilPlayer; import mineplex.core.common.util.UtilWorld; import mineplex.game.clans.clans.ClanInfo; import mineplex.game.clans.clans.ClanRole; @@ -27,12 +28,18 @@ public class ClanTerritoryButton extends ClanButton { if (UtilServer.CallEvent(new ClansButtonClickEvent(player, ClansButtonClickEvent.ButtonType.Territory)).isCancelled()) return; -// if (_clansManager.getNetherManager().isInNether(player)) -// { -// _clansManager.message(player, "You are not allowed to do anything with Territory while in " + F.clansNether("The Nether") + "."); -// player.closeInventory(); -// return; -// } + if (_clansManager.getNetherManager().isInNether(player)) + { + UtilPlayer.message(player, F.main(_clansManager.getNetherManager().getName(), "You cannot manage your clan's territory while in " + F.clansNether("The Nether") + "!")); + player.closeInventory(); + return; + } + if (_clansManager.getWorldEvent().getRaidManager().isInRaid(player.getLocation())) + { + UtilPlayer.message(player, F.main(_clansManager.getWorldEvent().getRaidManager().getName(), "You cannot manage your clan's territory while in a raid!")); + player.closeInventory(); + return; + } if (clickType == ClickType.LEFT) {