diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/gladiators/Gladiators.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/gladiators/Gladiators.java index b03240656..1ce069c88 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/gladiators/Gladiators.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/gladiators/Gladiators.java @@ -4,7 +4,6 @@ import java.text.DecimalFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; -import java.util.HashSet; import java.util.Iterator; import java.util.LinkedList; import java.util.Map; @@ -109,13 +108,13 @@ public class Gladiators extends SoloGame EnableTutorials = false; BlockBreakAllow.add(Material.SUGAR_CANE_BLOCK.getId()); - BlockBreakAllow.add(Material.GRASS.getId()); + BlockBreakAllow.add(Material.DEAD_BUSH.getId()); BlockBreakAllow.add(Material.LONG_GRASS.getId()); registerStatTrackers( new BrawlerTracker(this), - //new UntouchableTracker(this), - //new FlawlessTracker(this), + new UntouchableTracker(this), + new FlawlessTracker(this), new PrecisionTracker(this), new SwiftKillTracker(this) ); @@ -529,8 +528,6 @@ public class Gladiators extends SoloGame a.setState(ArenaState.WAITING); } - UtilTextMiddle.display(C.cGreen + "Gladiators!", C.cGreen + "Defeat your opponent to advance", 20, 60, 20); - return; } @@ -541,6 +538,12 @@ public class Gladiators extends SoloGame //closeUnusedArenas(); } + @EventHandler + public void helpMessage(PlayerPrepareTeleportEvent e) + { + UtilTextMiddle.display(C.cGreen + "Gladiators!", C.cGreen + "Defeat your opponent to advance", 20, 20 * 7, 20); + } + /** *------------------- * MAIN UPDATE METHOD @@ -559,9 +562,6 @@ public class Gladiators extends SoloGame { _roundState = RoundState.STARTING_5; - if (_firstRound) - return; - UtilTextMiddle.display("", C.cGreen + C.Bold + getRoundNotation(), 0, 80 , 0); _furthestOutCurrent = getFurthestOut(); // Find furthest out for fight. @@ -819,9 +819,6 @@ public class Gladiators extends SoloGame { _roundState = RoundState.STARTING_2; - if (_firstRound) - return; - UtilTextMiddle.display(C.cGreen + "3", C.cGreen + C.Bold + getRoundNotation(), 0, 80, 0); for (Player p : UtilServer.getPlayers()) @@ -832,9 +829,6 @@ public class Gladiators extends SoloGame { _roundState = RoundState.STARTING_1; - if (_firstRound) - return; - UtilTextMiddle.display(C.cYellow + "2", C.cGreen + C.Bold + getRoundNotation(), 0, 80, 0); for (Player p : UtilServer.getPlayers()) @@ -845,9 +839,6 @@ public class Gladiators extends SoloGame { _roundState = RoundState.STARTED; - if (_firstRound) - return; - UtilTextMiddle.display(C.cGold + "1", C.cGreen + C.Bold + getRoundNotation(), 0, 80, 0); for (Player p : UtilServer.getPlayers()) @@ -858,11 +849,11 @@ public class Gladiators extends SoloGame { _roundState = RoundState.FIGHTING; - if (_firstRound) - { - _firstRound = false; - return; - } +// if (_firstRound) +// { +// _firstRound = false; +// return; +// } UtilTextMiddle.display(C.cRed + "FIGHT", C.cGreen + C.Bold + getRoundNotation(), 0, 40, 0); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/gladiators/trackers/FlawlessTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/gladiators/trackers/FlawlessTracker.java index ebdbad1cf..1d772bbc2 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/gladiators/trackers/FlawlessTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/gladiators/trackers/FlawlessTracker.java @@ -7,6 +7,7 @@ import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.entity.EntityDamageEvent; +import mineplex.minecraft.game.core.damage.CustomDamageEvent; import nautilus.game.arcade.events.GameStateChangeEvent; import nautilus.game.arcade.game.Game; import nautilus.game.arcade.game.games.gladiators.Gladiators; @@ -29,16 +30,16 @@ public class FlawlessTracker extends StatTracker } @EventHandler - public void onDmg(EntityDamageEvent e) + public void onDmg(CustomDamageEvent e) { if (e.isCancelled()) return; - System.out.println(e.getEventName() + " took damage by " + e.getCause().toString()); + //System.out.println(e.getEventName() + " took damage by " + e.GetCause().toString()); - if (e.getEntity() instanceof Player) + if (e.GetDamageeEntity() instanceof Player) { - _noWin.add(((Player)e.getEntity()).getName()); + _noWin.add(((Player)e.GetDamageeEntity()).getName()); } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/gladiators/trackers/UntouchableTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/gladiators/trackers/UntouchableTracker.java index 44115ca72..ef357d6a5 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/gladiators/trackers/UntouchableTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/gladiators/trackers/UntouchableTracker.java @@ -7,6 +7,7 @@ import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.entity.EntityDamageEvent; +import mineplex.minecraft.game.core.damage.CustomDamageEvent; import nautilus.game.arcade.game.games.gladiators.Gladiators; import nautilus.game.arcade.game.games.gladiators.events.RoundStartEvent; import nautilus.game.arcade.stats.StatTracker; @@ -27,14 +28,14 @@ public class UntouchableTracker extends StatTracker } @EventHandler - public void onDmg(EntityDamageEvent e) + public void onDmg(CustomDamageEvent e) { if (e.isCancelled()) return; - if (e.getEntity() instanceof Player) + if (e.GetDamageeEntity() instanceof Player) { - _noWin.add(((Player)e.getEntity()).getName()); + _noWin.add(((Player)e.GetDamageeEntity()).getName()); } }