From ff67b5e945af6af7fd4f595da1dd27a8a884975a Mon Sep 17 00:00:00 2001
From: Jeremiah Billmann <jcbillmann@yahoo.com>
Date: Thu, 23 Oct 2014 16:54:23 +0000
Subject: [PATCH] Fixed a merging issue

---
 client/garageserver.io.js |  2 +-
 lib/garageserver.io.js    | 20 ++++++++++----------
 lib/garageservergame.js   |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/client/garageserver.io.js b/client/garageserver.io.js
index 95eb724..d46c9e6 100644
--- a/client/garageserver.io.js
+++ b/client/garageserver.io.js
@@ -405,7 +405,7 @@ var GarageServerIO = (function (socketio) {
                         newState = _options.onInterpolation(positions.previous.state, positions.target.state, amount);
                         entity.state = newState = _options.onInterpolation(entity.state, newState, _stateController.smoothingFactor);
                     }
-                    else if (entity.inputController.sequenceNumber === 1) {
+                    else {
                         entity.state = entity.latestUpdate().state;
                     }
                 }
diff --git a/lib/garageserver.io.js b/lib/garageserver.io.js
index 1b74e94..6e49dfb 100644
--- a/lib/garageserver.io.js
+++ b/lib/garageserver.io.js
@@ -39,9 +39,9 @@ function GarageServer(socketio, options) {
     this.registerSocketEvents(options);
     this.game = new garageServerGame(options, function (state, region) {
         if (!region) {
-            socketio.of(namespace).emit('update' ,state);
+            socketio.of(namespace).emit('u' ,state);
         } else {
-            socketio.of(namespace).in(region).emit('update' ,state);
+            socketio.of(namespace).in(region).emit('u' ,state);
         }
     });
 }
@@ -53,7 +53,7 @@ GarageServer.prototype.registerSocketEvents = function (options) {
         if (options.logging) {
             console.log('garageserver.io:: socket ' + socket.id + ' connection');
         }
-        socket.emit('state', {
+        socket.emit('s', {
             physicsDelta: (options.physicsInterval ? options.physicsInterval : 15) / 1000,
             smoothingFactor: options.smoothingFactor ? options.smoothingFactor : 0.3,
             interpolation: options.interpolation ? options.interpolation : false,
@@ -72,21 +72,21 @@ GarageServer.prototype.registerSocketEvents = function (options) {
             self.onPlayerDisconnect(socket, options);
         });
 
-        socket.on('input', function (data) {
+        socket.on('i', function (data) {
             if (options.logging) {
                 console.log('garageserver.io:: socket input ' +  socket.id + ' ' + data[0] + ' ' + data[1]);
             }
             self.onPlayerInput(socket, data, options);
         });
 
-        socket.on('ping', function (data) {
+        socket.on('p', function (data) {
             if (options.logging) {
                 console.log('garageserver.io:: socket ping ' + data);
             }
             self.onPing(socket, data, options);
         });
 
-        socket.on('event', function (data) {
+        socket.on('e', function (data) {
             if (options.logging) {
                 console.log('garageserver.io:: event ' + data);
             }
@@ -106,7 +106,7 @@ GarageServer.prototype.onPlayerConnect = function (socket, options) {
 
 GarageServer.prototype.onPlayerDisconnect = function (socket, options) {
     this.game.removePlayer(socket.id);
-    socket.broadcast.emit('removePlayer', socket.id);
+    socket.broadcast.emit('rp', socket.id);
     if (options.onPlayerDisconnect) {
         options.onPlayerDisconnect(socket);
     }
@@ -120,7 +120,7 @@ GarageServer.prototype.onPlayerInput = function (socket, input, options) {
 };
 
 GarageServer.prototype.onPing = function (socket, data, options) {
-    socket.emit('ping', data);
+    socket.emit('p', data);
     if (options.onPing) {
         options.onPing(socket, data);
     }
@@ -155,7 +155,7 @@ GarageServer.prototype.addEntity = function (id) {
 };
 
 GarageServer.prototype.removeEntity = function (id) {
-    this.io.of(this.socketPath).emit('removeEntity', id);
+    this.io.of(this.socketPath).emit('re', id);
     this.game.removeEntity(id);
 };
 
@@ -164,7 +164,7 @@ GarageServer.prototype.sendPlayerEvent = function (id, data) {
 };
 
 GarageServer.prototype.sendPlayersEvent = function (data) {
-    this.io.of(this.socketPath).emit('event', data);
+    this.io.of(this.socketPath).emit('e', data);
 };
 
 GarageServer.prototype.setPlayerRegion = function (id, region) {
diff --git a/lib/garageservergame.js b/lib/garageservergame.js
index e49fcbf..8460d4d 100644
--- a/lib/garageservergame.js
+++ b/lib/garageservergame.js
@@ -118,7 +118,7 @@ GarageServerGame.prototype.addPlayerInput = function (id, input, sequence, time)
 GarageServerGame.prototype.sendPlayerEvent = function (id, data) {
     this.playerController.entities.some(function (player) {
         if (player.id === id) {
-            player.socket.emit('event', data);
+            player.socket.emit('e', data);
             return true;
         }
     });