_Bastler/partey_workadventure
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/metadataScriptingApi' into metadataScriptingApi

Browse Source
This commit is contained in:
GRL
2021-05-28 12:13:25 +02:00
parent 858a513569 5d8d729bd7
commit 276b404dd9
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
front/src/Connexion/RoomConnection.ts
+4 -4
View File
@@ -177,9 +177,9 @@ export class RoomConnection implements RoomConnection {
} else if (message.hasWorldfullmessage()) { } else if (message.hasWorldfullmessage()) {
worldFullMessageStream.onMessage(); worldFullMessageStream.onMessage();
this.closed = true; this.closed = true;
} else if (message.hasWorldconnexionmessage()) { } else if (message.hasWorldconnexionmessage()) {
worldFullMessageStream.onMessage(message.getWorldconnexionmessage()?.getMessage()); worldFullMessageStream.onMessage(message.getWorldconnexionmessage()?.getMessage());
this.closed = true; this.closed = true;
} else if (message.hasWebrtcsignaltoclientmessage()) { } else if (message.hasWebrtcsignaltoclientmessage()) {
this.dispatch(EventMessage.WEBRTC_SIGNAL, message.getWebrtcsignaltoclientmessage()); this.dispatch(EventMessage.WEBRTC_SIGNAL, message.getWebrtcsignaltoclientmessage());
} else if (message.hasWebrtcscreensharingsignaltoclientmessage()) { } else if (message.hasWebrtcscreensharingsignaltoclientmessage()) {
@@ -617,7 +617,7 @@ export class RoomConnection implements RoomConnection {
this.socket.send(clientToServerMessage.serializeBinary().buffer); this.socket.send(clientToServerMessage.serializeBinary().buffer);
} }
public getAllTag() : string[] { public getAllTags() : string[] {
return this.tags; return this.tags;
} }
} }
front/src/Phaser/Game/GameScene.ts
+1 -1
View File
@@ -923,7 +923,7 @@ ${escapedMessage}
uuid: localUserStore.getLocalUser()?.uuid, uuid: localUserStore.getLocalUser()?.uuid,
nickname: localUserStore.getName(), nickname: localUserStore.getName(),
roomId: this.RoomId, roomId: this.RoomId,
tags: this.connection ? this.connection.getAllTag() : [] tags: this.connection ? this.connection.getAllTags() : []
}) })
})); }));