From e6d32f5599cb54930b6ffd78badeeed227334027 Mon Sep 17 00:00:00 2001 From: Nazrin Date: Fri, 9 Jun 2023 10:28:28 -0700 Subject: [PATCH] Make ice dude show up (#2200) * Make ice dude show up * replace contains with equals Might as well fix this while I'm here. "leave" and "enter" have the same number of letters, so it works. * empty strings suck * Update SceneTrigger.java --------- Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com> --- src/main/java/emu/grasscutter/scripts/SceneScriptManager.java | 3 ++- src/main/java/emu/grasscutter/scripts/data/SceneTrigger.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/emu/grasscutter/scripts/SceneScriptManager.java b/src/main/java/emu/grasscutter/scripts/SceneScriptManager.java index 16c322e9a..cb023fc01 100644 --- a/src/main/java/emu/grasscutter/scripts/SceneScriptManager.java +++ b/src/main/java/emu/grasscutter/scripts/SceneScriptManager.java @@ -810,7 +810,8 @@ public class SceneScriptManager { .stream() .filter( t -> - t.getCondition().contains(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()); diff --git a/src/main/java/emu/grasscutter/scripts/data/SceneTrigger.java b/src/main/java/emu/grasscutter/scripts/data/SceneTrigger.java index e2c50cdb0..f8720dec9 100644 --- a/src/main/java/emu/grasscutter/scripts/data/SceneTrigger.java +++ b/src/main/java/emu/grasscutter/scripts/data/SceneTrigger.java @@ -27,7 +27,7 @@ public final class SceneTrigger { @Override public int hashCode() { - return name.hashCode(); + return (currentGroup.id + name).hashCode(); } @Override