fix: player clusters not being clickable

Author: TGRHavoc

dist/first-bundle.js

@@ -120,7 +120,22 @@ $(document).ready(function(){
     });
 });
 
-function initControls(Map, PlayerMarkers){
+function initMapControl(Map){
+    // When a layer changes. Recalculate everything and shit. Make sure nothing breaks.
+    Map.on("baselayerchange", function (e) {
+
+        var mapBounds = getMapBounds(e.layer);
+
+        Map.setMaxBounds(mapBounds);
+        Map.fitBounds(mapBounds);
+        CurrentLayer = e.layer;
+
+        clearAllMarkers();
+        toggleBlips();
+    });
+}
+
+function initPlayerMarkerControls(Map, PlayerMarkers){
 
     // If they click on a clustered marker
     PlayerMarkers.on('clusterclick', function (a) {
@@ -149,17 +164,4 @@ function initControls(Map, PlayerMarkers){
 
         Map.openPopup(html, a.layer.getLatLng());
     });
-
-    // When a layer changes. Recalculate everything and shit. Make sure nothing breaks.
-    Map.on("baselayerchange", function (e) {
-
-        var mapBounds = getMapBounds(e.layer);
-
-        Map.setMaxBounds(mapBounds);
-        Map.fitBounds(mapBounds);
-        CurrentLayer = e.layer;
-
-        clearAllMarkers();
-        toggleBlips();
-    });
 }

dist/last-bundle.js

@@ -61,7 +61,8 @@ function mapInit(elementID) {
     var control = new L.Control.CustomLayer(tileLayers).addTo(Map);
     Map.addLayer(PlayerMarkers);
 
-    initControls(Map, PlayerMarkers);
+    initMapControl(Map);
+    initPlayerMarkerControls(Map, PlayerMarkers);
 }
 
 function createMarker(animated, draggable, objectRef, title) {
@@ -129,14 +130,18 @@ function clearAllMarkers() {
     }
     if(Map != undefined){
         Map.removeLayer(window.PlayerMarkers); // Remove the cluster layer
-
-        window.PlayerMarkers = L.markerClusterGroup({ // Re-make it fresh
-            maxClusterRadius: 20,
-            spiderfyOnMaxZoom: false,
-            showCoverageOnHover: false,
-            zoomToBoundsOnClick: false
-        });
-        Map.addLayer(window.PlayerMarkers); // Add it back. The clearAllMarkers() will ensure player markers are added to the new cluster layer
+        window.PlayerMarkers = undefined;
+
+        setTimeout(() => {
+            window.PlayerMarkers = L.markerClusterGroup({ // Re-make it fresh
+                maxClusterRadius: 20,
+                spiderfyOnMaxZoom: false,
+                showCoverageOnHover: false,
+                zoomToBoundsOnClick: false
+            });
+            Map.addLayer(window.PlayerMarkers); // Add it back. The clearAllMarkers() will ensure player markers are added to the new cluster layer
+            initPlayerMarkerControls(Map, PlayerMarkers); //Reinitialise the event to allow clicking...
+        }, 1000);
     }
 }
 

js/src/controls.2.js

@@ -260,7 +260,8 @@ function updateBlip(blipObj) {
 }
 
 function playerLeft(playerName) {
-    if (localCache[playerName].marker != null || localCache[playerName].marker != undefined) {
+    if (localCache[playerName] !== undefined &&
+            (localCache[playerName].marker != null || localCache[playerName].marker != undefined)) {
         clearMarker(localCache[playerName].marker);
         delete localCache[playerName];
     }