Skip to content

Commit d4e2713

Browse files
author
jython234
committed
A few updates.
1 parent 5d90de5 commit d4e2713

6 files changed

Lines changed: 8 additions & 13 deletions

File tree

src/main/java/net/beaconpe/jraklib/Binary.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ All credit goes to the PocketMine Project (http://pocketmine.net)
2121
*/
2222
package net.beaconpe.jraklib;
2323

24-
import org.apache.commons.lang3.ArrayUtils;
2524

2625
import java.nio.ByteBuffer;
2726
import java.util.ArrayList;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ All credit goes to the PocketMine Project (http://pocketmine.net)
2222
package net.beaconpe.jraklib.protocol;
2323

2424
import net.beaconpe.jraklib.Binary;
25-
import org.apache.commons.lang3.ArrayUtils;
2625

2726
import java.nio.ByteBuffer;
2827
import java.util.ArrayList;
28+
import java.util.Arrays;
2929
import java.util.List;
3030

3131
/**
@@ -77,7 +77,7 @@ protected void _encode() {
7777
records = records + 1;
7878
}
7979
putShort((short) records);
80-
put(ArrayUtils.subarray(payload.array(), 0, payload.position()));
80+
put(Arrays.copyOf(payload.array(), payload.position()));
8181
}
8282

8383
@Override

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ All credit goes to the PocketMine Project (http://pocketmine.net)
2222
package net.beaconpe.jraklib.protocol;
2323

2424
import net.beaconpe.jraklib.Binary;
25-
import org.apache.commons.lang3.ArrayUtils;
2625

2726
import java.net.InetSocketAddress;
2827
import java.nio.ByteBuffer;
28+
import java.util.Arrays;
2929
import java.util.regex.Pattern;
3030

3131
/**
@@ -184,7 +184,7 @@ public void encode(){
184184
sendBuffer = ByteBuffer.allocate(64 * 64 * 64);
185185
putByte(getID());
186186
_encode();
187-
buffer = ArrayUtils.subarray(sendBuffer.array(), 0, sendBuffer.position());
187+
buffer = Arrays.copyOf(sendBuffer.array(), sendBuffer.position());
188188
}
189189

190190
public void decode(){

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public void sendEncapsulated(String identifier, EncapsulatedPacket packet){
4646
}
4747

4848
public void sendEncapsulated(String identifier, EncapsulatedPacket packet, byte flags){
49-
ByteBuffer bb = ByteBuffer.allocate(packet.bufferLength);
49+
ByteBuffer bb = ByteBuffer.allocate(3+identifier.getBytes().length+packet.getTotalLength(true));
5050
bb.put(JRakLib.PACKET_ENCAPSULATED).put((byte) identifier.getBytes().length).put(identifier.getBytes()).put(flags).put(packet.toBinary(true));
5151
server.pushMainToThreadPacket(Arrays.copyOf(bb.array(), bb.position()));
5252
bb = null;

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,12 @@ All credit goes to the PocketMine Project (http://pocketmine.net)
2525
import net.beaconpe.jraklib.Binary;
2626
import net.beaconpe.jraklib.JRakLib;
2727
import net.beaconpe.jraklib.protocol.*;
28-
import org.apache.commons.lang3.ArrayUtils;
2928

3029
import java.io.IOException;
3130
import java.net.InetSocketAddress;
3231
import java.nio.ByteBuffer;
3332
import java.time.Instant;
34-
import java.util.ArrayList;
35-
import java.util.HashMap;
36-
import java.util.List;
37-
import java.util.Map;
33+
import java.util.*;
3834
import java.util.concurrent.ConcurrentHashMap;
3935

4036
/**
@@ -334,7 +330,7 @@ private void handleSplit(EncapsulatedPacket packet) throws IOException {
334330
for(int i = 0; i < packet.splitCount; i++){
335331
bb.put(splitPackets.get(packet.splitID).get(i).buffer);
336332
}
337-
pk.buffer = ArrayUtils.subarray(bb.array(), 0, bb.position());
333+
pk.buffer = Arrays.copyOf(bb.array(), bb.position());
338334
bb = null;
339335

340336
pk.length = pk.buffer.length;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ public void blockAddress(String address, int timeout){
347347
if(timeout == -1){
348348
_final = Long.MAX_VALUE;
349349
} else {
350-
getLogger().notice("[JRakLib Thread #"+Thread.currentThread().getId()+"] Blocked "+address+" for "+timeout+" seconds");
350+
getLogger().notice("[JRakLib Thread #"+Thread.currentThread().getId()+"] Blocked "+address+" for "+timeout+" milliseconds");
351351
}
352352
block.put(address, _final);
353353
} else if(block.get(address) < _final){

0 commit comments

Comments
 (0)