From 0883042510c6dc850bc40123634662d565c5a583 Mon Sep 17 00:00:00 2001
From: Jeremiah Billmann <jcbillmann@yahoo.com>
Date: Sun, 14 Jul 2013 14:35:15 -0400
Subject: [PATCH] Code cleanup

---
 lib/server/garageserver.io.js  | 16 ++++++++--------
 lib/server/garageservergame.js | 15 ++++++---------
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/lib/server/garageserver.io.js b/lib/server/garageserver.io.js
index f06446d..e1bf673 100644
--- a/lib/server/garageserver.io.js
+++ b/lib/server/garageserver.io.js
@@ -105,10 +105,18 @@ GarageServer.prototype.getPlayers = function () {
     return this.game.getPlayers();
 };
 
+GarageServer.prototype.getEntities = function () {
+    return this.game.getEntities();
+};
+
 GarageServer.prototype.updatePlayerState = function (id, state) {
     this.game.updatePlayerState(id, state);
 };
 
+GarageServer.prototype.updateEntityState = function (id, state) {
+    this.game.updateEntityState(id, state);
+};
+
 GarageServer.prototype.addEntity = function (id, state) {
     this.game.addEntity(id, state);
 };
@@ -117,14 +125,6 @@ GarageServer.prototype.removeEntity = function (id) {
     this.game.removeEntity(id);
 };
 
-GarageServer.prototype.updateEntityState = function (id, state) {
-    this.game.updateEntityState(id, state);
-};
-
-GarageServer.prototype.getEntities = function () {
-    return this.game.getEntities();
-};
-
 exports.createGarageServer = function (io, options) {
     return new GarageServer(io, options);
 };
\ No newline at end of file
diff --git a/lib/server/garageservergame.js b/lib/server/garageservergame.js
index 63fc6cc..2f2b073 100644
--- a/lib/server/garageservergame.js
+++ b/lib/server/garageservergame.js
@@ -64,20 +64,17 @@ GarageServerGame.prototype.getPlayer = function (id) {
 };
 
 GarageServerGame.prototype.updatePlayerState = function (id, state) {
-    var currentTime = new Date().getTime() - this.startTime;
-
-    this.playerController.entities.some(function (player) {
-        if (player.id === id) {
-            player.addState(state, currentTime);
-            return true;
-        }
-    });
+    this.updateState(this.playerController, id, state);
 };
 
 GarageServerGame.prototype.updateEntityState = function (id, state) {
+    this.updateState(this.entityController, id, state);
+};
+
+GarageServerGame.prototype.updateState = function (controller, id, state) {
     var currentTime = new Date().getTime() - this.startTime;
 
-    this.entityController.entities.some(function (entity) {
+    controller.entities.some(function (entity) {
         if (entity.id === id) {
             entity.addState(state, currentTime);
             return true;