Only handle cuboid regions.

This commit is contained in:
FrozenCow 2011-08-10 15:14:48 +02:00
parent 81d68d5ac9
commit fdbce8df36

View File

@ -14,7 +14,7 @@ regionConstructors['WorldGuard'] = function(dynmap, configuration) {
return boxCreator(ArrayMax(xs), ArrayMin(xs), region['max-y'], region['min-y'], ArrayMax(zs), ArrayMin(zs)); return boxCreator(ArrayMax(xs), ArrayMin(xs), region['max-y'], region['min-y'], ArrayMax(zs), ArrayMin(zs));
} }
if(!region.min || !region.max) if(!region.min || !region.max)
return []; return null;
if(region.max.y <= region.min.y) if(region.max.y <= region.min.y)
region.min.y = region.max.y - 1; region.min.y = region.max.y - 1;
return boxCreator(region.max.x, region.min.x, region.max.y, region.min.y, region.max.z, region.min.z); return boxCreator(region.max.x, region.min.x, region.max.y, region.min.y, region.max.z, region.min.z);
@ -25,11 +25,16 @@ regionConstructors['WorldGuard'] = function(dynmap, configuration) {
$.getJSON('standalone/'+regionFile, function(data) { $.getJSON('standalone/'+regionFile, function(data) {
var boxLayers = []; var boxLayers = [];
$.each(data, function(name, region) { $.each(data, function(name, region) {
// Only handle cuboids for the moment (therefore skipping 'global')
if (region.type === 'cuboid') {
var boxLayer = createBoxFromRegion(region, configuration.createBoxLayer); var boxLayer = createBoxFromRegion(region, configuration.createBoxLayer);
// Skip errorous regions.
if (boxLayer) {
boxLayer.bindPopup(configuration.createPopupContent(name, region)); boxLayer.bindPopup(configuration.createPopupContent(name, region));
boxLayers.push(boxLayer); boxLayers.push(boxLayer);
}
}
}); });
configuration.result(new L.LayerGroup(boxLayers)); configuration.result(new L.LayerGroup(boxLayers));