Upstream/DungeonsXL
1
0
Fork 0
mirror of https://github.com/DRE2N/DungeonsXL.git synced 2025-02-13 19:01:27 +01:00
Code Issues Projects Releases Wiki Activity

Don't count mobs that don't spawn in the current wave; resolves #89

Browse Source
This commit is contained in:
Daniel Saukel 2016-06-17 16:21:26 +02:00
parent e3aeebd07f
commit 774491e00d
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/io/github/dre2n/dungeonsxl/world/GameWorld.java
View File

@ -32,7 +32,11 @@ import io.github.dre2n.dungeonsxl.player.DGamePlayer;
import io.github.dre2n.dungeonsxl.reward.RewardChest;
import io.github.dre2n.dungeonsxl.sign.DSign;
import io.github.dre2n.dungeonsxl.sign.MobSign;
import io.github.dre2n.dungeonsxl.trigger.MobTrigger;
import io.github.dre2n.dungeonsxl.trigger.ProgressTrigger;
import io.github.dre2n.dungeonsxl.trigger.RedstoneTrigger;
import io.github.dre2n.dungeonsxl.trigger.Trigger;
import io.github.dre2n.dungeonsxl.trigger.TriggerTypeDefault;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
@ -345,11 +349,20 @@ public class GameWorld {
public int getMobCount() {
int mobCount = 0;
signs:
for (DSign dSign : dSigns) {
if (!(dSign instanceof MobSign)) {
continue;
}
for (Trigger trigger : dSign.getTriggers()) {
if (trigger.getType() == TriggerTypeDefault.PROGRESS) {
if (((ProgressTrigger) trigger).getFloorCount() > getGame().getFloorCount()) {
break signs;
}
}
}
mobCount += ((MobSign) dSign).getInitialAmount();
}