From 58f98881f2b35ed9600577704e2cad1ae62f90c2 Mon Sep 17 00:00:00 2001 From: Chiss Date: Wed, 3 Sep 2014 12:38:44 +1000 Subject: [PATCH] Minestrike Update --- .../game/games/minestrike/MineStrike.java | 25 +++---------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java index 24134b6f7..42fa27a57 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java @@ -821,8 +821,6 @@ public class MineStrike extends TeamGame if (bullet == null) return; - long start = System.currentTimeMillis(); - Location loc = bullet.Origin.clone(); HashSet hasPlayedFor = new HashSet(); @@ -861,27 +859,8 @@ public class MineStrike extends TeamGame //Move Closer loc.add(UtilAlg.getTrajectory(loc, bulletEndLocation)); } - - bullets++; - whizzTime += (System.currentTimeMillis() - start); } - //XXX Debug - public int bullets = 0; - public long whizzTime = 0; - @EventHandler - public void debugWhizzTime(UpdateEvent event) - { - if (event.getType() != UpdateType.SLOWER) - return; - - System.out.println("Bullets Fired: " + bullets); - System.out.println("Bullet Whizz Time: " + whizzTime); - - bullets = 0; - whizzTime = 0; - } - @EventHandler(priority=EventPriority.HIGH) public void damage(CustomDamageEvent event) { @@ -1819,6 +1798,10 @@ public class MineStrike extends TeamGame @EventHandler public void incendiaryUpdate(UpdateEvent event) { + if (event.getType() == UpdateType.TICK) + for (Player player : UtilServer.getPlayers()) + player.setFireTicks(0); + if (event.getType() != UpdateType.SLOW) return;