From f6b26b965bb102691a2df6fe113f9b95702ae614 Mon Sep 17 00:00:00 2001 From: nhamer Date: Wed, 18 Jan 2017 19:40:56 -0800 Subject: [PATCH 1/3] Don't process entity if none returned --- code/map_data_request.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/code/map_data_request.js b/code/map_data_request.js index 514eabd8..24222b9a 100644 --- a/code/map_data_request.js +++ b/code/map_data_request.js @@ -72,8 +72,10 @@ window.MapDataRequest = function() { // add a portalDetailLoaded hook, so we can use the exteneed details to update portals on the map var _this = this; - addHook('portalDetailLoaded',function(data){ - _this.render.processGameEntities([data.ent]); + addHook('portalDetailLoaded', function(data){ + if(data.success) { + _this.render.processGameEntities([data.ent]); + } }); } From c1bebcc38d9cf13775c6493345914e1792beec7a Mon Sep 17 00:00:00 2001 From: nhamer Date: Wed, 18 Jan 2017 19:41:23 -0800 Subject: [PATCH 2/3] typos --- code/map_data_request.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/map_data_request.js b/code/map_data_request.js index 24222b9a..6bcabf1c 100644 --- a/code/map_data_request.js +++ b/code/map_data_request.js @@ -65,12 +65,12 @@ window.MapDataRequest = function() { this.REFRESH_CLOSE = 300; // refresh time to use for close views z>12 when not idle and not moving this.REFRESH_FAR = 900; // refresh time for far views z <= 12 - this.FETCH_TO_REFRESH_FACTOR = 2; //minumum refresh time is based on the time to complete a data fetch, times this value + this.FETCH_TO_REFRESH_FACTOR = 2; //minimum refresh time is based on the time to complete a data fetch, times this value // ensure we have some initial map status this.setStatus ('startup', undefined, -1); - // add a portalDetailLoaded hook, so we can use the exteneed details to update portals on the map + // add a portalDetailLoaded hook, so we can use the extended details to update portals on the map var _this = this; addHook('portalDetailLoaded', function(data){ if(data.success) { From c576e0ab5d70f9b7512036545139129b56e8e2cb Mon Sep 17 00:00:00 2001 From: nhamer Date: Sun, 12 Feb 2017 09:00:36 -0800 Subject: [PATCH 3/3] Fix broken artifact after shard is relocated --- code/artifact.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/code/artifact.js b/code/artifact.js index 28b61b3a..8c88fefe 100644 --- a/code/artifact.js +++ b/code/artifact.js @@ -96,6 +96,11 @@ window.artifact.processResult = function (portals) { for (var guid in portals) { var ent = portals[guid]; var data = decodeArray.portalSummary(ent); + + if (!data.artifactBrief) { + // 2/12/2017 - Shard removed from a portal leaves it in artifact results but has no artifactBrief + continue; + } // we no longer know the faction for the target portals, and we don't know which fragment numbers are at the portals // all we know, from the portal summary data, for each type of artifact, is that each artifact portal is