Remove unused getWave() method from Arena

This commit is contained in:
Andreas Troelsen
2013-06-10 00:19:42 +02:00
parent 0be1a7e4c9
commit 7ef98d4538
3 changed files with 1 additions and 11 deletions
@@ -91,7 +91,6 @@ public class ArenaImpl implements Arena
// Wave stuff
private WaveManager waveManager;
private Wave currentWave;
private MASpawnThread spawnThread;
private SheepBouncer sheepBouncer;
private Map<Integer,List<ItemStack>> everyWaveMap, afterWaveMap;
@@ -1149,12 +1148,6 @@ public class ArenaImpl implements Arena
return plugin;
}
@Override
public Wave getWave()
{
return currentWave;
}
@Override
public Map<String,ArenaClass> getClasses()
{
@@ -24,7 +24,6 @@ import com.garbagemule.MobArena.region.ArenaRegion;
import com.garbagemule.MobArena.repairable.Repairable;
import com.garbagemule.MobArena.util.config.ConfigSection;
import com.garbagemule.MobArena.util.inventory.InventoryManager;
import com.garbagemule.MobArena.waves.Wave;
import com.garbagemule.MobArena.waves.WaveManager;
public interface Arena
@@ -217,8 +216,6 @@ public interface Arena
public MobArena getPlugin();
public Wave getWave();
public Map<String,ArenaClass> getClasses();
public int getPlayerCount();
@@ -38,7 +38,7 @@ public class MagicSpellsListener implements Listener
if (arena == null || !arena.isRunning()) return;
String spell = event.getSpell().getName();
WaveType type = (arena.getWave() != null) ? arena.getWave().getType() : null;
WaveType type = (arena.getWaveManager().getCurrent() != null) ? arena.getWaveManager().getCurrent().getType() : null;
if (disabled.contains(spell) ||
(type == WaveType.BOSS && disabledOnBoss.contains(spell)) ||