Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-01-24 17:32:52 +08:00
Code Issues Projects Releases Wiki Activity

Re-apply changes which were discarded from running Spotless

Browse Source
This commit is contained in:
KingRainbow44 2023-05-10 19:22:32 -04:00
parent f9a7eecc1a
commit 7c065b33d6
No known key found for this signature in database
GPG Key ID: FC2CB64B00D257BE
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -796,23 +796,21 @@ public final class Scene {
return true; return true;
} }
public synchronized void checkGroups() { public void checkGroups() {
Set<Integer> visible = Set<Integer> visible =
this.players.stream() this.players.stream()
.map(player -> this.getPlayerActiveGroups(player)) .map(this::getPlayerActiveGroups)
.flatMap(Collection::stream) .flatMap(Collection::stream)
.collect(Collectors.toSet()); .collect(Collectors.toSet());
Iterator<SceneGroup> it = this.loadedGroups.iterator(); for (var group : this.loadedGroups) {
while (it.hasNext()) {
SceneGroup group = it.next();
if (!visible.contains(group.id) && !group.dynamic_load) if (!visible.contains(group.id) && !group.dynamic_load)
unloadGroup(scriptManager.getBlocks().get(group.block_id), group.id); unloadGroup(scriptManager.getBlocks().get(group.block_id), group.id);
} }
List<SceneGroup> toLoad = var toLoad =
visible.stream() visible.stream()
.filter(g -> this.loadedGroups.stream().filter(gr -> gr.id == g).count() == 0) .filter(g -> this.loadedGroups.stream().noneMatch(gr -> gr.id == g))
.map( .map(
g -> { g -> {
for (var b : scriptManager.getBlocks().values()) { for (var b : scriptManager.getBlocks().values()) {
@ -834,7 +832,7 @@ public final class Scene {
this.getScriptManager().loadBlockFromScript(block); this.getScriptManager().loadBlockFromScript(block);
scriptManager.getLoadedGroupSetPerBlock().put(block.id, new HashSet<>()); scriptManager.getLoadedGroupSetPerBlock().put(block.id, new HashSet<>());
Grasscutter.getLogger().debug("Scene {} Block {} loaded.", this.getId(), block.id); Grasscutter.getLogger().trace("Scene {} block {} loaded.", this.getId(), block.id);
} }
public int loadDynamicGroup(int group_id) { public int loadDynamicGroup(int group_id) {
@ -1004,7 +1002,7 @@ public final class Scene {
if (this.scriptManager.getLoadedGroupSetPerBlock().get(block.id).isEmpty()) { if (this.scriptManager.getLoadedGroupSetPerBlock().get(block.id).isEmpty()) {
this.scriptManager.getLoadedGroupSetPerBlock().remove(block.id); this.scriptManager.getLoadedGroupSetPerBlock().remove(block.id);
Grasscutter.getLogger().debug("Scene {} Block {} is unloaded.", this.getId(), block.id); Grasscutter.getLogger().trace("Scene {} block {} is unloaded.", this.getId(), block.id);
} }
this.broadcastPacket(new PacketGroupUnloadNotify(List.of(group_id))); this.broadcastPacket(new PacketGroupUnloadNotify(List.of(group_id)));