Kraut.World/server
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed merge errors

Browse source
This commit is contained in:
jonny 2021-06-15 15:19:45 +02:00
parent 238f333b81
commit 7712bd685b
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
front/src/Phaser/Game/GameScene.ts
View file

@ -1102,10 +1102,10 @@ ${escapedMessage}
}
//todo: push that into the gameManager
private loadNextGame(exitSceneIdentifier: string): void {
private loadNextGame(exitSceneIdentifier: string): Promise<void> {
const {roomId, hash} = Room.getIdFromIdentifier(exitSceneIdentifier, this.MapUrlFile, this.instance);
const room = new Room(roomId);
gameManager.loadMap(room, this.scene).catch(() => {});
return gameManager.loadMap(room, this.scene).catch(() => {});
}
private startUser(layer: ITiledMapTileLayer): PositionInterface {

2
front/src/iframe_api.ts
View file

@ -13,7 +13,7 @@ import type {PlaySoundEvent} from "./Api/Events/PlaySoundEvent";
import type { StopSoundEvent } from "./Api/Events/StopSoundEvent";
import type { LoadSoundEvent } from "./Api/Events/LoadSoundEvent";
import SoundConfig = Phaser.Types.Sound.SoundConfig;
import { LoadPageEvent } from './Api/Events/LoadPageEvent';
import type { LoadPageEvent } from './Api/Events/LoadPageEvent';
interface WorkAdventureApi {
sendChatMessage(message: string, author: string): void;