diff --git a/src/main/protocol/memory/Rc4Obtainer.java b/src/main/protocol/memory/Rc4Obtainer.java index 355bf02..5bb3329 100644 --- a/src/main/protocol/memory/Rc4Obtainer.java +++ b/src/main/protocol/memory/Rc4Obtainer.java @@ -46,6 +46,7 @@ public class Rc4Obtainer { List results = client.getRC4possibilities(); + outerloop: for (byte[] possible : results) { byte[] encBuffer = new byte[outgoingHandler.getEncryptedBuffer().size()]; @@ -53,7 +54,6 @@ public class Rc4Obtainer { encBuffer[i] = outgoingHandler.getEncryptedBuffer().get(i); } - outerloop: for (int i = 0; i < 256; i++) { // System.out.println(i); for (int j = 0; j < 256; j++) { diff --git a/src/main/protocol/packethandler/OutgoingHandler.java b/src/main/protocol/packethandler/OutgoingHandler.java index adc8601..a5f654b 100644 --- a/src/main/protocol/packethandler/OutgoingHandler.java +++ b/src/main/protocol/packethandler/OutgoingHandler.java @@ -27,14 +27,13 @@ public class OutgoingHandler extends Handler { private void dataStreamCheck(byte[] buffer) { if (!isDataStream) { HPacket hpacket = new HPacket(buffer); - isDataStream = (hpacket.getBytesLength() > 6 && hpacket.headerId() == 4000); + isDataStream = (hpacket.getBytesLength() > 6 && hpacket.length() < 100); } } @Override public void act(byte[] buffer) throws IOException { dataStreamCheck(buffer); - if (isDataStream) { if (currentIndex < encryptOffset) {