From 70aa5d63fdaae8133dcbbad8d771ccb9c838a609 Mon Sep 17 00:00:00 2001 From: Ben Date: Wed, 9 Mar 2016 13:10:39 +0000 Subject: [PATCH] touched up on some messages --- .../game/clans/clans/siege/SiegeManager.java | 10 ++++++---- .../clans/clans/siege/outpost/Outpost.java | 10 ++++++---- .../clans/siege/outpost/OutpostManager.java | 7 +++---- .../game/clans/clans/siege/weapon/Cannon.java | 20 ++++++++++--------- 4 files changed, 26 insertions(+), 21 deletions(-) diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/SiegeManager.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/SiegeManager.java index a07b258dd..ba9c80641 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/SiegeManager.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/SiegeManager.java @@ -184,8 +184,9 @@ public class SiegeManager extends MiniPlugin return false; } - if(_clansManager.getPvpTimer().hasTimer(player)) { - UtilPlayer.message(player, F.main("Clans", "You cannot place a cannon whilst on PvPTimer")); + if(_clansManager.getPvpTimer().hasTimer(player)) + { + UtilPlayer.message(player, F.main("Clans", "You cannot place a Cannon whilst protected from pvp.")); return false; } @@ -224,8 +225,9 @@ public class SiegeManager extends MiniPlugin return false; } - if(_clansManager.getPvpTimer().hasTimer(player)) { - UtilPlayer.message(player, F.main("Clans", "You cannot place a catapult whilst on PvPTimer")); + if(_clansManager.getPvpTimer().hasTimer(player)) + { + UtilPlayer.message(player, F.main("Clans", "You cannot place a Catapult whilst protected from pvp.")); return false; } 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 ec311ae76..9b46e54d9 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 @@ -306,8 +306,9 @@ public class Outpost implements Listener return; - if(_outpostManager.getClansManager().getPvpTimer().hasTimer(event.getPlayer())) { - UtilPlayer.message(event.getPlayer(), F.main("Clans", "You cannot activate an outpost whilst on PvPTimer")); + if(_outpostManager.getClansManager().getPvpTimer().hasTimer(event.getPlayer())) + { + UtilPlayer.message(event.getPlayer(), F.main("Clans", "You cannot activate an Outpost whilst on protected from pvp.")); return; } @@ -333,8 +334,9 @@ public class Outpost implements Listener if (event.getBlock().getLocation().equals(_core) && getState() == OutpostState.LIVE) { - if(_outpostManager.getClansManager().getPvpTimer().hasTimer(event.getPlayer())) { - UtilPlayer.message(event.getPlayer(), F.main("Clans", "You cannot destroy an outpost whilst on PvPTimer")); + if(_outpostManager.getClansManager().getPvpTimer().hasTimer(event.getPlayer())) + { + UtilPlayer.message(event.getPlayer(), F.main("Clans", "You cannot destroy an Outpost whilst on 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 a507dba26..824937b3a 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,8 +85,9 @@ public class OutpostManager extends MiniPlugin return false; } - if(_clansManager.getPvpTimer().hasTimer(player)) { - UtilPlayer.message(player, F.main("Clans", "You cannot create an outpost whilst on PvPTimer")); + if(_clansManager.getPvpTimer().hasTimer(player)) + { + UtilPlayer.message(player, F.main("Clans", "You place an Outpost whilst protected from pvp.")); return false; } @@ -96,8 +97,6 @@ public class OutpostManager extends MiniPlugin return false; } - - ClanInfo clan = _clansManager.getClan(player); if (UtilItem.isBoundless(location.clone().subtract(0, 1, 0).getBlock().getType())) 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 3770088f8..ae948472d 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 @@ -99,7 +99,7 @@ public class Cannon extends SiegeWeapon setRideable(new AccessRule(AccessType.RCLICK_BB, player -> { if (!_ownerClan.isMember(player)) { - UtilPlayer.message(player, F.main("Clans", "This cannon is not owned by your Clan.")); + UtilPlayer.message(player, F.main("Clans", "This Cannon is not owned by your Clan.")); return false; } @@ -110,7 +110,7 @@ public class Cannon extends SiegeWeapon } if(_clans.getPvpTimer().hasTimer(player)) { - UtilPlayer.message(player, F.main("Clans", "You cannot sit in a cannon whilst on PvPTimer")); + UtilPlayer.message(player, F.main("Clans", "You cannot ride on a Cannon whilst on PvPTimer")); return false; } @@ -150,12 +150,13 @@ public class Cannon extends SiegeWeapon if (!_ownerClan.isMember(player)) { - UtilPlayer.message(player, F.main("Clans", "This cannon is not owned by your Clan.")); + UtilPlayer.message(player, F.main("Clans", "This Cannon is not owned by your Clan.")); return false; } - if(_clans.getPvpTimer().hasTimer(player)) { - UtilPlayer.message(player, F.main("Clans", "You cannot fire a cannon whilst on PvPTimer")); + if (_clans.getPvpTimer().hasTimer(player)) + { + UtilPlayer.message(player, F.main("Clans", "You cannot fire a Cannon whilst protected from pvp.")); return false; } @@ -179,18 +180,19 @@ public class Cannon extends SiegeWeapon setRideable(new AccessRule(AccessType.RCLICK_BB, player -> { if (!_ownerClan.isMember(player)) { - UtilPlayer.message(player, F.main("Clans", "This cannon is not owned by your Clan.")); + UtilPlayer.message(player, F.main("Clans", "This Cannon is not owned by your Clan.")); return false; } if (getRider() != null && !getRider().equals(player)) { - UtilPlayer.message(player, F.main("Clans", "Someone is already riding this cannon.")); + UtilPlayer.message(player, F.main("Clans", "Someone is already riding this Cannon.")); return false; } - if(_clans.getPvpTimer().hasTimer(player)) { - UtilPlayer.message(player, F.main("Clans", "You cannot sit in a cannon whilst on PvPTimer")); + if(_clans.getPvpTimer().hasTimer(player)) + { + UtilPlayer.message(player, F.main("Clans", "You cannot ride on a Cannon whilst protected from pvp.")); return false; }