diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/HideSeek.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/HideSeek.java index 71cd76af2..dac9493dc 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/HideSeek.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/HideSeek.java @@ -111,7 +111,7 @@ public class HideSeek extends TeamGame } } - public static class ChangeFormEvent extends PlayerEvent + public static class PlayerChangeFormEvent extends PlayerEvent { private static final HandlerList handlers = new HandlerList(); @@ -128,7 +128,7 @@ public class HideSeek extends TeamGame private final Form _form; - public ChangeFormEvent(Player who, Form form) + public PlayerChangeFormEvent(Player who, Form form) { super(who); @@ -141,6 +141,27 @@ public class HideSeek extends TeamGame } } + public static class PlayerSolidifyEvent extends PlayerEvent + { + private static final HandlerList handlers = new HandlerList(); + + public static HandlerList getHandlerList() + { + return handlers; + } + + @Override + public HandlerList getHandlers() + { + return getHandlerList(); + } + + public PlayerSolidifyEvent(Player who) + { + super(who); + } + } + private GameTeam _hiders; private GameTeam _seekers; @@ -355,7 +376,7 @@ public class HideSeek extends TeamGame _forms.put(event.GetPlayer(), form); - Bukkit.getPluginManager().callEvent(new ChangeFormEvent(event.GetPlayer(), form)); + Bukkit.getPluginManager().callEvent(new PlayerChangeFormEvent(event.GetPlayer(), form)); } } @@ -392,7 +413,7 @@ public class HideSeek extends TeamGame //Set New _forms.put(player, form); - Bukkit.getPluginManager().callEvent(new ChangeFormEvent(player, form)); + Bukkit.getPluginManager().callEvent(new PlayerChangeFormEvent(player, form)); } @EventHandler @@ -426,7 +447,7 @@ public class HideSeek extends TeamGame //Set New _forms.put(player, form); - Bukkit.getPluginManager().callEvent(new ChangeFormEvent(player, form)); + Bukkit.getPluginManager().callEvent(new PlayerChangeFormEvent(player, form)); } @EventHandler @@ -458,7 +479,7 @@ public class HideSeek extends TeamGame //Set New _forms.put(player, form); - Bukkit.getPluginManager().callEvent(new ChangeFormEvent(player, form)); + Bukkit.getPluginManager().callEvent(new PlayerChangeFormEvent(player, form)); } @EventHandler diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/forms/BlockForm.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/forms/BlockForm.java index 139f25d63..92509d0e5 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/forms/BlockForm.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/forms/BlockForm.java @@ -14,6 +14,7 @@ import mineplex.core.recharge.Recharge; import nautilus.game.arcade.game.games.hideseek.HideSeek; import nautilus.game.arcade.game.games.hideseek.kits.KitHiderQuick; +import org.bukkit.Bukkit; import org.bukkit.Effect; import org.bukkit.Location; import org.bukkit.Material; @@ -139,6 +140,8 @@ public class BlockForm extends Form return; } + Bukkit.getPluginManager().callEvent(new HideSeek.PlayerSolidifyEvent(Player)); + //Set Block _block = block; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/AssistsStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/AssistsStatTracker.java index 7d31e65d8..d329f5483 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/AssistsStatTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/AssistsStatTracker.java @@ -31,10 +31,10 @@ public class AssistsStatTracker extends StatTracker if (player != null) { - getGame().AddStat(player, "Assists", 1, false, false); + addStat(player, "Assists", 1, false, false); if (getGame().GetKit(player) != null) - getGame().AddStat(player, getGame().GetKit(player).GetName() + " Assists", 1, false, false); + addStat(player, getGame().GetKit(player).GetName() + " Assists", 1, false, false); } } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/BackstabKillStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/BackstabKillStatTracker.java index a51d15bbb..1192bf03e 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/BackstabKillStatTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/BackstabKillStatTracker.java @@ -55,7 +55,7 @@ public class BackstabKillStatTracker extends StatTracker Set hasDamaged = _hasDamaged.get(player.getUniqueId()); if (hasDamaged == null || !hasDamaged.contains(killer.getUniqueId())) - getGame().AddStat(killer, "Assassination", 1, false, false); + addStat(killer, "Assassination", 1, false, false); } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/BadHiderStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/BadHiderStatTracker.java index 604138f5f..6b50bc4a4 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/BadHiderStatTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/BadHiderStatTracker.java @@ -12,7 +12,6 @@ import org.bukkit.event.entity.PlayerDeathEvent; import nautilus.game.arcade.events.GameStateChangeEvent; import nautilus.game.arcade.game.Game; import nautilus.game.arcade.game.games.hideseek.HideSeek; -import nautilus.game.arcade.game.games.hideseek.forms.CreatureForm; public class BadHiderStatTracker extends StatTracker { @@ -24,13 +23,12 @@ public class BadHiderStatTracker extends StatTracker } @EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR) - public void onChangeForm(HideSeek.ChangeFormEvent event) + public void onChangeForm(HideSeek.PlayerChangeFormEvent event) { if (getGame().GetState() != Game.GameState.Live) return; - if (event.getForm() instanceof CreatureForm) - _disqualified.add(event.getPlayer().getUniqueId()); + _disqualified.add(event.getPlayer().getUniqueId()); } @EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR) @@ -42,6 +40,15 @@ public class BadHiderStatTracker extends StatTracker _disqualified.add(event.getEntity().getUniqueId()); } + @EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR) + public void onPlayerSolidify(HideSeek.PlayerSolidifyEvent event) + { + if (getGame().GetState() != Game.GameState.Live) + return; + + _disqualified.add(event.getPlayer().getUniqueId()); + } + @EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR) public void onGameStateChange(GameStateChangeEvent event) { @@ -50,7 +57,7 @@ public class BadHiderStatTracker extends StatTracker for (Player player : getGame().getHiders().GetPlayers(true)) { if (!_disqualified.contains(player.getUniqueId())) - getGame().AddStat(player, "BadHider", 1, true, false); + addStat(player, "BadHider", 1, true, false); } } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/BehindEnemyLinesStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/BehindEnemyLinesStatTracker.java index 082318e54..2094f425e 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/BehindEnemyLinesStatTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/BehindEnemyLinesStatTracker.java @@ -28,7 +28,7 @@ public class BehindEnemyLinesStatTracker extends StatTracker Long time = getGame().getEnemyTurfEntranceTime(player); if (time != null && System.currentTimeMillis() - time >= 15000) - getGame().AddStat(player, "BehindEnemyLines", 1, true, false); + addStat(player, "BehindEnemyLines", 1, true, false); } } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/BlockShreadStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/BlockShreadStatTracker.java index cb32d23a7..064358a14 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/BlockShreadStatTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/BlockShreadStatTracker.java @@ -26,7 +26,7 @@ public class BlockShreadStatTracker extends StatTracker Player shooter = (Player) event.getArrow().getShooter(); if (getGame().GetKit(shooter) instanceof KitShredder) - getGame().AddStat(shooter, "TheShreddinator", 1, false, false); + addStat(shooter, "TheShreddinator", 1, false, false); } } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/BloodThirstyStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/BloodThirstyStatTracker.java index 07653ecee..c6df42427 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/BloodThirstyStatTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/BloodThirstyStatTracker.java @@ -58,7 +58,7 @@ public class BloodThirstyStatTracker extends StatTracker _kills.put(killer.getUniqueId(), kills); if (kills >= 50) - getGame().AddStat(killer, "BloodThirsty", 1, true, false); + addStat(killer, "BloodThirsty", 1, true, false); } } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/BridgesSniperStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/BridgesSniperStatTracker.java index 25e7554f3..6abe48543 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/BridgesSniperStatTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/BridgesSniperStatTracker.java @@ -49,7 +49,7 @@ public class BridgesSniperStatTracker extends StatTracker EntityDamageByEntityEvent edbee = (EntityDamageByEntityEvent) player.getLastDamageCause(); if (edbee.getDamager() instanceof Arrow) - getGame().AddStat(killer, "Sniper", 1, true, false); + addStat(killer, "Sniper", 1, true, false); } } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/CannibalStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/CannibalStatTracker.java index 3f876333f..f6287e5a0 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/CannibalStatTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/CannibalStatTracker.java @@ -32,6 +32,6 @@ public class CannibalStatTracker extends StatTracker _kills.put(event.getKiller().getUniqueId(), killCount); if (killCount >= 8) - getGame().AddStat(event.getKiller(), "Cannibal", 1, true, false); + addStat(event.getKiller(), "Cannibal", 1, true, false); } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/ChooChooStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/ChooChooStatTracker.java index bb5afee0f..21d3e9705 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/ChooChooStatTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/ChooChooStatTracker.java @@ -20,6 +20,6 @@ public class ChooChooStatTracker extends StatTracker return; if (event.getLength() >= 60) - getGame().AddStat(event.getPlayer(), "ChooChoo", 1, true, false); + addStat(event.getPlayer(), "ChooChoo", 1, true, false); } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/ComeAtMeBroStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/ComeAtMeBroStatTracker.java index 9de8b7825..e884fb154 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/ComeAtMeBroStatTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/ComeAtMeBroStatTracker.java @@ -57,7 +57,7 @@ public class ComeAtMeBroStatTracker extends StatTracker _count.put(killer.getUniqueId(), count); if (count >= 2) - getGame().AddStat(killer, "ComeAtMeBro", 1, true, false); + addStat(killer, "ComeAtMeBro", 1, true, false); } } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/DamageDealtStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/DamageDealtStatTracker.java index 2f57e0262..ff6b80abe 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/DamageDealtStatTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/DamageDealtStatTracker.java @@ -22,9 +22,9 @@ public class DamageDealtStatTracker extends StatTracker if (damager == null) return; - getGame().AddStat(damager, "Damage Dealt", (int) Math.round(event.GetDamage()), false, false); + addStat(damager, "Damage Dealt", (int) Math.round(event.GetDamage()), false, false); if (getGame().GetKit(damager) != null) - getGame().AddStat(damager, getGame().GetKit(damager).GetName() + " Damage Dealt", (int) Math.round(event.GetDamage()), false, false); + addStat(damager, getGame().GetKit(damager).GetName() + " Damage Dealt", (int) Math.round(event.GetDamage()), false, false); } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/DamageTakenStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/DamageTakenStatTracker.java index af817603c..1f584cbb5 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/DamageTakenStatTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/DamageTakenStatTracker.java @@ -22,9 +22,9 @@ public class DamageTakenStatTracker extends StatTracker if (damagee == null) return; - getGame().AddStat(damagee, "Damage Taken", (int) Math.round(event.GetDamage()), false, false); + addStat(damagee, "Damage Taken", (int) Math.round(event.GetDamage()), false, false); if (getGame().GetKit(damagee) != null) - getGame().AddStat(damagee, getGame().GetKit(damagee).GetName() + " Damage Taken", (int) Math.round(event.GetDamage()), false, false); + addStat(damagee, getGame().GetKit(damagee).GetName() + " Damage Taken", (int) Math.round(event.GetDamage()), false, false); } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/DeathBomberStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/DeathBomberStatTracker.java index 979d9b001..fa456b1c8 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/DeathBomberStatTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/DeathBomberStatTracker.java @@ -58,7 +58,7 @@ public class DeathBomberStatTracker extends StatTracker _killCount.put(killer.getUniqueId(), count); if (count >= 5) - getGame().AddStat(killer, "DeathBomber", 1, true, false); + addStat(killer, "DeathBomber", 1, true, false); } } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/DeathsStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/DeathsStatTracker.java index feca5aad4..2a13dc0eb 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/DeathsStatTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/DeathsStatTracker.java @@ -31,9 +31,9 @@ public class DeathsStatTracker extends StatTracker if (player == null) return; - getGame().AddStat(player, "Deaths", 1, false, false); + addStat(player, "Deaths", 1, false, false); if (getGame().GetKit(player) != null) - getGame().AddStat(player, getGame().GetKit(player).GetName() + " Deaths", 1, false, false); + addStat(player, getGame().GetKit(player).GetName() + " Deaths", 1, false, false); } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/ElectrocutionStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/ElectrocutionStatTracker.java index 34d31dd60..471cd5da0 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/ElectrocutionStatTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/ElectrocutionStatTracker.java @@ -18,6 +18,6 @@ public class ElectrocutionStatTracker extends StatTracker return; if (event.getStruck().size() >= 4) - getGame().AddStat(event.getPlayer(), "MassElectrocution", 1, true, false); + addStat(event.getPlayer(), "MassElectrocution", 1, true, false); } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/FastKillsStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/FastKillsStatTracker.java index d53dfc1be..12db25beb 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/FastKillsStatTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/FastKillsStatTracker.java @@ -79,7 +79,7 @@ public class FastKillsStatTracker extends StatTracker _lastKillTime.remove(player.getUniqueId()); if (killCount >= getRequiredKillCount()) - getGame().AddStat(killer, getStat(), 1, true, false); + addStat(killer, getStat(), 1, true, false); } public int getRequiredKillCount() diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/FirstSupplyDropOpenStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/FirstSupplyDropOpenStatTracker.java index bca446fe3..901982794 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/FirstSupplyDropOpenStatTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/FirstSupplyDropOpenStatTracker.java @@ -21,7 +21,7 @@ public class FirstSupplyDropOpenStatTracker extends StatTracker if (first) { - getGame().AddStat(event.getPlayer(), "SupplyDropsOpened", 1, false, false); + addStat(event.getPlayer(), "SupplyDropsOpened", 1, false, false); first = false; } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/FoodForTheMassesStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/FoodForTheMassesStatTracker.java index d03b9bb0e..a3ece3e8b 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/FoodForTheMassesStatTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/FoodForTheMassesStatTracker.java @@ -42,6 +42,6 @@ public class FoodForTheMassesStatTracker extends StatTracker return; if (event.GetLog().GetLastDamager().GetReason() != null && event.GetLog().GetLastDamager().GetReason().equalsIgnoreCase("Apple Thrower")) - getGame().AddStat(killer, "FoodForTheMasses", 1, false, false); + addStat(killer, "FoodForTheMasses", 1, false, false); } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/FreeKitWinStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/FreeKitWinStatTracker.java index 8ddffeff4..035ccb0d0 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/FreeKitWinStatTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/FreeKitWinStatTracker.java @@ -31,7 +31,7 @@ public class FreeKitWinStatTracker extends StatTracker if (getGame().GetKit(winner) != null) { if (getGame().GetKit(winner).GetAvailability() == KitAvailability.Free) - getGame().AddStat(winner, "FreeKitsForever", 1, false, false); + addStat(winner, "FreeKitsForever", 1, false, false); } } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/HunterKillerStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/HunterKillerStatTracker.java index b08368261..742336a7a 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/HunterKillerStatTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/HunterKillerStatTracker.java @@ -57,7 +57,7 @@ public class HunterKillerStatTracker extends StatTracker _huntersKilled.put(killer.getUniqueId(), huntersKilled); if (huntersKilled >= 10) - getGame().AddStat(killer, "HunterKiller", 1, true, false); + addStat(killer, "HunterKiller", 1, true, false); } } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/HunterOfTheYearStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/HunterOfTheYearStatTracker.java index 57774d702..52d4f4463 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/HunterOfTheYearStatTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/HunterOfTheYearStatTracker.java @@ -58,7 +58,7 @@ public class HunterOfTheYearStatTracker extends StatTracker _hidersKilled.put(killer.getUniqueId(), hidersKilled); if (hidersKilled >= 7) - getGame().AddStat(killer, "HunterOfTheYear", 1, true, false); + addStat(killer, "HunterOfTheYear", 1, true, false); } } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/KeenEyeStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/KeenEyeStatTracker.java index 35c5aa81f..8fddec0cc 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/KeenEyeStatTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/KeenEyeStatTracker.java @@ -45,7 +45,7 @@ public class KeenEyeStatTracker extends StatTracker if (event.GetState() == Game.GameState.End) { for (Player player : _guessAll) - getGame().AddStat(player, "KeenEye", 1, true, false); + addStat(player, "KeenEye", 1, true, false); } } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/KillAllOpposingStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/KillAllOpposingStatTracker.java index 3502c9cf4..6c0c8dc0d 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/KillAllOpposingStatTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/KillAllOpposingStatTracker.java @@ -85,7 +85,7 @@ public class KillAllOpposingStatTracker extends StatTracker } if (killedAll) - getGame().AddStat(player, "Ace", 1, true, false); + addStat(player, "Ace", 1, true, false); } } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/KillsStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/KillsStatTracker.java index 571208772..6ef24822a 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/KillsStatTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/KillsStatTracker.java @@ -31,9 +31,9 @@ public class KillsStatTracker extends StatTracker if (player == null) return; - getGame().AddStat(player, "Kills", 1, false, false); + addStat(player, "Kills", 1, false, false); if (getGame().GetKit(player) != null) - getGame().AddStat(player, getGame().GetKit(player).GetName() + " Kills", 1, false, false); + addStat(player, getGame().GetKit(player).GetName() + " Kills", 1, false, false); } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/KillsWithinTimeLimitStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/KillsWithinTimeLimitStatTracker.java index d7fd56200..5b94a5810 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/KillsWithinTimeLimitStatTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/KillsWithinTimeLimitStatTracker.java @@ -58,7 +58,7 @@ public class KillsWithinTimeLimitStatTracker extends StatTracker _kills.put(player.getUniqueId(), killCount); if (killCount == getKillCount() && System.currentTimeMillis() - getGame().GetStateTime() < getTimeLimit()) - getGame().AddStat(player, getStat(), 1, true, false); + addStat(player, getStat(), 1, true, false); } public String getStat() diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/KingDamageStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/KingDamageStatTracker.java index d86cb3601..5b84ac9af 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/KingDamageStatTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/KingDamageStatTracker.java @@ -47,7 +47,7 @@ public class KingDamageStatTracker extends StatTracker Double damage = _kingDamage.get(player.getUniqueId()); if (damage != null && damage >= 0.5 * _totalKingDamage) - getGame().AddStat(player, "Assassin", 1, true, false); + addStat(player, "Assassin", 1, true, false); } } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/KingSlayerStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/KingSlayerStatTracker.java index 6fb872f5e..c229272e5 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/KingSlayerStatTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/KingSlayerStatTracker.java @@ -18,6 +18,6 @@ public class KingSlayerStatTracker extends StatTracker if (getGame().GetState() != Game.GameState.Live) return; - getGame().AddStat(event.getPlayer(), "KingSlayer", 1, true, false); + addStat(event.getPlayer(), "KingSlayer", 1, true, false); } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/LastStandStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/LastStandStatTracker.java index 32d0dc649..135888975 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/LastStandStatTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/LastStandStatTracker.java @@ -58,7 +58,7 @@ public class LastStandStatTracker extends StatTracker _kills.put(killer.getUniqueId(), kills); if (kills >= 3) - getGame().AddStat(killer, "LastStand", 1, true, false); + addStat(killer, "LastStand", 1, true, false); } } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/LoseStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/LoseStatTracker.java index 56712cfa2..4098395aa 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/LoseStatTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/LoseStatTracker.java @@ -27,10 +27,10 @@ public class LoseStatTracker extends StatTracker { for (Player loser : losers) { - getGame().AddStat(loser, "Losses", 1, false, false); + addStat(loser, "Losses", 1, false, false); if (getGame().GetKit(loser) != null) - getGame().AddStat(loser, getGame().GetKit(loser).GetName() + " Losses", 1, false, false); + addStat(loser, getGame().GetKit(loser).GetName() + " Losses", 1, false, false); } } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/MedicStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/MedicStatTracker.java index 5ef6ae0ba..7b3e65e02 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/MedicStatTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/MedicStatTracker.java @@ -19,6 +19,6 @@ public class MedicStatTracker extends StatTracker if (getGame().GetState() != Game.GameState.Live) return; - getGame().AddStat(event.getPlayer(), "Medic", 1, false, false); + addStat(event.getPlayer(), "Medic", 1, false, false); } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/MeowStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/MeowStatTracker.java index 8fda7be6c..a48295075 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/MeowStatTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/MeowStatTracker.java @@ -32,6 +32,6 @@ public class MeowStatTracker extends StatTracker _meowCount.put(event.getPlayer().getUniqueId(), meows); if (meows >= 50) - getGame().AddStat(event.getPlayer(), "Meow", 1, true, false); + addStat(event.getPlayer(), "Meow", 1, true, false); } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/MrSquiggleStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/MrSquiggleStatTracker.java index 093ccb950..d79656b43 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/MrSquiggleStatTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/MrSquiggleStatTracker.java @@ -58,7 +58,7 @@ public class MrSquiggleStatTracker extends StatTracker } if (!greaterThan15000) - getGame().AddStat(drawer, "MrSquiggle", 1, true, false); + addStat(drawer, "MrSquiggle", 1, true, false); } } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/OneVThreeStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/OneVThreeStatTracker.java index 5ead47332..70b50b66d 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/OneVThreeStatTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/OneVThreeStatTracker.java @@ -72,7 +72,7 @@ public class OneVThreeStatTracker extends StatTracker Integer killCount = _killCount.get(player.getUniqueId()); if (killCount != null && killCount >= 10) - getGame().AddStat(player, "1v3", 1, true, false); + addStat(player, "1v3", 1, true, false); } } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/ParalympicsStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/ParalympicsStatTracker.java index 9dcabf8e9..acbda896a 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/ParalympicsStatTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/ParalympicsStatTracker.java @@ -41,7 +41,7 @@ public class ParalympicsStatTracker extends StatTracker for (Player winner : winners) { if (!_hasLeaped.contains(winner.getUniqueId())) - getGame().AddStat(winner, "Paralympics", 1, true, false); + addStat(winner, "Paralympics", 1, true, false); } } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/PureLuckStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/PureLuckStatTracker.java index 7e271a2fb..782154a6d 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/PureLuckStatTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/PureLuckStatTracker.java @@ -21,6 +21,6 @@ public class PureLuckStatTracker extends StatTracker return; if (System.currentTimeMillis() - event.getDrawRound().Time < 5000) - getGame().AddStat(event.getPlayer(), "PureLuck", 1, true, false); + addStat(event.getPlayer(), "PureLuck", 1, true, false); } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/RecoveryMasterStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/RecoveryMasterStatTracker.java index 9e26f4652..d3e9f4447 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/RecoveryMasterStatTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/RecoveryMasterStatTracker.java @@ -58,6 +58,6 @@ public class RecoveryMasterStatTracker extends StatTracker _damageTaken.put(damagee.getUniqueId(), damage); if (damage >= 200) - getGame().AddStat(damagee, "RecoveryMaster", 1, true, false); + addStat(damagee, "RecoveryMaster", 1, true, false); } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/SeismicSlamStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/SeismicSlamStatTracker.java index da9289188..8cae2e912 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/SeismicSlamStatTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/SeismicSlamStatTracker.java @@ -18,6 +18,6 @@ public class SeismicSlamStatTracker extends StatTracker return; if (event.getTargets().size() >= 5) - getGame().AddStat(event.getPlayer(), "Earthquake", 1, true, false); + addStat(event.getPlayer(), "Earthquake", 1, true, false); } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/SharpShooterStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/SharpShooterStatTracker.java index 65385f0ea..bd447e27b 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/SharpShooterStatTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/SharpShooterStatTracker.java @@ -61,7 +61,7 @@ public class SharpShooterStatTracker extends StatTracker Integer arrowsShot = _arrowsShot.get(player.getUniqueId()); if (arrowsShot != null && arrowsShot == 8) - getGame().AddStat(player, "Sharpshooter", 1, true, false); + addStat(player, "Sharpshooter", 1, true, false); } } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/SheepDropStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/SheepDropStatTracker.java index 1c01836d7..d024590a0 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/SheepDropStatTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/SheepDropStatTracker.java @@ -19,6 +19,6 @@ public class SheepDropStatTracker extends StatTracker if (getGame().GetState() != Game.GameState.Live) return; - getGame().AddStat(event.getPlayer(), "AnimalRescue", 1, false, false); + addStat(event.getPlayer(), "AnimalRescue", 1, false, false); } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/SheepThiefStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/SheepThiefStatTracker.java index 9a9e8987a..260fd13f5 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/SheepThiefStatTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/SheepThiefStatTracker.java @@ -19,6 +19,6 @@ public class SheepThiefStatTracker extends StatTracker if (getGame().GetState() != Game.GameState.Live) return; - getGame().AddStat(event.getPlayer(), "Thief", 1, false, false); + addStat(event.getPlayer(), "Thief", 1, false, false); } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/SimultaneousSkeletonStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/SimultaneousSkeletonStatTracker.java index bbe42cf25..705b94a6d 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/SimultaneousSkeletonStatTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/SimultaneousSkeletonStatTracker.java @@ -37,7 +37,7 @@ public class SimultaneousSkeletonStatTracker extends StatTracker } if (aliveCount >= getRequiredCount()) - getGame().AddStat(event.getPlayer(), "Skeletons", 1, true, false); + addStat(event.getPlayer(), "Skeletons", 1, true, false); } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/SlimySheepStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/SlimySheepStatTracker.java index 780944229..8e0962dd9 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/SlimySheepStatTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/SlimySheepStatTracker.java @@ -32,6 +32,6 @@ public class SlimySheepStatTracker extends StatTracker _count.put(event.getPlayer().getUniqueId(), count); if (count >= 20) - getGame().AddStat(event.getPlayer(), "SlimySheep", 1, true, false); + addStat(event.getPlayer(), "SlimySheep", 1, true, false); } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/SparklezStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/SparklezStatTracker.java index e755b66b8..1a8766b99 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/SparklezStatTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/SparklezStatTracker.java @@ -19,6 +19,6 @@ public class SparklezStatTracker extends StatTracker if (getGame().GetState() != Game.GameState.Live) return; - getGame().AddStat(event.getPlayer(), "Sparklez", 1, false, false); + addStat(event.getPlayer(), "Sparklez", 1, false, false); } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/SpleefBlockDestroyStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/SpleefBlockDestroyStatTracker.java index 22685062e..344392177 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/SpleefBlockDestroyStatTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/SpleefBlockDestroyStatTracker.java @@ -19,6 +19,6 @@ public class SpleefBlockDestroyStatTracker extends StatTracker if (getGame().GetState() != Game.GameState.Live) return; - getGame().AddStat(event.getPlayer(), "SpleefBlocks", 1, false, false); + addStat(event.getPlayer(), "SpleefBlocks", 1, false, false); } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/StatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/StatTracker.java index 8c45e65e1..704e355ad 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/StatTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/StatTracker.java @@ -1,7 +1,9 @@ package nautilus.game.arcade.stats; -import nautilus.game.arcade.game.*; -import org.bukkit.event.*; +import org.bukkit.entity.Player; +import org.bukkit.event.Listener; + +import nautilus.game.arcade.game.Game; public class StatTracker implements Listener { @@ -16,4 +18,15 @@ public class StatTracker implements Listener { return game; } + + public boolean canAddStats() + { + return getGame().GetPlayers(false).size() * 4 >= 3 * getGame().Manager.GetPlayerFull(); + } + + public void addStat(Player player, String stat, int value, boolean limitTo1, boolean global) + { + if (canAddStats()) + addStat(player, stat, value, limitTo1, global); + } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/TeamDeathsStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/TeamDeathsStatTracker.java index 2d787c8f5..9993278b3 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/TeamDeathsStatTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/TeamDeathsStatTracker.java @@ -38,6 +38,6 @@ public class TeamDeathsStatTracker extends StatTracker GameTeam team = getGame().GetTeam(player); if (team != null && team.GetName() != null) - getGame().AddStat(player, team.GetName() + " Deaths", 1, false, false); + addStat(player, team.GetName() + " Deaths", 1, false, false); } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/TeamKillsStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/TeamKillsStatTracker.java index f723246f6..1a8080ac5 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/TeamKillsStatTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/TeamKillsStatTracker.java @@ -38,6 +38,6 @@ public class TeamKillsStatTracker extends StatTracker GameTeam team = getGame().GetTeam(player); if (team != null && team.GetName() != null) - getGame().AddStat(player, team.GetName() + " Kills", 1, false, false); + addStat(player, team.GetName() + " Kills", 1, false, false); } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/TheComebackStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/TheComebackStatTracker.java index 877baeb43..5c07783ab 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/TheComebackStatTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/TheComebackStatTracker.java @@ -47,7 +47,7 @@ public class TheComebackStatTracker extends StatTracker if (_hasWentFiveOrBelow.contains(getGame().WinnerTeam)) { for (Player player : getGame().getWinners()) - getGame().AddStat(player, "TheComeback", 1, true, false); + addStat(player, "TheComeback", 1, true, false); } } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/TheLongestShotStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/TheLongestShotStatTracker.java index d834877aa..c5721ab8c 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/TheLongestShotStatTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/TheLongestShotStatTracker.java @@ -54,7 +54,7 @@ public class TheLongestShotStatTracker extends StatTracker Arrow arrow = (Arrow) edbee.getDamager(); if (arrow.getShooter() == killer && killer.getLocation().distanceSquared(player.getLocation()) <= 64 * 64) - getGame().AddStat(killer, "TheLongestShot", 1, false, false); + addStat(killer, "TheLongestShot", 1, false, false); } } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/TntMinerStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/TntMinerStatTracker.java index 04cfd622b..7e1d494df 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/TntMinerStatTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/TntMinerStatTracker.java @@ -17,6 +17,6 @@ public class TntMinerStatTracker extends StatTracker if (getGame().GetState() != Game.GameState.Live) return; - getGame().AddStat(event.getPlayer(), "FortuneBomber", 1, false, false); + addStat(event.getPlayer(), "FortuneBomber", 1, false, false); } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/WinAsTeamStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/WinAsTeamStatTracker.java index 10ec59d20..daccd613c 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/WinAsTeamStatTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/WinAsTeamStatTracker.java @@ -41,7 +41,7 @@ public class WinAsTeamStatTracker extends StatTracker if (winners != null) { for (Player winner : winners) - getGame().AddStat(winner, _stat, 1, false, false); + addStat(winner, _stat, 1, false, false); } } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/WinFastStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/WinFastStatTracker.java index c9bec9fe6..e46e414b3 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/WinFastStatTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/WinFastStatTracker.java @@ -37,7 +37,7 @@ public class WinFastStatTracker extends StatTracker if (winners != null) { for (Player winner : winners) - getGame().AddStat(winner, getStat(), 1, true, false); + addStat(winner, getStat(), 1, true, false); } } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/WinMapStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/WinMapStatTracker.java index 3b3106616..61e097f72 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/WinMapStatTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/WinMapStatTracker.java @@ -26,7 +26,7 @@ public class WinMapStatTracker extends StatTracker if (winners != null) { for (Player winner : winners) - getGame().AddStat(winner, "Win." + getGame().WorldData.MapName, 1, true, false); + addStat(winner, "Win." + getGame().WorldData.MapName, 1, true, false); } } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/WinStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/WinStatTracker.java index 801c860cf..dc97dfd0f 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/WinStatTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/WinStatTracker.java @@ -27,10 +27,10 @@ public class WinStatTracker extends StatTracker { for (Player winner : winners) { - getGame().AddStat(winner, "Wins", 1, false, false); + addStat(winner, "Wins", 1, false, false); if (getGame().GetKit(winner) != null) - getGame().AddStat(winner, getGame().GetKit(winner).GetName() + " Wins", 1, false, false); + addStat(winner, getGame().GetKit(winner).GetName() + " Wins", 1, false, false); } } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/WinWithSheepStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/WinWithSheepStatTracker.java index bbfddddb9..928e0b25d 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/WinWithSheepStatTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/WinWithSheepStatTracker.java @@ -29,7 +29,7 @@ public class WinWithSheepStatTracker extends StatTracker if (winners != null) { for (Player winner : winners) - getGame().AddStat(winner, "Selfish", 1, true, false); + addStat(winner, "Selfish", 1, true, false); } } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/WinWithoutDyingStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/WinWithoutDyingStatTracker.java index 150716c6f..49b448e66 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/WinWithoutDyingStatTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/WinWithoutDyingStatTracker.java @@ -57,7 +57,7 @@ public class WinWithoutDyingStatTracker extends StatTracker for (Player winner : winners) { if (!_hasDied.contains(winner.getUniqueId())) - getGame().AddStat(winner, getStat(), 1, true, false); + addStat(winner, getStat(), 1, true, false); } } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/WinWithoutLosingTeammateStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/WinWithoutLosingTeammateStatTracker.java index cbccd7860..2f15524f6 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/WinWithoutLosingTeammateStatTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/WinWithoutLosingTeammateStatTracker.java @@ -28,7 +28,7 @@ public class WinWithoutLosingTeammateStatTracker extends StatTracker if (winner.GetPlayers(true).size() == winner.GetPlayers(false).size()) { for (Player player : winner.GetPlayers(true)) - getGame().AddStat(player, getStat(), 1, true, false); + addStat(player, getStat(), 1, true, false); } } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/WinWithoutWearingArmorStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/WinWithoutWearingArmorStatTracker.java index 9f3c29e27..b6c850159 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/WinWithoutWearingArmorStatTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/WinWithoutWearingArmorStatTracker.java @@ -58,7 +58,7 @@ public class WinWithoutWearingArmorStatTracker extends StatTracker for (Player winner : winners) { if (!_armorWearers.contains(winner.getUniqueId())) - getGame().AddStat(winner, "NoArmor", 1, true, false); + addStat(winner, "NoArmor", 1, true, false); } } }