Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2024-11-24 19:25:15 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote branch 'upstream/master'

Browse Source
This commit is contained in:
Mike Primm 2011-09-04 01:31:46 -05:00
commit 8bdce005c3
1 changed files with 3 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
web/js/minecraft.js
View File

@ -9,35 +9,10 @@ function createMinecraftHead(player,size,completed,failed) {
faceImage.src = dynmap.options.tileUrl + 'faces/' + size + 'x' + size + '/' + player + '.png'; faceImage.src = dynmap.options.tileUrl + 'faces/' + size + 'x' + size + '/' + player + '.png';
} }
var playerHeads = {};
function getMinecraftHead(player,size,completed) { function getMinecraftHead(player,size,completed) {
var key = player + '.' + size; createMinecraftHead(player, size, completed, function() {
var head = playerHeads[key]; console.error('Failed to retrieve face of "', player, '" with size "', size, '"!')
// Synchronous
if (!completed) {
return (!head || head.working) ? null : head;
}
// Asynchronous
if (!head) {
playerHeads[key] = { working: true, hooks: [{f:completed}] };
createMinecraftHead(player, size, function(head) {
hooks = playerHeads[key].hooks;
playerHeads[key] = head;
var i;
for(i=0;i<hooks.length;i++) {
hooks[i].f(head);
}
}, function() {
}); });
} else if (head.working) {
//console.log('Other process working on head of ',player,', will add myself to hooks...');
head.hooks[head.hooks.length] = {f:completed};
} else {
completed(head);
}
} }
function getMinecraftTime(servertime) { function getMinecraftTime(servertime) {