remove playerSocket map

Author: michaljaz

src/index.coffee

@@ -13,7 +13,6 @@ module.exports=(mode)->
 	convert = new Convert()
 	helmet = require "helmet"
 
-	playerSocket={}
 	port=process.env.PORT or 8080
 
 	app.use helmet()
@@ -34,48 +33,42 @@ module.exports=(mode)->
 	io.sockets.on "connection", (socket)->
 		query=socket.handshake.query
 		console.log "[\x1b[32m+\x1b[0m] #{query.nick}"
+		heldItem=null
 
-		playerSocket[socket.id]=
-			bot:mineflayer.createBot {
-				host: config.ip
-				port: config.port
-				username: query.nick
-				version: config.version
-			}
-
-		bot=()->
-			if playerSocket[socket.id] isnt undefined
-				return playerSocket[socket.id].bot
-			else
-				return null
+		bot=mineflayer.createBot {
+			host: config.ip
+			port: config.port
+			username: query.nick
+			version: config.version
+		}
 
 		emit=(array)->
 			io.to(socket.id).emit array...
 
-		bot()._client.on "map_chunk",(packet)->
+		bot._client.on "map_chunk",(packet)->
 			cell=new Chunk()
 			cell.load packet.chunkData,packet.bitMap,true,true
 			emit ["mapChunk", cell.sections,packet.x,packet.z,packet.biomes]
 			return
-		bot()._client.on "respawn",(packet)->
+		bot._client.on "respawn",(packet)->
 			emit ["dimension",packet.dimension.value.effects.value]
 			return
 		botEventMap=
 			"heldItemChanged":(item)->
-				playerSocket[socket.id].held=item
+				heldItem=item
 				return
 			"login":()->
-				emit ["dimension",bot().game.dimension]
+				emit ["dimension",bot.game.dimension]
 				return
 			"move":()->
-				emit ["move",bot().entity.position]
+				emit ["move",bot.entity.position]
 				return
 			"health":()->
-				emit ["hp",bot().health]
-				emit ["food",bot().food]
+				emit ["hp",bot.health]
+				emit ["food",bot.food]
 				return
 			"spawn":()->
-				emit ["spawn",bot().entity.yaw,bot().entity.pitch]
+				emit ["spawn",bot.entity.yaw,bot.entity.pitch]
 				return
 			"kicked":(reason,loggedIn)->
 				emit ["kicked",reason]
@@ -84,7 +77,7 @@ module.exports=(mode)->
 				emit ["msg",convert.toHtml(msg.toAnsi())]
 				return
 			"experience":()->
-				emit ["xp",bot().experience]
+				emit ["xp",bot.experience]
 				return
 			"blockUpdate":(oldb,newb)->
 				emit ["blockUpdate",[newb.position.x,newb.position.y,newb.position.z,newb.stateId]]
@@ -97,79 +90,78 @@ module.exports=(mode)->
 				return
 		for i of botEventMap
 			((i)->
-				playerSocket[socket.id].bot.on i, ()->
-					if bot() isnt null
+				bot.on i, ()->
+					if bot isnt null
 						botEventMap[i] arguments...
 					return
 			)(i)
 		inv=""
-		playerSocket[socket.id].int=setInterval ()->
-			inv_new=JSON.stringify(bot().inventory.slots)
+		interval=setInterval ()->
+			inv_new=JSON.stringify(bot.inventory.slots)
 			if inv isnt inv_new
 				inv=inv_new
-				emit ["inventory",bot().inventory.slots]
+				emit ["inventory",bot.inventory.slots]
 			entities=[]
-			for k,v of bot().entities
+			for k,v of bot.entities
 				if v.type is "mob"
 					entities.push [v.position.x,v.position.y,v.position.z]
 			emit ["entities",entities]
 			return
 		,10
 		socketEventMap=
 			"blockPlace":(pos,vec)->
-				block=bot().blockAt(new vec3(pos...))
+				block=bot.blockAt(new vec3(pos...))
 				vecx=[
 					[1,0,0]
 					[-1,0,0]
 					[0,1,0]
 					[0,-1,0]
 				]
-				if playerSocket[socket.id].held isnt undefined and playerSocket[socket.id].held isnt null
-					console.log playerSocket[socket.id].held
-					bot().placeBlock block,new vec3(vec...),(r)->
+				if heldItem isnt undefined and heldItem isnt null
+					console.log heldItem
+					bot.placeBlock block,new vec3(vec...),(r)->
 						console.log r
 						return
 				return
 			"invc":(num)->
-				item=bot().inventory.slots[num+36]
+				item=bot.inventory.slots[num+36]
 				if item isnt null and item isnt undefined
-					bot().equip item,"hand"
-				else if playerSocket[socket.id].held isnt undefined
-					bot().unequip "hand"
+					bot.equip item,"hand"
+				else if heldItem isnt undefined
+					bot.unequip "hand"
 				return
 			"move":(state,toggle)->
-				bot().setControlState(state,toggle)
+				bot.setControlState(state,toggle)
 				return
 			"command":(com)->
-				bot().chat(com)
+				bot.chat(com)
 				return
 			"rotate":(data)->
-				bot().look data...
+				bot.look data...
 				return
 			"disconnect":()->
 				try
-					clearInterval playerSocket[socket.id].int
+					clearInterval interval
 					console.log "[\x1b[31m-\x1b[0m] #{query.nick}"
-					playerSocket[socket.id].bot.end()
-					delete playerSocket[socket.id]
+					bot.end()
 				return
 			"dig":(pos)->
-				block=bot().blockAt(vec3(pos[0],pos[1]-16,pos[2]))
+				block=bot.blockAt(vec3(pos[0],pos[1]-16,pos[2]))
 				if block isnt null
-					digTime=bot().digTime(block)
-					if bot().targetDigBlock isnt null
+					digTime=bot.digTime(block)
+					if bot.targetDigBlock isnt null
 						console.log "Already digging..."
-						bot().stopDigging()
+						bot.stopDigging()
 					emit ["digTime",digTime,block]
 					console.log "Start"
-					bot().dig block,false,(xd)->
+					bot.dig block,false,(xd)->
 						if xd is undefined
 							console.log "SUCCESS"
 						else
 							console.log "FAIL"
 				return
 			"stopDigging":(callback)->
-				bot().stopDigging()
+				bot.stopDigging()
 				return
 		for i of socketEventMap
 			socket.on i,socketEventMap[i]