From 9f4a2ff7ce070693ea0cda8eec3514e4ca4b6db5 Mon Sep 17 00:00:00 2001 From: phobia Date: Sun, 3 Apr 2016 13:31:13 +1000 Subject: [PATCH] - Shift clicking TNT into the cannon does not work - /c map doesn't work in tutorial (could just remove /c map completely) --- .../mineplex/game/clans/clans/commands/ClansCommand.java | 5 ----- .../mineplex/game/clans/clans/siege/outpost/Outpost.java | 4 ++-- .../game/clans/clans/siege/outpost/OutpostManager.java | 2 +- .../mineplex/game/clans/clans/siege/weapon/Cannon.java | 8 +++++++- .../clans/objective/goals/clan/ClaimLandGoal.java | 3 ++- .../clans/objective/goals/clan/ClanManagementGoal.java | 2 +- 6 files changed, 13 insertions(+), 11 deletions(-) diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java index c652fd613..7d063af44 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java @@ -109,10 +109,6 @@ public class ClansCommand extends CommandBase else if (args[0].equalsIgnoreCase("unclaim") || args[0].equalsIgnoreCase("uc")) unclaim(caller, args); - - else if (args[0].equalsIgnoreCase("map") || args[0].equalsIgnoreCase("m")) - map(caller, args); - else if (args[0].equalsIgnoreCase("home") || args[0].equalsIgnoreCase("h")) home(caller, args); @@ -223,7 +219,6 @@ public class ClansCommand extends CommandBase UtilPlayer.message(caller, F.help("/c create ", "Create new Clan", Rank.ALL)); UtilPlayer.message(caller, F.help("/c join ", "Join a Clan", Rank.ALL)); UtilPlayer.message(caller, F.help("/c leave ", "Leave your Clan", Rank.ALL)); - UtilPlayer.message(caller, F.help("/c map ", "View Clan Map", Rank.ALL)); UtilPlayer.message(caller, F.help("/cc (Message)", "Clan Chat (Toggle)", Rank.ALL)); UtilPlayer.message(caller, F.help("/c stuck", "Teleports you to the nearest Wilderness location", Rank.ALL)); diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/outpost/Outpost.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/outpost/Outpost.java index 552ba15b8..3648885b9 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/outpost/Outpost.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/outpost/Outpost.java @@ -269,7 +269,7 @@ public class Outpost implements Listener if(_outpostManager.getClansManager().hasTimer(event.getPlayer())) { - UtilPlayer.message(event.getPlayer(), F.main("Clans", "You cannot activate an Outpost whilst protected from pvp.")); + UtilPlayer.message(event.getPlayer(), F.main("Clans", "You cannot activate an Outpost whilst protected from PvP.")); return; } @@ -297,7 +297,7 @@ public class Outpost implements Listener if(_outpostManager.getClansManager().hasTimer(event.getPlayer())) { - UtilPlayer.message(event.getPlayer(), F.main("Clans", "You cannot destroy an Outpost whilst on protected from pvp.")); + UtilPlayer.message(event.getPlayer(), F.main("Clans", "You cannot destroy an Outpost whilst protected from PvP.")); event.setCancelled(true); return; } diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/outpost/OutpostManager.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/outpost/OutpostManager.java index 60ed47729..a07132125 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/outpost/OutpostManager.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/outpost/OutpostManager.java @@ -85,7 +85,7 @@ public class OutpostManager extends MiniPlugin if(_clansManager.hasTimer(player)) { - UtilPlayer.message(player, F.main("Clans", "You place an Outpost whilst protected from pvp.")); + UtilPlayer.message(player, F.main("Clans", "You can't place an Outpost whilst protected from PvP.")); return false; } diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/weapon/Cannon.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/weapon/Cannon.java index bff70a1f6..06c8d06cb 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/weapon/Cannon.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/weapon/Cannon.java @@ -12,6 +12,7 @@ import org.bukkit.entity.ArmorStand; import org.bukkit.entity.Player; import org.bukkit.entity.Slime; import org.bukkit.event.EventHandler; +import org.bukkit.event.inventory.ClickType; import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.event.inventory.InventoryType; import org.bukkit.inventory.ItemStack; @@ -218,7 +219,12 @@ public class Cannon extends SiegeWeapon { return; } - + + if (event.getClick() == ClickType.SHIFT_RIGHT) + { + return; + } + if (!event.getClickedInventory().equals(_inventory)) { return; diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/ClaimLandGoal.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/ClaimLandGoal.java index ca71fc0fd..bd67fd908 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/ClaimLandGoal.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/ClaimLandGoal.java @@ -28,7 +28,8 @@ public class ClaimLandGoal extends ObjectiveGoal "Claim Land", "Claim Land using the Clan Menu ( Type /c )", "The first thing your Clan needs to do before you can start to " + - "build your fortress is claim the land in an area for your Clan.", + "build your fortress is claim the land in an area for your Clan. " + + "You must be inside the blue box to claim land.", DyeColor.ORANGE ); } diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/ClanManagementGoal.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/ClanManagementGoal.java index 7a1b4407a..628cab02e 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/ClanManagementGoal.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/ClanManagementGoal.java @@ -23,7 +23,7 @@ public class ClanManagementGoal extends ObjectiveGoal objective, "Open the Clan Menu", "Open the Clan Menu ( Type /c )", - "Clan Menu lets you view all clan information and perform actions: " + + "Clan Menu lets you view all clan information and perform actions such as: " + "who is online, Claiming Land, Inviting Players and much more.", null );