Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-30 13:58:42 +00:00
Code Issues Projects Releases Wiki Activity

Fix #719

Browse Source
This commit is contained in:
Akka 2022-05-09 17:01:08 +08:00
parent d00465125d
commit bf8f4fba52
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/emu/grasscutter/scripts/service/ScriptMonsterSpawnService.java
View File

@ -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){

6
src/main/java/emu/grasscutter/scripts/service/ScriptMonsterTideService.java
View File

@ -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
this.sceneScriptManager.callEvent(EventType.EVENT_MONSTER_TIDE_DIE, new ScriptArgs(this.monsterKillCount.get()));
} }
// spawn the last turn of monsters
// fix the 5-2
this.sceneScriptManager.callEvent(EventType.EVENT_MONSTER_TIDE_DIE, new ScriptArgs(this.monsterKillCount.get()));
} }
} }