Merge branch 'develop' of github.com:thecodingmachine/workadventure

This commit is contained in:
_Bastler
2021-10-15 16:33:44 +02:00
4 changed files with 330 additions and 1 deletions
+6 -1
View File
@@ -289,6 +289,12 @@ export class GameScene extends DirtyScene {
this.onMapLoad(data);
}
);
// If the map has already been loaded as part of another GameScene, the "on load" event will not be triggered.
// In this case, we check in the cache to see if the map is here and trigger the event manually.
if (this.cache.tilemap.exists(this.MapUrlFile)) {
const data = this.cache.tilemap.get(this.MapUrlFile);
this.onMapLoad(data);
}
return;
}
@@ -1231,7 +1237,6 @@ export class GameScene extends DirtyScene {
iframeListener.registerAnswerer("removeActionMessage", (message) => {
layoutManagerActionStore.removeAction(message.uuid);
});
}
private setPropertyLayer(