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.
DeathlyFlags · Feb 18, 2015 · 159aa7f · 159aa7f
1 parent 27e64b3
commit 159aa7f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 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
@@ -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("<count>", arena.getPlayerCount()));
+							//Util.sendMessage(plugin, p__, pli.getMessagesConfig().broadcast_players_left.replaceAll("<count>", 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
@@ -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("<kit>", ChatColor.translateAlternateColorCodes('&', getClassByInternalname(internalname).getName())));