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

some fixes

Browse source
This commit is contained in:
arp 2020-10-09 14:53:18 +02:00
parent 4af46b1b3f
commit 5e54fc2c26
6 changed files with 76 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

2
front/src/Connexion/ConnectionManager.ts
View file

@ -48,7 +48,7 @@ class ConnectionManager {
public connectToRoomSocket(roomId: string, name: string, characterLayers: string[], position: PositionInterface, viewport: ViewportInterface): Promise<RoomConnection> {
return new Promise<RoomConnection>((resolve, reject) => {
const connection = new RoomConnection(this.authToken as string, roomId, name, characterLayers, position, viewport);
const connection = new RoomConnection(this.authToken, roomId, name, characterLayers, position, viewport);
connection.onConnectError((error: object) => {
console.log('An error occurred while connecting to socket server. Retrying');
reject(error);

4
front/src/Connexion/RoomConnection.ts
View file

@ -53,10 +53,10 @@ export class RoomConnection implements RoomConnection {
* @param token A JWT token containing the UUID of the user
* @param roomId The ID of the room in the form "_/[instance]/[map_url]" or "@/[org]/[event]/[map]"
*/
public constructor(token: string, roomId: string, name: string, characterLayers: string[], position: PositionInterface, viewport: ViewportInterface) {
public constructor(token: string|null, roomId: string, name: string, characterLayers: string[], position: PositionInterface, viewport: ViewportInterface) {
let url = API_URL.replace('http://', 'ws://').replace('https://', 'wss://');
url += '/room/'+roomId
url += '?token='+encodeURIComponent(token);
url += '?token='+(token ?encodeURIComponent(token):'');
url += '&name='+encodeURIComponent(name);
for (let layer of characterLayers) {
url += '&characterLayers='+encodeURIComponent(layer);

6
front/src/Phaser/Entity/GameSceneDescriptor.ts
View file

@ -1,6 +0,0 @@
export class GameSceneDescriptor {
constructor(MapKey : string, MapUrlFile: string, instance: string, key: string) {
this.roomId = '';//
}
}