Merge pull request #4101 from Kkrafy/develop

Fix for error when executing a token macro as a player with the current map not visible

src/main/java/net/rptools/maptool/client/ClientMessageHandler.java

@@ -18,6 +18,8 @@
 import java.awt.Point;
 import java.awt.geom.Area;
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.stream.Collectors;
@@ -341,12 +343,16 @@ private void handle(SetZoneVisibilityMsg msg) {
 
           var zone = MapTool.getCampaign().getZone(zoneGUID);
           zone.setVisible(visible);
-
           ZoneRenderer currentRenderer = MapTool.getFrame().getCurrentZoneRenderer();
           if (!visible
               && !MapTool.getPlayer().isGM()
               && currentRenderer != null
               && currentRenderer.getZone().getId().equals(zoneGUID)) {
+            Collection<GUID> AllTokenIDs = new ArrayList<>();
+            for (Token token : currentRenderer.getZone().getAllTokens()) {
+              AllTokenIDs.add(token.getId());
+            }
+            currentRenderer.getSelectionModel().removeTokensFromSelection(AllTokenIDs);
             MapTool.getFrame().setCurrentZoneRenderer(null);
           }
           if (visible && currentRenderer == null) {