Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2025-01-27 01:51:43 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3297 from Programie/v3.0

Browse Source 
Fixed not replacing {timestamp} placeholder in configuration request
This commit is contained in:
mikeprimm 2021-03-11 20:36:58 -06:00 committed by GitHub
commit a628611aa0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DynmapCore/src/main/resources/extracted/web/js/map.js
View File

@ -25,7 +25,7 @@ function DynMap(options) {
if(me.checkForSavedURL()) if(me.checkForSavedURL())
return; return;
me.options = options; me.options = options;
$.getJSON(me.options.url.configuration, function(configuration) { $.getJSON(me.formatUrl("configuration", { timestamp: me.lasttimestamp }), function(configuration) {
if(configuration.error == 'login-required') { if(configuration.error == 'login-required') {
me.saveURL(); me.saveURL();
window.location = 'login.html'; window.location = 'login.html';
@ -47,7 +47,7 @@ DynMap.prototype = {
registeredTiles: [], registeredTiles: [],
players: {}, players: {},
lasttimestamp: new Date().getUTCMilliseconds(), /* Pseudorandom - prevent cached '?0' */ lasttimestamp: new Date().getTime(), /* Pseudorandom - prevent cached '?0' */
reqid: 0, reqid: 0,
servertime: 0, servertime: 0,
serverday: false, serverday: false,