adapter changes that i cant recall creating due to them being done a while ago

Author: hcortezr

src/pocketnode/network/PlayerSessionAdapter.js

@@ -7,6 +7,9 @@ const ResourcePackStackPacket = pocketnode("network/minecraft/protocol/ResourceP
 const ResourcePackChunkRequestPacket = pocketnode("network/minecraft/protocol/ResourcePackChunkRequestPacket");
 const ResourcePackChunkDataPacket = pocketnode("network/minecraft/protocol/ResourcePackChunkDataPacket");
 const RequestChunkRadiusPacket = pocketnode("network/minecraft/protocol/RequestChunkRadiusPacket");
+const PlayStatusPacket = pocketnode("network/minecraft/protocol/PlayStatusPacket");
+
+const Chunk = pocketnode("level/chunk/Chunk");
 
 const TextPacket = pocketnode("network/minecraft/protocol/TextPacket");
 
@@ -54,11 +57,12 @@ class PlayerSessionAdapter {
         this.server.getLogger().debugExtensive("Status:", ResourcePackClientResponsePacket.STATUS(packet.status));
         switch(packet.status){
             case ResourcePackClientResponsePacket.STATUS_REFUSED:
-                this.close("", "You must accept resource packs to join this server.", true);
+                this.player.close("", "You must accept resource packs to join this server.", true);
                 break;
 
             case ResourcePackClientResponsePacket.STATUS_SEND_PACKS:
                 manager = this.server.getResourcePackManager();
+                packet.packIds.shift();//todo figure out why the first id is 00000000-0000-0000-0000-000000000000
                 for(let i in packet.packIds){
                     let uuid = packet.packIds[i];
                     let pack = manager.getPackById(uuid);
@@ -118,6 +122,36 @@ class PlayerSessionAdapter {
 
     handleRequestChunkRadius(packet){
         this.player.setViewDistance(packet.radius);
+
+        let distance = this.player.getViewDistance();
+        for(let chunkX = -distance; chunkX <= distance; chunkX++){
+            for(let chunkZ = -distance; chunkZ <= distance; chunkZ++){
+                let chunk = new Chunk(chunkX, chunkZ);
+
+                for(let z = 0; z < 16; ++z){
+                    for(let x = 0; x < 16; ++x){
+                        let y = 0;
+                        //chunk.setBlockId(x, y++, z, 7);
+                        //chunk.setBlockId(x, y++, z, 3);
+                        //chunk.setBlockId(x, y++, z, 3);
+                        chunk.setBlockId(x, y++, z, 2);
+
+                        chunk.setHeight(y);
+
+                        for(let i = y - 1; i >= 0; i--){
+                            chunk.setBlockSkyLight(x, y, z, 0);
+                        }
+                    }
+                }
+
+                chunk.recalculateHeightMap();
+
+                this.player.sendChunk(chunk);
+            }
+        }
+
+        this.player.sendPlayStatus(PlayStatusPacket.PLAYER_SPAWN);
+
         return true;
     }
 

src/pocketnode/network/RakNetAdapter.js

@@ -37,25 +37,20 @@ class RakNetAdapter {
             let identifier = this.players.getPlayerIdentifier(player);
 
             if(packet instanceof BatchPacket){
-                this.raknet.getSessionManager().getSessionByIdentifier(identifier).queueConnectedPacket(packet, (needACK === true ? RakNet.FLAG_NEED_ACK : 0) | (immediate === true ? RakNet.PRIORITY_IMMEDIATE : RakNet.PRIORITY_NORMAL));
+                let session;
+                if((session = this.raknet.getSessionManager().getSessionByIdentifier(identifier))){
+                    session.queueConnectedPacket(packet, (needACK === true ? RakNet.FLAG_NEED_ACK : 0) | (immediate === true ? RakNet.PRIORITY_IMMEDIATE : RakNet.PRIORITY_NORMAL));
+                }
                 return null;
             }else{
                 this.server.batchPackets([player], [packet], true, immediate);
-                this.logger.debugExtensive("Sending "+packet.getName()+":", packet.buffer);
+                //this.logger.debugExtensive("Sending "+packet.getName()+":", packet.buffer);
             }
         }
     }
 
     tick(){
-        this.raknet.getSessionManager().readOutgoingMessages().forEach(message => {
-            switch(message.purpose){
-                case "openSession":
-                    let player = new Player(this.server, message.data.clientId, message.data.ip, message.data.port);
-                    this.players.addPlayer(message.data.identifier, player);
-                    this.server.getPlayerList().addPlayer(message.data.identifier, player);
-                    break;
-            }
-        });
+        this.raknet.getSessionManager().readOutgoingMessages().forEach(message => this._handleIncomingMessage(message.purpose, message.data));
 
         this.raknet.getSessionManager().getSessions().forEach(session => {
             let player = this.players.getPlayer(session.toString());
@@ -79,6 +74,23 @@ class RakNetAdapter {
     shutdown(){
         this.raknet.shutdown();
     }
+
+    _handleIncomingMessage(purpose, data){
+        switch(purpose){
+            case "openSession":
+                let player = new Player(this.server, data.clientId, data.ip, data.port);
+                this.players.addPlayer(data.identifier, player);
+                this.server.getPlayerList().addPlayer(data.identifier, player);
+                break;
+
+            case "closeSession":
+                if(this.players.has(data.identifier)){
+                    let player = this.players.get(data.identifier);
+                    player.close(player.getLeaveMessage(), data.reason);
+                }
+                break;//
+        }
+    }
 }
 
 module.exports = RakNetAdapter;