JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Shift clicking TNT into the cannon does not work

Browse Source 
- /c map doesn't work in tutorial (could just remove /c map completely)
This commit is contained in:
phobia 2016-04-03 13:31:13 +10:00
parent 664d8b1a4e
commit 9f4a2ff7ce
6 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java
View File

@ -109,10 +109,6 @@ public class ClansCommand extends CommandBase<ClansManager>
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<ClansManager>
UtilPlayer.message(caller, F.help("/c create <clan>", "Create new Clan", Rank.ALL));
UtilPlayer.message(caller, F.help("/c join <clan>", "Join a Clan", Rank.ALL));
UtilPlayer.message(caller, F.help("/c leave <clan>", "Leave your Clan", Rank.ALL));
UtilPlayer.message(caller, F.help("/c map <toggle>", "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));

4
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/outpost/Outpost.java
View File

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

2
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/outpost/OutpostManager.java
View File

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

6
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/weapon/Cannon.java
View File

@ -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;
@ -219,6 +220,11 @@ public class Cannon extends SiegeWeapon
return;
}
if (event.getClick() == ClickType.SHIFT_RIGHT)
{
return;
}
if (!event.getClickedInventory().equals(_inventory))
{
return;

3
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/ClaimLandGoal.java
View File

@ -28,7 +28,8 @@ public class ClaimLandGoal extends ObjectiveGoal<ClanObjective>
"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
);
}

2
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/ClanManagementGoal.java
View File

@ -23,7 +23,7 @@ public class ClanManagementGoal extends ObjectiveGoal<ClanObjective>
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
);