Fix GarageServer.IO to run with Socket.IO >= 1.4 - #28

jbillmann · Mar 25, 2016 · 2d40823 · 2d40823
1 parent 2fde1ab
commit 2d40823
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/lib/controllers/playercontroller.js b/lib/controllers/playercontroller.js
@@ -13,7 +13,7 @@ PlayerController.prototype.add = function (socket) {
     var newPlayer, playerFound = false;
 
     this.entities.some(function (player) {
-        if (player.id === socket.id) {
+        if (player.id === socket.client.id) {
             newPlayer = player;
             playerFound = true;
             return true;

diff --git a/lib/entities/player.js b/lib/entities/player.js
@@ -3,7 +3,7 @@ var entity = require('./entity');
 exports = module.exports = Player;
 
 function Player (socket, maxHistorySecondBuffer) {
-    entity.call(this, socket.id, null, null, maxHistorySecondBuffer);
+    entity.call(this, socket.client.id, null, null, maxHistorySecondBuffer);
     this.socket = socket;
     this.inputs = [];
 }

diff --git a/lib/garageserver.io.js b/lib/garageserver.io.js
@@ -52,7 +52,7 @@ GarageServer.prototype.registerSocketEvents = function (options) {
 
     self.io.of(self.socketPath).on('connection', function (socket) {
         if (options.logging) {
-            console.log('garageserver.io:: socket ' + socket.id + ' connection');
+            console.log('garageserver.io:: socket ' + socket.client.id + ' connection');
         }
         socket.emit('s', {
             physicsDelta: (options.physicsInterval ? options.physicsInterval : 15) / 1000,
@@ -68,14 +68,14 @@ GarageServer.prototype.registerSocketEvents = function (options) {
 
         socket.on('disconnect', function () {
             if (options.logging) {
-                console.log('garageserver.io:: socket ' + socket.id + ' disconnect');
+                console.log('garageserver.io:: socket ' + socket.client.id + ' disconnect');
             }
             self.onPlayerDisconnect(socket, options);
         });
 
         socket.on('i', function (data) {
             if (options.logging) {
-                console.log('garageserver.io:: socket input ' +  socket.id + ' ' + data[0] + ' ' + data[1]);
+                console.log('garageserver.io:: socket input ' +  socket.client.id + ' ' + data[0] + ' ' + data[1]);
             }
             self.onPlayerInput(socket, data, options);
         });
@@ -106,15 +106,15 @@ GarageServer.prototype.onPlayerConnect = function (socket, options) {
 };
 
 GarageServer.prototype.onPlayerDisconnect = function (socket, options) {
-    this.game.removePlayer(socket.id);
-    socket.broadcast.emit('rp', socket.id);
+    this.game.removePlayer(socket.client.id);
+    socket.broadcast.emit('rp', socket.client.id);
     if (options.onPlayerDisconnect) {
         options.onPlayerDisconnect(socket);
     }
 };
 
 GarageServer.prototype.onPlayerInput = function (socket, input, options) {
-    this.game.addPlayerInput(socket.id, input[0], input[1], input[2]);
+    this.game.addPlayerInput(socket.client.id, input[0], input[1], input[2]);
     if (options.onPlayerInput) {
         options.onPlayerInput(socket, input);
     }