Remove unused getWave() method from Arena
This commit is contained in:
@@ -91,7 +91,6 @@ public class ArenaImpl implements Arena
|
|||||||
|
|
||||||
// Wave stuff
|
// Wave stuff
|
||||||
private WaveManager waveManager;
|
private WaveManager waveManager;
|
||||||
private Wave currentWave;
|
|
||||||
private MASpawnThread spawnThread;
|
private MASpawnThread spawnThread;
|
||||||
private SheepBouncer sheepBouncer;
|
private SheepBouncer sheepBouncer;
|
||||||
private Map<Integer,List<ItemStack>> everyWaveMap, afterWaveMap;
|
private Map<Integer,List<ItemStack>> everyWaveMap, afterWaveMap;
|
||||||
@@ -1149,12 +1148,6 @@ public class ArenaImpl implements Arena
|
|||||||
return plugin;
|
return plugin;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public Wave getWave()
|
|
||||||
{
|
|
||||||
return currentWave;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Map<String,ArenaClass> getClasses()
|
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.repairable.Repairable;
|
||||||
import com.garbagemule.MobArena.util.config.ConfigSection;
|
import com.garbagemule.MobArena.util.config.ConfigSection;
|
||||||
import com.garbagemule.MobArena.util.inventory.InventoryManager;
|
import com.garbagemule.MobArena.util.inventory.InventoryManager;
|
||||||
import com.garbagemule.MobArena.waves.Wave;
|
|
||||||
import com.garbagemule.MobArena.waves.WaveManager;
|
import com.garbagemule.MobArena.waves.WaveManager;
|
||||||
|
|
||||||
public interface Arena
|
public interface Arena
|
||||||
@@ -217,8 +216,6 @@ public interface Arena
|
|||||||
|
|
||||||
public MobArena getPlugin();
|
public MobArena getPlugin();
|
||||||
|
|
||||||
public Wave getWave();
|
|
||||||
|
|
||||||
public Map<String,ArenaClass> getClasses();
|
public Map<String,ArenaClass> getClasses();
|
||||||
|
|
||||||
public int getPlayerCount();
|
public int getPlayerCount();
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ public class MagicSpellsListener implements Listener
|
|||||||
if (arena == null || !arena.isRunning()) return;
|
if (arena == null || !arena.isRunning()) return;
|
||||||
|
|
||||||
String spell = event.getSpell().getName();
|
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) ||
|
if (disabled.contains(spell) ||
|
||||||
(type == WaveType.BOSS && disabledOnBoss.contains(spell)) ||
|
(type == WaveType.BOSS && disabledOnBoss.contains(spell)) ||
|
||||||
|
|||||||
Reference in New Issue
Block a user