Updated to latest build.

Author: jython234

pom.xml

@@ -8,6 +8,13 @@
     <artifactId>JRakLib</artifactId>
     <version>1.0-SNAPSHOT</version>
 
+    <distributionManagement>
+        <snapshotRepository>
+            <id>snapshot-repo</id>
+            <url>http://repo.blockserver.org/snapshots</url>
+        </snapshotRepository>
+    </distributionManagement>
+
     <dependencies>
         <dependency>
             <groupId>org.apache.commons</groupId>

src/main/java/net/beaconpe/jraklib/protocol/DataPacket.java

@@ -21,7 +21,6 @@ All credit goes to the PocketMine Project (http://pocketmine.net)
  */
 package net.beaconpe.jraklib.protocol;
 
-import com.sun.xml.internal.bind.v2.runtime.unmarshaller.XsiNilLoader;
 import net.beaconpe.jraklib.Binary;
 
 import java.util.ArrayList;

src/main/java/net/beaconpe/jraklib/protocol/EncapsulatedPacket.java

@@ -24,6 +24,7 @@ All credit goes to the PocketMine Project (http://pocketmine.net)
 import net.beaconpe.jraklib.Binary;
 
 import java.nio.ByteBuffer;
+import java.util.Arrays;
 
 /**
  * Represents an encapsulated packet inside a CustomPacket
@@ -110,7 +111,7 @@ public int getTotalLength(boolean internal){
 
     public byte[] toBinary(boolean internal){
         int offset = 0;
-        ByteBuffer bb = ByteBuffer.allocate(getTotalLength(internal));
+        ByteBuffer bb = ByteBuffer.allocate(1024 * 1024 * 32);
         bb.put((byte) ((byte) (reliability << 5) | (hasSplit ? 0b00010000 : 0)));
         if(internal){
             bb.put(Binary.writeInt(buffer.length));
@@ -136,8 +137,9 @@ public byte[] toBinary(boolean internal){
         }
 
         bb.put(buffer);
-
-        return bb.array();
+        byte[] data = Arrays.copyOf(bb.array(), bb.position());
+        bb = null;
+        return data;
     }
 
     public byte[] toBinary(){

src/main/java/net/beaconpe/jraklib/protocol/Packet.java

@@ -58,6 +58,15 @@ protected byte[] get(int len){
         }
     }
 
+    public void setBuffer(byte[] buffer, int offset){
+        this.buffer = buffer;
+        this.offset = offset;
+    }
+
+    public int getOffset(){
+        return offset;
+    }
+
     protected byte[] get(){
         return Binary.subbytes(buffer, offset);
     }

src/main/java/net/beaconpe/jraklib/server/ServerHandler.java

@@ -26,6 +26,7 @@ All credit goes to the PocketMine Project (http://pocketmine.net)
 import net.beaconpe.jraklib.protocol.EncapsulatedPacket;
 
 import java.nio.ByteBuffer;
+import java.util.Arrays;
 
 /**
  * Handler that provides easy communication with the server.
@@ -45,9 +46,10 @@ public void sendEncapsulated(String identifier, EncapsulatedPacket packet){
     }
 
     public void sendEncapsulated(String identifier, EncapsulatedPacket packet, byte flags){
-        ByteBuffer bb = ByteBuffer.allocate(3+identifier.getBytes().length+packet.getTotalLength(true));
+        ByteBuffer bb = ByteBuffer.allocate(1024*1024*2);
         bb.put(JRakLib.PACKET_ENCAPSULATED).put((byte) identifier.getBytes().length).put(identifier.getBytes()).put(flags).put(packet.toBinary(true));
-        server.pushMainToThreadPacket(bb.array());
+        server.pushMainToThreadPacket(Arrays.copyOf(bb.array(), bb.position()));
+        bb = null;
     }
 
     public void sendRaw(String address, short port, byte[] payload){
@@ -93,6 +95,9 @@ protected void invalidSession(String identifier){
 
     public boolean handlePacket(){
         byte[] packet = server.readThreadToMainPacket();
+        if(packet == null){
+            return false;
+        }
         if(packet.length > 0){
             byte id = packet[0];
             int offset = 1;

src/main/java/net/beaconpe/jraklib/server/Session.java

@@ -439,10 +439,11 @@ private void handleEncapsulatedPacketRoute(EncapsulatedPacket packet) throws IOE
                 sendPacket.reliability = 0;
                 sendPacket.buffer = pk.buffer;
                 addToQueue(sendPacket);
-            } //TODO: add PING/PONG (0x00/0x03) automatic latency measure
-        } else if(state  == STATE_CONNECTED){
-            sessionManager.streamEncapsulated(this, packet);
-            //TODO: stream channels
+             //TODO: add PING/PONG (0x00/0x03) automatic latency measure
+            } else if(state  == STATE_CONNECTED) {
+                sessionManager.streamEncapsulated(this, packet);
+                //TODO: stream channels
+            }
         } else {
             preJoinQueue.add(packet);
         }