Upstream
/
BlueMap
mirror of https://github.com/BlueMap-Minecraft/BlueMap.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'mc/1.13'

This commit is contained in:
Blue (Lukas Rieger) 2020-04-20 18:10:27 +02:00
parent e410734108 341c1591fd
commit 12d944657d
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
BlueMapCore/src/main/webroot/js/libs/hud/MarkerManager.js
View File

@ -13,7 +13,8 @@ export default class MarkerManager {
this.readyPromise =
this.loadMarkerData()
.then(this.loadMarkers);
.catch(ignore => {})
.then(this.loadMarkers);
$(document).on('bluemap-map-change', this.onBlueMapMapChange);
}
@ -34,9 +35,11 @@ export default class MarkerManager {
}
loadMarkers = () => {
this.markerData.markerSets.forEach(setData => {
this.markerSets.push(new MarkerSet(this.blueMap, setData));
});
if (this.markerData && this.markerData.markerSets) {
this.markerData.markerSets.forEach(setData => {
this.markerSets.push(new MarkerSet(this.blueMap, setData));
});
}
};
update(){

2
gradle.properties
View File

@ -1,6 +1,6 @@
org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false
coreVersion=0.6.0
coreVersion=0.6.1
targetVersion=mc1.15