Update region logic (#2240)

Grasscutters · Jun 27, 2023 · 83d447c · 83d447c
1 parent 4ec274f
commit 83d447c
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/main/java/emu/grasscutter/scripts/SceneScriptManager.java b/src/main/java/emu/grasscutter/scripts/SceneScriptManager.java
@@ -644,6 +644,7 @@ public void checkRegions() {
                         .trace("Call EVENT_ENTER_REGION_{}", region.getMetaRegion().config_id);
                 this.callEvent(
                         new ScriptArgs(region.getGroupId(), EventType.EVENT_ENTER_REGION, region.getConfigId())
+                                .setEventSource(EntityType.Avatar.getValue())
                                 .setSourceEntityId(region.getId())
                                 .setTargetEntityId(targetId));
 
@@ -660,6 +661,7 @@ public void checkRegions() {
             if (region.entityHasLeft()) {
                 this.callEvent(
                         new ScriptArgs(region.getGroupId(), EventType.EVENT_LEAVE_REGION, region.getConfigId())
+                                .setEventSource(EntityType.Avatar.getValue())
                                 .setSourceEntityId(region.getId())
                                 .setTargetEntityId(region.getFirstEntityId()));
 
@@ -810,10 +812,8 @@ private void realCallEvent(@Nonnull ScriptArgs params) {
                                 .stream()
                                 .filter(
                                         t ->
-                                                !t.getCondition().isEmpty()
-                                                        && t.getCondition().substring(29).equals(String.valueOf(params.param1))
-                                                        && (t.getSource().isEmpty()
-                                                                || t.getSource().equals(params.getEventSource())))
+                                                t.getName().substring(13).equals(String.valueOf(params.param1))
+                                                && (t.getSource().isEmpty() || t.getSource().equals(params.getEventSource())))
                                 .collect(Collectors.toSet());
                         default -> this.getTriggersByEvent(eventType).stream()
                                 .filter(