Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-01-10 04:12:54 +08:00
Code Issues Projects Releases Wiki Activity

Smarter NPC loading (#2199)

Browse Source
This commit is contained in:
Nazrin 2023-06-09 10:27:34 -07:00 committed by GitHub
parent b4b0b8d2a8
commit b412a24657
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -696,18 +696,6 @@ public final class Scene {
npcBornEntries.addAll(loadNpcForPlayer(player)); npcBornEntries.addAll(loadNpcForPlayer(player));
} }
// clear the unreachable group for client
var toUnload =
this.npcBornEntrySet.stream()
.filter(i -> !npcBornEntries.contains(i))
.map(SceneNpcBornEntry::getGroupId)
.toList();
if (toUnload.size() > 0) {
broadcastPacket(new PacketGroupUnloadNotify(toUnload));
Grasscutter.getLogger().trace("Unload NPC Group {}", toUnload);
}
// exchange the new npcBornEntry Set
this.npcBornEntrySet = npcBornEntries; this.npcBornEntrySet = npcBornEntries;
} }
@ -1160,14 +1148,24 @@ public final class Scene {
pos.toDoubleArray(), pos.toDoubleArray(),
Grasscutter.getConfig().server.game.loadEntitiesForPlayerRange); Grasscutter.getConfig().server.game.loadEntitiesForPlayerRange);
var sceneNpcBornEntries = var sceneNpcBornCanidates =
npcList.stream().filter(i -> !this.npcBornEntrySet.contains(i)).toList(); npcList.stream().filter(i -> !this.npcBornEntrySet.contains(i)).toList();
List<SceneNpcBornEntry> sceneNpcBornEntries = new ArrayList<>();
sceneNpcBornCanidates.forEach(
i -> {
var groupInstance = scriptManager.getGroupInstanceById(i.getGroupId());
if (groupInstance == null) return;
if (i.getSuiteIdList() != null && !i.getSuiteIdList().contains(groupInstance.getActiveSuiteId())) return;
sceneNpcBornEntries.add(i);
});
if (sceneNpcBornEntries.size() > 0) { if (sceneNpcBornEntries.size() > 0) {
this.broadcastPacket(new PacketGroupSuiteNotify(sceneNpcBornEntries)); this.broadcastPacket(new PacketGroupSuiteNotify(sceneNpcBornEntries));
Grasscutter.getLogger().trace("Loaded Npc Group Suite {}", sceneNpcBornEntries); Grasscutter.getLogger().trace("Loaded Npc Group Suite {}", sceneNpcBornEntries);
} }
return npcList;
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) {