From c582b210b57b1cb144181d8bd98089efe8644ce7 Mon Sep 17 00:00:00 2001 From: Chiss Date: Sat, 14 Dec 2013 16:51:08 +1100 Subject: [PATCH] Hub + Stats + Tournament --- .../src/mineplex/core/stats/StatsManager.java | 8 +++++++- Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java | 9 +++++---- .../src/mineplex/hub/modules/NewsManager.java | 7 +++---- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/stats/StatsManager.java b/Plugins/Mineplex.Core/src/mineplex/core/stats/StatsManager.java index 4ef175b78..46feec698 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/stats/StatsManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/stats/StatsManager.java @@ -278,10 +278,16 @@ public class StatsManager extends MiniPlugin public int getStat(String player, String table, String stat) { if (!_playerStatList.containsKey(table)) + { + System.out.println("STATS ERROR: Table doesn't exist (" + table + ")"); return 0; - + } + if (!_playerStatList.get(table).containsKey(player)) + { + System.out.println("STATS ERROR: Player doesn't exist (" + player + ")"); return 0; + } PlayerStats stats = _playerStatList.get(table).get(player); diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java index 98401f90e..22a01698a 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java @@ -117,6 +117,7 @@ public class HubManager extends MiniClientPlugin _visibilityManager = new VisibilityManager(this); _statsManager = new StatsManager(plugin); + _statsManager.addTable("Pvp"); } @EventHandler(priority = EventPriority.HIGHEST) @@ -282,11 +283,11 @@ public class HubManager extends MiniClientPlugin Objective obj = board.getObjective(DisplaySlot.BELOW_NAME); if (obj == null) { - obj = board.registerNewObjective("Tournament Kills", "dummy"); + obj = board.registerNewObjective("SG Tourney Kills", "dummy"); obj.setDisplaySlot(DisplaySlot.BELOW_NAME); } - obj.getScore(event.getPlayer()).setScore(GetStats().GetStat(event.getPlayer(), "Pvp", "Kills")); + obj.getScore(event.getPlayer()).setScore(GetStats().getStat(event.getPlayer(), "Pvp", "Kills")); } if (event.getPlayer().getScoreboard() != null) @@ -296,7 +297,7 @@ public class HubManager extends MiniClientPlugin Objective obj = board.getObjective(DisplaySlot.BELOW_NAME); if (obj == null) { - obj = board.registerNewObjective("Tournament Kills", "dummy"); + obj = board.registerNewObjective("SG Tournament Kills", "dummy"); obj.setDisplaySlot(DisplaySlot.BELOW_NAME); } @@ -305,7 +306,7 @@ public class HubManager extends MiniClientPlugin if (player.equals(event.getPlayer())) continue; - obj.getScore(player).setScore(player.getName().length()); + obj.getScore(player).setScore(GetStats().getStat(player, "Pvp", "Kills")); } } } diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/NewsManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/NewsManager.java index 4afec05a1..96b4b1247 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/NewsManager.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/NewsManager.java @@ -31,10 +31,9 @@ public class NewsManager extends MiniPlugin _news = new String[] { - "New Game: " + C.cGold + C.Bold + "Block Hunt" + ChatColor.RESET + "!", - "Prices lowered by " + C.cGreen + C.Bold + "50%" + ChatColor.RESET + " on everything!", - "New Game: " + C.cGold + C.Bold + "Survival Games" + ChatColor.RESET + "!", - "Europe Servers: " + C.cGreen + C.Bold + "eu.mineplex.com" + ChatColor.RESET + "!", + C.cYellow + C.Bold + "SG Tournament: " + C.cAqua + C.Bold + "Most Kills Over Weekend" + ChatColor.RESET + "!", + C.cYellow + C.Bold + "Tournament Prize: " + C.cAqua + C.Bold + "Minecon 2013 Cape" + ChatColor.RESET + "!", + "Europe Servers: " + C.cGreen + C.Bold + "Will be back ASAP" + ChatColor.RESET + "!", "New Game: " + C.cGold + C.Bold + "Draw My Thing" + ChatColor.RESET + "!", }; }