Minestrike Update
This commit is contained in:
parent
1dec79c0fa
commit
58f98881f2
@ -821,8 +821,6 @@ public class MineStrike extends TeamGame
|
|||||||
if (bullet == null)
|
if (bullet == null)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
long start = System.currentTimeMillis();
|
|
||||||
|
|
||||||
Location loc = bullet.Origin.clone();
|
Location loc = bullet.Origin.clone();
|
||||||
|
|
||||||
HashSet<Player> hasPlayedFor = new HashSet<Player>();
|
HashSet<Player> hasPlayedFor = new HashSet<Player>();
|
||||||
@ -861,25 +859,6 @@ public class MineStrike extends TeamGame
|
|||||||
//Move Closer
|
//Move Closer
|
||||||
loc.add(UtilAlg.getTrajectory(loc, bulletEndLocation));
|
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)
|
@EventHandler(priority=EventPriority.HIGH)
|
||||||
@ -1819,6 +1798,10 @@ public class MineStrike extends TeamGame
|
|||||||
@EventHandler
|
@EventHandler
|
||||||
public void incendiaryUpdate(UpdateEvent event)
|
public void incendiaryUpdate(UpdateEvent event)
|
||||||
{
|
{
|
||||||
|
if (event.getType() == UpdateType.TICK)
|
||||||
|
for (Player player : UtilServer.getPlayers())
|
||||||
|
player.setFireTicks(0);
|
||||||
|
|
||||||
if (event.getType() != UpdateType.SLOW)
|
if (event.getType() != UpdateType.SLOW)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user