Commit eb2b2392 authored by Akka's avatar Akka Committed by Melledy
Browse files

Fix #719

parent 6197ab21
...@@ -28,11 +28,11 @@ public class ScriptMonsterSpawnService { ...@@ -28,11 +28,11 @@ public class ScriptMonsterSpawnService {
onMonsterCreatedListener.add(consumer); onMonsterCreatedListener.add(consumer);
} }
public void addMonsterDeadListener(Consumer<EntityMonster> consumer){ public void addMonsterDeadListener(Consumer<EntityMonster> consumer){
onMonsterCreatedListener.add(consumer); onMonsterDeadListener.add(consumer);
} }
public void onMonsterDead(EntityMonster entityMonster){ public void onMonsterDead(EntityMonster entityMonster){
onMonsterCreatedListener.stream().forEach(l -> l.accept(entityMonster)); onMonsterDeadListener.forEach(l -> l.accept(entityMonster));
} }
public void spawnMonster(int groupId, SceneMonster monster) { public void spawnMonster(int groupId, SceneMonster monster) {
if(monster == null){ if(monster == null){
......
...@@ -66,9 +66,9 @@ public class ScriptMonsterTideService { ...@@ -66,9 +66,9 @@ public class ScriptMonsterTideService {
if(this.monsterTideCount.get() > 0){ if(this.monsterTideCount.get() > 0){
// add more // add more
this.sceneScriptManager.getScriptMonsterSpawnService().spawnMonster(this.currentGroup.id, getNextMonster()); this.sceneScriptManager.getScriptMonsterSpawnService().spawnMonster(this.currentGroup.id, getNextMonster());
}else if(this.monsterAlive.get() == 0){ }
// spawn the last turn of monsters // spawn the last turn of monsters
// fix the 5-2
this.sceneScriptManager.callEvent(EventType.EVENT_MONSTER_TIDE_DIE, new ScriptArgs(this.monsterKillCount.get())); this.sceneScriptManager.callEvent(EventType.EVENT_MONSTER_TIDE_DIE, new ScriptArgs(this.monsterKillCount.get()));
} }
}
} }
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment