don't send scouts or location checks of not-missing locations. prevents disconnects due to sending invalid location ids.

Author: KonoTyran

build.gradle

@@ -7,7 +7,7 @@ plugins {
 
 archivesBaseName = "Archipelago.MultiClient.Java"
 group = 'gg.archipelago.APClient'
-version = '1.9'
+version = '1.10'
 
 java.toolchain.languageVersion = JavaLanguageVersion.of(8)
 

src/main/java/gg/archipelago/client/ArchipelagoClient.java

@@ -43,7 +43,6 @@ public abstract class ArchipelagoClient {
     private final LocationManager locationManager;
     private final ItemManager itemManager;
     private final EventManager eventManager;
-    private final DeathLink deathLink;
 
     public static final Version protocolVersion = new Version(0, 3, 7);
 
@@ -64,7 +63,6 @@ public ArchipelagoClient() {
         locationManager = new LocationManager(this);
         itemManager = new ItemManager(this);
         archipelagoClient = this;
-        deathLink = new DeathLink(this);
     }
 
     public void setGame(String game) {
@@ -245,6 +243,7 @@ public boolean checkLocations(Collection<Long> locationIDs) {
     }
 
     public void scoutLocations(ArrayList<Long> locationIDs) {
+        locationIDs.removeIf( location -> !locationManager.getMissingLocations().contains(location));
         archipelagoWebSocket.scoutLocation(locationIDs);
     }
 

src/main/java/gg/archipelago/client/ItemManager.java

@@ -42,7 +42,7 @@ public void receiveItems(ArrayList<NetworkItem> ids, int index) {
         else {
             if(webSocket != null) {
                 webSocket.sendPacket(new SyncPacket());
-                archipelagoClient.getLocationManager().sendAllLocations();
+                archipelagoClient.getLocationManager().resendAllCheckedLocations();
             }
         }
     }

src/main/java/gg/archipelago/client/LocationManager.java

@@ -21,10 +21,11 @@ public boolean checkLocation(long id) {
         return checkLocations(Collections.singletonList(id));
     }
 
-    public boolean checkLocations(Collection<Long> id) {
-        checkedLocations.addAll(id);
+    public boolean checkLocations(Collection<Long> ids) {
+        ids.removeIf( location -> !missingLocations.contains(location));
+        checkedLocations.addAll(ids);
         LocationChecks packet = new LocationChecks();
-        packet.locations.addAll(id);
+        packet.locations.addAll(ids);
         if(webSocket == null)
             return false;
 
@@ -47,7 +48,7 @@ public void sendIfChecked(Set<Long> missingChecks) {
             webSocket.sendPacket(packet);
     }
 
-    public void sendAllLocations() {
+    public void resendAllCheckedLocations() {
         if (webSocket == null)
                 return;
         LocationChecks packet = new LocationChecks();
@@ -64,7 +65,7 @@ public Set<Long> getCheckedLocations() {
     }
 
     public Set<Long> getMissingLocations() {
-        return checkedLocations;
+        return missingLocations;
     }
 
     public void addCheckedLocations(Set<Long> newLocations) {