Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-01-25 09:23:11 +08:00
Code Issues Projects Releases Wiki Activity

Format code [skip actions]

Browse Source
This commit is contained in:
github-actions 2023-06-09 17:29:26 +00:00
parent e6d32f5599
commit a1f75e1537
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/emu/grasscutter/game/world/Scene.java
View File

@ -1156,7 +1156,8 @@ public final class Scene {
i -> { i -> {
var groupInstance = scriptManager.getGroupInstanceById(i.getGroupId()); var groupInstance = scriptManager.getGroupInstanceById(i.getGroupId());
if (groupInstance == null) return; if (groupInstance == null) return;
if (i.getSuiteIdList() != null && !i.getSuiteIdList().contains(groupInstance.getActiveSuiteId())) return; if (i.getSuiteIdList() != null
&& !i.getSuiteIdList().contains(groupInstance.getActiveSuiteId())) return;
sceneNpcBornEntries.add(i); sceneNpcBornEntries.add(i);
}); });
@ -1165,7 +1166,9 @@ public final class Scene {
Grasscutter.getLogger().trace("Loaded Npc Group Suite {}", sceneNpcBornEntries); Grasscutter.getLogger().trace("Loaded Npc Group Suite {}", sceneNpcBornEntries);
} }
return npcList.stream().filter(i -> this.npcBornEntrySet.contains(i) || sceneNpcBornEntries.contains(i)).toList(); return npcList.stream()
.filter(i -> this.npcBornEntrySet.contains(i) || sceneNpcBornEntries.contains(i))
.toList();
} }
public void loadGroupForQuest(List<QuestGroupSuite> sceneGroupSuite) { public void loadGroupForQuest(List<QuestGroupSuite> sceneGroupSuite) {