repo: janusweb
action: commit
revision: 
path_from: 
revision_from: b9d51888afbf0b8edb083079919699a0166e548a:
path_to: 
revision_to: 

commit b9d51888afbf0b8edb083079919699a0166e548a
Author: James Baicoianu 
Date:   Sat Jul 18 18:10:18 2020 -0700

    Set remoteplayer.room before emitting janusweb_user_joined event

diff --git a/scripts/multiplayermanager.js b/scripts/multiplayermanager.js

--- a/scripts/multiplayermanager.js
+++ b/scripts/multiplayermanager.js
@@ -375,12 +375,13 @@ console.log('[MultiplayerManager] spawn remote guy', userId, roomId, room);
     this.handleUserMoved = function(msg) {
       var userId = msg.data.data.position._userId;

+      var room = this.rooms[msg.data.data.roomId] || this.activeroom;
       if (!this.remoteplayers[userId]) {
         var remoteplayer = this.spawnRemotePlayer(msg.data.data);
+        remoteplayer.setRoom(room);
         elation.events.fire({element: this, type: 'janusweb_user_joined', data: remoteplayer});
       } else {
         var remote = this.remoteplayers[userId];
-        var room = this.rooms[msg.data.data.roomId] || this.activeroom;
         var movedata = msg.data.data.position;

         if (remote.room !== room) {
@@ -409,10 +410,9 @@ console.log('[MultiplayerManager] spawn remote guy', userId, roomId, room);
     this.handleUserEnter = function(msg) {
       var remoteplayer = this.remoteplayers[msg.data.data.userId];
       console.log('[MultiplayerManager] player entered', msg, remoteplayer);
+      var room = this.rooms[msg.data.data.roomId];
       if (!remoteplayer) {
         remoteplayer = this.spawnRemotePlayer(msg.data.data);
-      } else {
-        var room = this.rooms[msg.data.data.roomId];
       }
       if (remoteplayer.room !== room) {
         remoteplayer.setRoom(room);

-----END OF PAGE-----