Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-02-13 12:23:21 +08:00
Code Issues Projects Releases Wiki Activity

Format code [skip actions]

Browse Source
This commit is contained in:
github-actions 2023-07-23 03:18:53 +00:00
parent e9d68936f6
commit f065b2b16f
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/emu/grasscutter/scripts/SceneScriptManager.java
View File

@ -639,23 +639,23 @@ public class SceneScriptManager {
// add other types of entity // add other types of entity
var entities = var entities =
getScene().getEntities().values().stream() getScene().getEntities().values().stream()
.filter( .filter(e -> region.getMetaRegion().contains(e.getPosition()))
e ->
region.getMetaRegion().contains(e.getPosition()))
.toList(); .toList();
var entitiesIds = entities.stream().map(GameEntity::getId).toList(); var entitiesIds = entities.stream().map(GameEntity::getId).toList();
var enterEntities = entitiesIds.stream().filter(e -> !region.getEntities().contains(e)).toList(); var enterEntities =
var leaveEntities = region.getEntities().stream().filter(e -> !entitiesIds.contains(e)).toList(); entitiesIds.stream().filter(e -> !region.getEntities().contains(e)).toList();
var leaveEntities =
region.getEntities().stream().filter(e -> !entitiesIds.contains(e)).toList();
entities.forEach(region::addEntity); entities.forEach(region::addEntity);
for (var targetId : enterEntities){ for (var targetId : enterEntities) {
Grasscutter.getLogger() Grasscutter.getLogger()
.trace("Call EVENT_ENTER_REGION_{}", region.getMetaRegion().config_id); .trace("Call EVENT_ENTER_REGION_{}", region.getMetaRegion().config_id);
this.callEvent( this.callEvent(
new ScriptArgs(region.getGroupId(), EventType.EVENT_ENTER_REGION, region.getConfigId()) new ScriptArgs(region.getGroupId(), EventType.EVENT_ENTER_REGION, region.getConfigId())
.setEventSource(EntityIdType.toEntityType(targetId>>24).getValue()) .setEventSource(EntityIdType.toEntityType(targetId >> 24).getValue())
.setSourceEntityId(region.getId()) .setSourceEntityId(region.getId())
.setTargetEntityId(targetId)); .setTargetEntityId(targetId));
} }
@ -670,7 +670,7 @@ public class SceneScriptManager {
for (var targetId : leaveEntities) { for (var targetId : leaveEntities) {
this.callEvent( this.callEvent(
new ScriptArgs(region.getGroupId(), EventType.EVENT_LEAVE_REGION, region.getConfigId()) new ScriptArgs(region.getGroupId(), EventType.EVENT_LEAVE_REGION, region.getConfigId())
.setEventSource(EntityIdType.toEntityType(targetId>>24).getValue()) .setEventSource(EntityIdType.toEntityType(targetId >> 24).getValue())
.setSourceEntityId(region.getId()) .setSourceEntityId(region.getId())
.setTargetEntityId(targetId)); .setTargetEntityId(targetId));
} }