Make sure to copy all the important bits of a wave... This system needs refactoring...
This commit is contained in:
@@ -1,7 +1,7 @@
|
|||||||
name: MobArena
|
name: MobArena
|
||||||
author: garbagemule
|
author: garbagemule
|
||||||
main: com.garbagemule.MobArena.MobArena
|
main: com.garbagemule.MobArena.MobArena
|
||||||
version: 0.96.2.12
|
version: 0.96.2.13
|
||||||
softdepend: [Multiverse-Core,Towny,Heroes,MagicSpells,Vault]
|
softdepend: [Multiverse-Core,Towny,Heroes,MagicSpells,Vault]
|
||||||
commands:
|
commands:
|
||||||
ma:
|
ma:
|
||||||
|
|||||||
@@ -29,6 +29,10 @@ public abstract class AbstractWave implements Wave
|
|||||||
return WaveUtils.getValidSpawnpoints(arena, spawnpoints, arena.getPlayersInArena());
|
return WaveUtils.getValidSpawnpoints(arena, spawnpoints, arena.getPlayersInArena());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected List<Location> getSpawnpoints() {
|
||||||
|
return spawnpoints;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void setSpawnpoints(List<Location> spawnpoints) {
|
public void setSpawnpoints(List<Location> spawnpoints) {
|
||||||
this.spawnpoints = spawnpoints;
|
this.spawnpoints = spawnpoints;
|
||||||
|
|||||||
@@ -150,6 +150,12 @@ public class BossWave extends AbstractWave
|
|||||||
result.flatHealth = this.flatHealth;
|
result.flatHealth = this.flatHealth;
|
||||||
result.reward = this.reward;
|
result.reward = this.reward;
|
||||||
result.bossName = this.bossName;
|
result.bossName = this.bossName;
|
||||||
|
|
||||||
|
// From AbstractWave
|
||||||
|
result.setAmountMultiplier(getAmountMultiplier());
|
||||||
|
result.setHealthMultiplier(getHealthMultiplier());
|
||||||
|
result.setName(getName());
|
||||||
|
result.setSpawnpoints(getSpawnpoints());
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -90,6 +90,12 @@ public class DefaultWave extends AbstractWave
|
|||||||
DefaultWave result = new DefaultWave(monsterMap);
|
DefaultWave result = new DefaultWave(monsterMap);
|
||||||
result.growth = this.growth;
|
result.growth = this.growth;
|
||||||
result.fixed = this.fixed;
|
result.fixed = this.fixed;
|
||||||
|
|
||||||
|
// From AbstractWave
|
||||||
|
result.setAmountMultiplier(getAmountMultiplier());
|
||||||
|
result.setHealthMultiplier(getHealthMultiplier());
|
||||||
|
result.setName(getName());
|
||||||
|
result.setSpawnpoints(getSpawnpoints());
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -51,6 +51,13 @@ public class SpecialWave extends AbstractWave
|
|||||||
}
|
}
|
||||||
|
|
||||||
public Wave copy() {
|
public Wave copy() {
|
||||||
return new SpecialWave(monsterMap);
|
SpecialWave result = new SpecialWave(monsterMap);
|
||||||
|
|
||||||
|
// From AbstractWave
|
||||||
|
result.setAmountMultiplier(getAmountMultiplier());
|
||||||
|
result.setHealthMultiplier(getHealthMultiplier());
|
||||||
|
result.setName(getName());
|
||||||
|
result.setSpawnpoints(getSpawnpoints());
|
||||||
|
return result;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -63,6 +63,12 @@ public class SupplyWave extends AbstractWave
|
|||||||
public Wave copy() {
|
public Wave copy() {
|
||||||
SupplyWave result = new SupplyWave(monsterMap);
|
SupplyWave result = new SupplyWave(monsterMap);
|
||||||
result.drops = new ArrayList<ItemStack>(this.drops);
|
result.drops = new ArrayList<ItemStack>(this.drops);
|
||||||
|
|
||||||
|
// From AbstractWave
|
||||||
|
result.setAmountMultiplier(getAmountMultiplier());
|
||||||
|
result.setHealthMultiplier(getHealthMultiplier());
|
||||||
|
result.setName(getName());
|
||||||
|
result.setSpawnpoints(getSpawnpoints());
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -42,6 +42,12 @@ public class SwarmWave extends AbstractWave
|
|||||||
public Wave copy() {
|
public Wave copy() {
|
||||||
SwarmWave result = new SwarmWave(monster);
|
SwarmWave result = new SwarmWave(monster);
|
||||||
result.amount = this.amount;
|
result.amount = this.amount;
|
||||||
|
|
||||||
|
// From AbstractWave
|
||||||
|
result.setAmountMultiplier(getAmountMultiplier());
|
||||||
|
result.setHealthMultiplier(getHealthMultiplier());
|
||||||
|
result.setName(getName());
|
||||||
|
result.setSpawnpoints(getSpawnpoints());
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -52,6 +52,12 @@ public class UpgradeWave extends AbstractWave
|
|||||||
}
|
}
|
||||||
UpgradeWave result = new UpgradeWave(upgrades);
|
UpgradeWave result = new UpgradeWave(upgrades);
|
||||||
result.giveAll = this.giveAll;
|
result.giveAll = this.giveAll;
|
||||||
|
|
||||||
|
// From AbstractWave
|
||||||
|
result.setAmountMultiplier(getAmountMultiplier());
|
||||||
|
result.setHealthMultiplier(getHealthMultiplier());
|
||||||
|
result.setName(getName());
|
||||||
|
result.setSpawnpoints(getSpawnpoints());
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user