Only send locations that haven't been send yet.

Berserker66 · Dec 18, 2022 · ca38e3f · ca38e3f
1 parent 2410283
commit ca38e3f
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/mod/APState.cs b/mod/APState.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
@@ -336,7 +337,7 @@ static void Session_ErrorReceived(Exception e, string message)
 
         public static void Disconnect()
         {
-            if (Session != null && Session.Socket != null)
+            if (Session != null && Session.Socket != null && Session.Socket.Connected)
             {
                 Session.Socket.Disconnect();
             }
@@ -393,8 +394,11 @@ public static bool checkLocation(Vector3 position)
 
         public static void SendLocID(long id)
         {
-            ServerData.@checked.Add(id);
-            Task.Run(() => {Session.Locations.CompleteLocationChecksAsync(id); }).ConfigureAwait(false);
+            if (ServerData.@checked.Add(id))
+            {
+                Task.Run(() => {Session.Locations.CompleteLocationChecksAsync(
+                    ServerData.@checked.Except(Session.Locations.AllLocationsChecked).ToArray()); }).ConfigureAwait(false);
+            }
         }
 
         public static void unlock(TechType techType)

diff --git a/mod/Archipelago.csproj b/mod/Archipelago.csproj
@@ -47,8 +47,15 @@
     <PackageReference Include="Archipelago.MultiClient.Net" Version="4.1.2" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Remove="mod.json" />
+    <Content Include="mod.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-    <Exec Command="COPY $(TargetPath) D:\SteamLibrary\steamapps\common\Subnautica\BepInEx\plugins\Archipelago\Archipelago.dll&#xD;&#xA;COPY $(TargetDir)Archipelago.MultiClient.Net.dll D:\SteamLibrary\steamapps\common\Subnautica\BepInEx\plugins\Archipelago\Archipelago.MultiClient.Net.dll" />
+    <Exec Command="COPY $(TargetPath) D:\SteamLibrary\steamapps\common\Subnautica\BepInEx\plugins\Archipelago\Archipelago.dll&#xD;&#xA;&#xD;&#xA;COPY $(TargetDir)Archipelago.MultiClient.Net.dll D:\SteamLibrary\steamapps\common\Subnautica\BepInEx\plugins\Archipelago\Archipelago.MultiClient.Net.dll&#xD;&#xA;&#xD;&#xA;COPY $(TargetDir)mod.json D:\SteamLibrary\steamapps\common\Subnautica\BepInEx\plugins\Archipelago\mod.json" />
   </Target>
 
 </Project>
diff --git a/mod/MainPatcher.cs b/mod/MainPatcher.cs
@@ -32,7 +32,7 @@ private void Awake()
     //Common interface
     public static class APWrapper
     {
-        public const string Version = "1.3.3";
+        public const string Version = "1.3.4";
         public static void Init()
         {
             // Plugin startup logic

diff --git a/mod/mod.json b/mod/mod.json
@@ -2,7 +2,7 @@
     "Id": "Archipelago",
     "DisplayName": "Archipelago",
     "Author": "Berserker",
-    "Version": "1.3.2",
+    "Version": "1.3.4",
     "Enable": true,
     "Game": "Subnautica",
     "AssemblyName": "Archipelago.dll",