Rearrange leeway variable in code and config.

The list of variables in the code is a bit archaic, and the location in
the config-file should be close to the other `clear-` settings to try to
enforce _some_ sort of coherence.

src/main/java/com/garbagemule/MobArena/MASpawnThread.java

@@ -40,8 +40,9 @@ public class MASpawnThread implements Runnable
     private MonsterManager monsterManager;
     private CreatesHealthBar createsHealthBar;
 
-    private int playerCount, monsterLimit, waveLeeway;
+    private int playerCount, monsterLimit;
     private boolean waveClear, bossClear, preBossClear, wavesAsLevel;
+    private int waveLeeway;
     private int waveInterval;
     private int nextWaveDelay;
 
@@ -73,10 +74,10 @@ public class MASpawnThread implements Runnable
         waveManager.reset();
         playerCount = arena.getPlayersInArena().size();
         monsterLimit = arena.getSettings().getInt("monster-limit", 100);
-        waveLeeway = arena.getSettings().getInt("clear-wave-leeway", 0);
         waveClear = arena.getSettings().getBoolean("clear-wave-before-next", false);
         bossClear = arena.getSettings().getBoolean("clear-boss-before-next", false);
         preBossClear = arena.getSettings().getBoolean("clear-wave-before-boss", false);
+        waveLeeway = arena.getSettings().getInt("clear-wave-leeway", 0);
         wavesAsLevel = arena.getSettings().getBoolean("display-waves-as-level", false);
         waveInterval = arena.getSettings().getInt("wave-interval", 3);
         nextWaveDelay = arena.getSettings().getInt("next-wave-delay", 0);

src/main/resources/res/settings.yml

@@ -7,6 +7,7 @@ default-class: ''
 clear-wave-before-next: false
 clear-boss-before-next: false
 clear-wave-before-boss: false
+clear-wave-leeway: 0
 soft-restore: false
 soft-restore-drops: false
 require-empty-inv-join: false
@@ -26,7 +27,6 @@ next-wave-delay: 0
 wave-interval: 15
 final-wave: 0
 monster-limit: 100
-clear-wave-leeway: 0
 monster-exp: false
 keep-exp: false
 food-regen: false