Skip to content

Commit 83d447c

Browse files
authored
Update region logic (#2240)
1 parent 4ec274f commit 83d447c

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/main/java/emu/grasscutter/scripts/SceneScriptManager.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -644,6 +644,7 @@ public void checkRegions() {
644644
.trace("Call EVENT_ENTER_REGION_{}", region.getMetaRegion().config_id);
645645
this.callEvent(
646646
new ScriptArgs(region.getGroupId(), EventType.EVENT_ENTER_REGION, region.getConfigId())
647+
.setEventSource(EntityType.Avatar.getValue())
647648
.setSourceEntityId(region.getId())
648649
.setTargetEntityId(targetId));
649650

@@ -660,6 +661,7 @@ public void checkRegions() {
660661
if (region.entityHasLeft()) {
661662
this.callEvent(
662663
new ScriptArgs(region.getGroupId(), EventType.EVENT_LEAVE_REGION, region.getConfigId())
664+
.setEventSource(EntityType.Avatar.getValue())
663665
.setSourceEntityId(region.getId())
664666
.setTargetEntityId(region.getFirstEntityId()));
665667

@@ -810,10 +812,8 @@ private void realCallEvent(@Nonnull ScriptArgs params) {
810812
.stream()
811813
.filter(
812814
t ->
813-
!t.getCondition().isEmpty()
814-
&& t.getCondition().substring(29).equals(String.valueOf(params.param1))
815-
&& (t.getSource().isEmpty()
816-
|| t.getSource().equals(params.getEventSource())))
815+
t.getName().substring(13).equals(String.valueOf(params.param1))
816+
&& (t.getSource().isEmpty() || t.getSource().equals(params.getEventSource())))
817817
.collect(Collectors.toSet());
818818
default -> this.getTriggersByEvent(eventType).stream()
819819
.filter(

0 commit comments

Comments
 (0)