Merge pull request #665 from Diyagi/custom_payload

[FaloopIntegration] Remove SpawnRelease handler and fix SpawnState search logic.
SlashNephy · Jul 7, 2024 · 80e4650 · 80e4650
2 parents f900480 + ac3fe87
commit 80e4650
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 15 deletions.
diff --git a/FaloopIntegration/Faloop/Model/MobReportData.cs b/FaloopIntegration/Faloop/Model/MobReportData.cs
@@ -41,7 +41,6 @@ public static class MobReportActions
 {
     public const string Spawn = "spawn";
     public const string SpawnLocation = "spawn_location";
-    public const string SpawnRelease = "spawn_release";
     public const string SpawnFalse = "spawn_false";
     public const string Death = "death";
 }

diff --git a/FaloopIntegration/FaloopIntegration.cs b/FaloopIntegration/FaloopIntegration.cs
@@ -166,7 +166,10 @@ private void OnMobReport(MobReportData data)
                         }
                     }
 
-                    var previous = Config.SpawnStates.FirstOrDefault(x => x.MobId == mobData.BNpcId && x.WorldId == worldId);
+                    var previous = Config.SpawnStates.FirstOrDefault(x =>
+                        x.MobId == mobData.BNpcId &&
+                        x.WorldId == worldId &&
+                        x.ZoneInstance == data.Ids.ZoneInstance);
                     if (previous == default)
                     {
                         DalamudLog.Log.Debug("OnMobReport: previous == null");
@@ -176,19 +179,6 @@ private void OnMobReport(MobReportData data)
                     OnMobSpawn(ev, config.Channel);
                     break;
                 }
-            case MobReportActions.SpawnRelease when config.EnableSpawnReport:
-                {
-                    var spawn = JsonSerializer.Deserialize<MobReportData.SpawnRelease>(data.Data) ?? throw new InvalidOperationException("invalid spawn release data");
-                    var previous = Config.SpawnStates.FirstOrDefault(x => x.MobId == mobData.BNpcId && x.WorldId == worldId);
-                    if (previous == default)
-                    {
-                        DalamudLog.Log.Debug("OnMobReport: previous == null");
-                        break;
-                    }
-                    var ev = new MobSpawnEvent(mobData.BNpcId, worldId, previous.TerritoryTypeId, data.Ids.ZoneInstance, mobData.Rank, spawn.Timestamp, previous.Reporter, previous.Location);
-                    OnMobSpawn(ev, config.Channel);
-                    break;
-                }
             case MobReportActions.SpawnFalse when config.EnableSpawnReport:
                 {
                     var ev = new MobDeathEvent(mobData.BNpcId, worldId, data.Ids.ZoneInstance, mobData.Rank, DateTime.Now);