From 073943c799f3dce108700783cd34f90df9f6f68a Mon Sep 17 00:00:00 2001
From: Anna <git@anna.lgbt>
Date: Sun, 19 Feb 2023 22:44:59 -0500
Subject: [PATCH] fix: handle delay better

---
 client/Messages.cs | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/client/Messages.cs b/client/Messages.cs
index edc5dfd..bb1fba7 100644
--- a/client/Messages.cs
+++ b/client/Messages.cs
@@ -87,6 +87,7 @@ internal class Messages : IDisposable {
         this.Plugin.Framework.Update += this.DetermineIfSpawn;
         this.Plugin.Framework.Update += this.RemoveConditionally;
         this.Plugin.Framework.Update += this.HandleSpawnQueue;
+        this.Plugin.ClientState.TerritoryChanged += this.TerritoryChanged;
         this.Plugin.ClientState.Login += this.SpawnVfx;
         this.Plugin.ClientState.Logout += this.RemoveVfx;
     }
@@ -94,6 +95,7 @@ internal class Messages : IDisposable {
     public void Dispose() {
         this.Plugin.ClientState.Logout -= this.RemoveVfx;
         this.Plugin.ClientState.Login -= this.SpawnVfx;
+        this.Plugin.ClientState.TerritoryChanged -= this.TerritoryChanged;
         this.Plugin.Framework.Update -= this.HandleSpawnQueue;
         this.Plugin.Framework.Update -= this.RemoveConditionally;
         this.Plugin.Framework.Update -= this.DetermineIfSpawn;
@@ -102,15 +104,27 @@ internal class Messages : IDisposable {
     }
 
     private readonly Stopwatch _timer = new();
+
+    private void TerritoryChanged(object? sender, ushort e) {
+        this._territoryChanged = true;
+        this.RemoveVfx();
+    }
+
     private ushort _lastTerritory;
+    private bool _territoryChanged;
 
     private void DetermineIfSpawn(Framework framework) {
         var current = this.Plugin.ClientState.TerritoryType;
-        if (current != this._lastTerritory && this.Plugin.ClientState.LocalPlayer != null) {
+
+        var diffTerritory = current != this._lastTerritory;
+        var playerPresent = this.Plugin.ClientState.LocalPlayer != null;
+
+        if ((this._territoryChanged || diffTerritory) && playerPresent) {
+            this._territoryChanged = false;
             this._timer.Start();
         }
 
-        if (this._timer.Elapsed >= TimeSpan.FromSeconds(1)) {
+        if (this._timer.Elapsed >= TimeSpan.FromSeconds(1.5)) {
             this._timer.Reset();
             this.SpawnVfx();
         }
@@ -161,10 +175,6 @@ internal class Messages : IDisposable {
         this.SpawnVfx();
     }
 
-    private void SpawnVfx(object? sender, ushort e) {
-        this.SpawnVfx();
-    }
-
     internal void SpawnVfx() {
         var territory = this.Plugin.ClientState.TerritoryType;
         if (territory == 0 || this.Plugin.Config.BannedTerritories.Contains(territory)) {