1 files changed, 8 insertions, 7 deletions

diff --git a/app.js b/app.js
index 3610b08..5dbb1aa 100644
--- a/app.js
+++ b/app.js
@@ -132,7 +132,7 @@ function updateTime ( user, now, connected ) {
 	var newCount = user.count + time;
 	user.count = newCount;
 	user.save(function(err) {
-    	if(err) { throw err; }
+    if(err) { throw err; }
 	});
 }
 
@@ -148,13 +148,14 @@ timeout = setInterval(function(){
 
 io.sockets.on('connection', function (socket) {
 
-	getHighScores(function(err, users) {
+	getHighScores(function(err, scoreUsers) {
 		scores = [];
-		for (var i = 0; i < users.length; i++) {
+		for (var i = 0; i < scoreUsers.length; i++) {
 			scores.push({
-				firstname: users[i].firstname,
-				lastname: users[i].lastname,
-				count: users[i].count
+				firstname: scoreUsers[i].firstname,
+				lastname: scoreUsers[i].lastname,
+				count: scoreUsers[i].count,
+				id: scoreUsers[i].id
 			});
 		}
 		socket.emit('scores', {
@@ -200,7 +201,7 @@ io.sockets.on('connection', function (socket) {
 	});
 	
 	socket.on('mouse', function(data){
-		if (! socket.user || ! data || ! data.x || ! data.y) return;
+		if (! socket.user || ! data || ! data.x || ! data.y || !( socket.user.id in users )) return;
 		users[socket.user.id].x = data.x;
 		users[socket.user.id].y = data.y;
 		io.sockets.volatile.emit('mouse', data);