Add a dedicated field for wave-interval in MASpawnThread.

All of the calls to getSettings() are now contained in the constructor and reset() method. Neat.
This commit is contained in:
Andreas Troelsen
2018-07-29 15:55:39 +02:00
parent 3b024235dc
commit 6f077359c6
@@ -37,6 +37,7 @@ public class MASpawnThread implements Runnable
private int playerCount, monsterLimit; private int playerCount, monsterLimit;
private boolean waveClear, bossClear, preBossClear, wavesAsLevel; private boolean waveClear, bossClear, preBossClear, wavesAsLevel;
private int waveInterval;
/** /**
* Create a new monster spawner for the input arena. * Create a new monster spawner for the input arena.
@@ -68,6 +69,7 @@ public class MASpawnThread implements Runnable
bossClear = arena.getSettings().getBoolean("clear-boss-before-next", false); bossClear = arena.getSettings().getBoolean("clear-boss-before-next", false);
preBossClear = arena.getSettings().getBoolean("clear-wave-before-boss", false); preBossClear = arena.getSettings().getBoolean("clear-wave-before-boss", false);
wavesAsLevel = arena.getSettings().getBoolean("display-waves-as-level", false); wavesAsLevel = arena.getSettings().getBoolean("display-waves-as-level", false);
waveInterval = arena.getSettings().getInt("wave-interval", 3);
} }
public void run() { public void run() {
@@ -126,7 +128,7 @@ public class MASpawnThread implements Runnable
updateStats(nextWave); updateStats(nextWave);
// Reschedule the spawner for the next wave. // Reschedule the spawner for the next wave.
arena.scheduleTask(this, arena.getSettings().getInt("wave-interval", 3) * 20); arena.scheduleTask(this, waveInterval * 20);
} }
private void spawnWave(int wave) { private void spawnWave(int wave) {