Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 9 additions & 11 deletions src/main/java/net/beaconpe/jraklib/server/Session.java
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public class Session {

private Map<Integer, DataPacket> recoveryQueue = new ConcurrentHashMap<>();

private Map<Short, Map<Integer, EncapsulatedPacket>> splitPackets = new ConcurrentHashMap<>();
private Map<Short, EncapsulatedPacket[]> splitPackets = new ConcurrentHashMap<>();

private Map<Integer, Map<Integer, Integer>> needACK = new ConcurrentHashMap<>();

Expand Down Expand Up @@ -265,7 +265,7 @@ public void addEncapsulatedToQueue(EncapsulatedPacket packet) throws IOException
}

public void addEncapsulatedToQueue(EncapsulatedPacket packet, byte flags) throws IOException {
if((packet.needACK = (flags & JRakLib.FLAG_NEED_ACK) > 0) == true){
if((packet.needACK = (flags & JRakLib.FLAG_NEED_ACK) > 0)){
needACK.put(packet.identifierACK, new ConcurrentHashMap<>());
}

Expand Down Expand Up @@ -313,23 +313,21 @@ private void handleSplit(EncapsulatedPacket packet) throws IOException {
}

if(!splitPackets.containsKey(packet.splitID)){
Map<Integer, EncapsulatedPacket> map = new ConcurrentHashMap<>();
map.put(packet.splitIndex, packet);
splitPackets.put(packet.splitID, map);
EncapsulatedPacket[] array = new EncapsulatedPacket[packet.splitCount];
array[packet.splitIndex] = packet;
splitPackets.put(packet.splitID, array);
} else {
Map<Integer, EncapsulatedPacket> map = splitPackets.get(packet.splitID);
map.put(packet.splitIndex, packet);
splitPackets.put(packet.splitID, map);
splitPackets.get(packet.splitID)[packet.splitIndex] = packet;
}

if(splitPackets.get(packet.splitID).values().size() == packet.splitCount){
if(splitPackets.get(packet.splitID).length == packet.splitCount){
EncapsulatedPacket pk = new EncapsulatedPacket();
ByteBuffer bb = ByteBuffer.allocate(64 * 64 * 64);
EncapsulatedPacket[] encapsulatedPackets = splitPackets.get(packet.splitID);
for(int i = 0; i < packet.splitCount; i++){
bb.put(splitPackets.get(packet.splitID).get(i).buffer);
bb.put(encapsulatedPackets[i].buffer);
}
pk.buffer = Arrays.copyOf(bb.array(), bb.position());
bb = null;

pk.length = pk.buffer.length;
splitPackets.remove(packet.splitID);
Expand Down