diff --git a/src/main/java/emu/grasscutter/scripts/SceneScriptManager.java b/src/main/java/emu/grasscutter/scripts/SceneScriptManager.java index cb023fc01..612425646 100644 --- a/src/main/java/emu/grasscutter/scripts/SceneScriptManager.java +++ b/src/main/java/emu/grasscutter/scripts/SceneScriptManager.java @@ -810,8 +810,8 @@ public class SceneScriptManager { .stream() .filter( t -> - !t.getCondition().isEmpty() && - t.getCondition().substring(29).equals(String.valueOf(params.param1)) + !t.getCondition().isEmpty() + && t.getCondition().substring(29).equals(String.valueOf(params.param1)) && (t.getSource().isEmpty() || t.getSource().equals(params.getEventSource()))) .collect(Collectors.toSet());