[fix] Response to review comments

PunishXIV · Aug 22, 2024 · 492298e · 492298e
1 parent fb57c0c
commit 492298e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/Splatoon/Memory/AttachedInfo.cs b/Splatoon/Memory/AttachedInfo.cs
@@ -169,7 +169,7 @@ static void Tick(object _)
                         {
                             text = $"{b.Name} starts casting {b.CastActionId} ({b.NameId}>{b.CastActionId})";
                         }
-                        ScriptingProcessor.OnStartingCast(b.DataId, b.CastActionId);
+                        ScriptingProcessor.OnStartingCast(b.EntityId, b.CastActionId);
                         P.ChatMessageQueue.Enqueue(text);
                         if (P.Config.Logging)
                         {

diff --git a/SplatoonScripts/Duties/Dawntrail/R2S Venom Love Pair Split.cs b/SplatoonScripts/Duties/Dawntrail/R2S Venom Love Pair Split.cs
@@ -23,7 +23,7 @@ private enum PairSplit
     }
     public override HashSet<uint>? ValidTerritories { get; } = [1228];
 
-    public override Metadata? Metadata => new(1, "Redmoon");
+    public override Metadata? Metadata => new(2, "Redmoon");
 
     const uint PoisonResistanceDownDebuffID = 3935;
     bool IsShow = false;
@@ -38,8 +38,12 @@ public override void OnSetup()
 
     public override void OnStartingCast(uint source, uint castId)
     {
-        PluginLog.Log($"StartingCast {source} {castId}");
-        if (source == 0 || source != 16941) return;
+        var sourceObj = source.GetObject();
+        if (sourceObj == null)
+            return;
+
+        if (sourceObj.DataId == 0 || sourceObj.DataId != 16941)
+            return;
 
         if ((castId == 37252) || (castId == 39688) )
         {
@@ -63,8 +67,6 @@ public override void OnActionEffectEvent(ActionEffectSet set)
         if (set.Action == null || (set.Source == null)) return;
         if (set.Source.DataId == 0) return;
 
-        PluginLog.Log($"ActionEffectEvent {set.Action.Name} {set.Action.RowId} {set.Source.DataId}");
-
         if ((set.Action.RowId == 37256) && (set.Source.DataId == 16945))
         {
             HideElement();