Merge pull request #64 from hallowatcher/refactor-packets

Refactor incoming packets

Author: Promises

src/main/java/com/jagex/runescape/GameSocket.java

@@ -34,8 +34,8 @@ public GameSocket(Socket socket, Signlink signLink) throws IOException {
     }
 
 
-    public void method1008(int arg0, int arg1, int arg2, byte[] arg3) throws IOException {
-        if (!socketDisconnected && arg2 < -126) {
+    public void method1008(int arg0, int arg1, byte[] arg3) throws IOException {
+        if (!socketDisconnected) {
             while (arg1 > 0) {
                 int i = socketInputStream.read(arg3, arg0, arg1);
                 if (i <= 0)

src/main/java/com/jagex/runescape/cache/media/SpotAnimDefinition.java

@@ -105,7 +105,7 @@ public static void method552(boolean arg0) {
                         i = -IncomingPackets.incomingPacketBuffer.currentPosition + 8;
                     }
                     if (i > 0) {
-                        MovedStatics.gameSocket.method1008(IncomingPackets.incomingPacketBuffer.currentPosition, i, -128, IncomingPackets.incomingPacketBuffer.buffer);
+                        MovedStatics.gameSocket.method1008(IncomingPackets.incomingPacketBuffer.currentPosition, i, IncomingPackets.incomingPacketBuffer.buffer);
                         IncomingPackets.incomingPacketBuffer.currentPosition += i;
                     }
                 }
@@ -211,18 +211,18 @@ public static void method552(boolean arg0) {
                     PlayerAppearance.anInt708 <<= 8;
                     PlayerAppearance.anInt708 += MovedStatics.gameSocket.read();
                     Class44.anInt1049 = MovedStatics.gameSocket.read();
-                    MovedStatics.gameSocket.method1008(0, 1, -127, IncomingPackets.incomingPacketBuffer.buffer);
+                    MovedStatics.gameSocket.method1008(0, 1, IncomingPackets.incomingPacketBuffer.buffer);
                     IncomingPackets.incomingPacketBuffer.currentPosition = 0;
                     IncomingPackets.incomingPacket = IncomingPackets.incomingPacketBuffer.getPacket();
-                    MovedStatics.gameSocket.method1008(0, 2, -127, IncomingPackets.incomingPacketBuffer.buffer);
+                    MovedStatics.gameSocket.method1008(0, 2, IncomingPackets.incomingPacketBuffer.buffer);
                     IncomingPackets.incomingPacketBuffer.currentPosition = 0;
                     IncomingPackets.incomingPacketSize = IncomingPackets.incomingPacketBuffer.getUnsignedShortBE();
                     Class40_Sub3.anInt2032 = 10;
                 }
                 if (Class40_Sub3.anInt2032 == 10) {
                     if (MovedStatics.gameSocket.inputStreamAvailable() >= IncomingPackets.incomingPacketSize) {
                         IncomingPackets.incomingPacketBuffer.currentPosition = 0;
-                        MovedStatics.gameSocket.method1008(0, IncomingPackets.incomingPacketSize, -128, IncomingPackets.incomingPacketBuffer.buffer);
+                        MovedStatics.gameSocket.method1008(0, IncomingPackets.incomingPacketSize, IncomingPackets.incomingPacketBuffer.buffer);
                         Main.method44();
                         Class51.regionX = -1;
                         FloorDecoration.method343(false, 5688);