@@ -644,6 +644,7 @@ public void checkRegions() {
644
644
.trace ("Call EVENT_ENTER_REGION_{}" , region .getMetaRegion ().config_id );
645
645
this .callEvent (
646
646
new ScriptArgs (region .getGroupId (), EventType .EVENT_ENTER_REGION , region .getConfigId ())
647
+ .setEventSource (EntityType .Avatar .getValue ())
647
648
.setSourceEntityId (region .getId ())
648
649
.setTargetEntityId (targetId ));
649
650
@@ -660,6 +661,7 @@ public void checkRegions() {
660
661
if (region .entityHasLeft ()) {
661
662
this .callEvent (
662
663
new ScriptArgs (region .getGroupId (), EventType .EVENT_LEAVE_REGION , region .getConfigId ())
664
+ .setEventSource (EntityType .Avatar .getValue ())
663
665
.setSourceEntityId (region .getId ())
664
666
.setTargetEntityId (region .getFirstEntityId ()));
665
667
@@ -810,10 +812,8 @@ private void realCallEvent(@Nonnull ScriptArgs params) {
810
812
.stream ()
811
813
.filter (
812
814
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 ())))
817
817
.collect (Collectors .toSet ());
818
818
default -> this .getTriggersByEvent (eventType ).stream ()
819
819
.filter (
0 commit comments