Merge remote branch 'upstream/master'

This commit is contained in:
Mike Primm 2011-11-21 12:02:15 -06:00
commit f1c04f6198
2 changed files with 5 additions and 1 deletions

View File

@ -96,7 +96,7 @@
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>1.0.0-R1-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>

View File

@ -10,6 +10,10 @@ componentconstructors['markers'] = function(dynmap, configuration) {
set.layergroup.removeLayer(marker.our_marker);
});
set.markers = {};
$.each(set.areas, function(aname, area) {
set.layergroup.removeLayer(area.our_area);
});
set.areas = {};
});
}