From 159aa7f6e66fc2b78db71370d0105fa267d23e3e Mon Sep 17 00:00:00 2001 From: IhToN Date: Wed, 18 Feb 2015 23:45:01 +0100 Subject: [PATCH 1/2] Changed Listener trying to stop the "PlayerCount" console spam and also Classes changed to let player buy and use Kits and also have the possibility to add permissions for a group which doesn't have to pay them. --- .../minigamesapi/ArenaListener.java | 2 +- .../com/comze_instancelabs/minigamesapi/Classes.java | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/API/src/main/java/com/comze_instancelabs/minigamesapi/ArenaListener.java b/API/src/main/java/com/comze_instancelabs/minigamesapi/ArenaListener.java index 8789e193..1047b637 100644 --- a/API/src/main/java/com/comze_instancelabs/minigamesapi/ArenaListener.java +++ b/API/src/main/java/com/comze_instancelabs/minigamesapi/ArenaListener.java @@ -271,7 +271,7 @@ public void run() { for (String p_ : arena.getAllPlayers()) { if (Validator.isPlayerOnline(p_)) { Player p__ = Bukkit.getPlayer(p_); - Util.sendMessage(plugin, p__, pli.getMessagesConfig().broadcast_players_left.replaceAll("", arena.getPlayerCount())); + //Util.sendMessage(plugin, p__, pli.getMessagesConfig().broadcast_players_left.replaceAll("", arena.getPlayerCount())); } } } diff --git a/API/src/main/java/com/comze_instancelabs/minigamesapi/Classes.java b/API/src/main/java/com/comze_instancelabs/minigamesapi/Classes.java index ca18bade..10c2eb8a 100644 --- a/API/src/main/java/com/comze_instancelabs/minigamesapi/Classes.java +++ b/API/src/main/java/com/comze_instancelabs/minigamesapi/Classes.java @@ -232,16 +232,17 @@ public void setClass(String internalname, String player, boolean money) { internalname = c; } } - if (!kitPlayerHasPermission(internalname, Bukkit.getPlayer(player))) { - Bukkit.getPlayer(player).sendMessage(pli.getMessagesConfig().no_perm); - return; - } + boolean continue_ = true; if (money) { - if (kitRequiresMoney(internalname)) { + if (kitRequiresMoney(internalname) && !kitPlayerHasPermission(internalname, Bukkit.getPlayer(player))) { continue_ = kitTakeMoney(Bukkit.getPlayer(player), internalname); } + }else if (!kitPlayerHasPermission(internalname, Bukkit.getPlayer(player))) { + Bukkit.getPlayer(player).sendMessage(pli.getMessagesConfig().no_perm); + return; } + if (continue_) { pli.setPClass(player, this.getClassByInternalname(internalname)); Bukkit.getPlayer(player).sendMessage(pli.getMessagesConfig().set_kit.replaceAll("", ChatColor.translateAlternateColorCodes('&', getClassByInternalname(internalname).getName()))); From 1c09356cc64cc8aefe91e5581bf8713a9be62975 Mon Sep 17 00:00:00 2001 From: IhToN Date: Wed, 18 Feb 2015 23:49:12 +0100 Subject: [PATCH 2/2] Buyable kits with permission node to bypass the buying. --- .../main/java/com/comze_instancelabs/minigamesapi/Classes.java | 1 - 1 file changed, 1 deletion(-) diff --git a/API/src/main/java/com/comze_instancelabs/minigamesapi/Classes.java b/API/src/main/java/com/comze_instancelabs/minigamesapi/Classes.java index 10c2eb8a..38286f95 100644 --- a/API/src/main/java/com/comze_instancelabs/minigamesapi/Classes.java +++ b/API/src/main/java/com/comze_instancelabs/minigamesapi/Classes.java @@ -232,7 +232,6 @@ public void setClass(String internalname, String player, boolean money) { internalname = c; } } - boolean continue_ = true; if (money) { if (kitRequiresMoney(internalname) && !kitPlayerHasPermission(internalname, Bukkit.getPlayer(player))) {