From d61a46c3f6128ec4e066830a296364cfc49c3125 Mon Sep 17 00:00:00 2001 From: GregHib Date: Wed, 7 Jun 2023 00:36:10 +0100 Subject: [PATCH 1/3] Improve lobby skipping --- client/src/Class151.java | 6 +++++- client/src/Class88.java | 8 ++++---- client/src/Loader.java | 1 + 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/client/src/Class151.java b/client/src/Class151.java index 9356402..75ff7f5 100644 --- a/client/src/Class151.java +++ b/client/src/Class151.java @@ -33,7 +33,8 @@ static final void method1211(int i, Class105 class105, int i_2_, Class46 class46 anInt2064++; if (class105 != null) { int i_6_; - if (Class348_Sub40_Sub21.anInt9282 != 4) i_6_ = (0x3fff & (int) Class314.aFloat3938 - -r_Sub2.anInt10483); + if (Class348_Sub40_Sub21.anInt9282 != 4) + i_6_ = (0x3fff & (int) Class314.aFloat3938 - -r_Sub2.anInt10483); else i_6_ = 0x3fff & (int) Class314.aFloat3938; int i_7_ = 10 + Math.max(class46.anInt709 / 2, class46.anInt789 / i_4_); int i_8_ = i_5_ * i_5_ - -(i_3_ * i_3_); @@ -73,6 +74,9 @@ static final void method1213(String string, String string_16_, int i) { RuntimeException_Sub1.anInt4596 = -1; Class239_Sub12.anInt5969 = 1; Class132.method1138(string, false, string_16_, (byte) -95); + if (Loader.skipLobby) { + Class239_Sub12.anInt5969 = 2; + } } catch (RuntimeException runtimeexception) { throw Class348_Sub17.method2929(runtimeexception, ("ok.E(" + (string != null ? "{...}" : "null") + ',' + (string_16_ != null ? "{...}" : "null") + ',' + i + ')')); } diff --git a/client/src/Class88.java b/client/src/Class88.java index 9d4c8a1..0106264 100644 --- a/client/src/Class88.java +++ b/client/src/Class88.java @@ -81,7 +81,7 @@ static final void method843(byte i) { Class11.anInt197 = 0; } if (Class225.anInt2955 == 1) { - if (Class239_Sub12.anInt5969 == 2 && !Loader.skipLobby) Class130_Sub1.aClass144_5800 = (Class3.aClass161_125.method1262(Class348_Sub23_Sub1.aClass297_8992, (byte) 36)); + if (Class239_Sub12.anInt5969 == 2 && !Loader.splitPorts) Class130_Sub1.aClass144_5800 = (Class3.aClass161_125.method1262(Class348_Sub23_Sub1.aClass297_8992, (byte) 36)); else Class130_Sub1.aClass144_5800 = (Class255.aClass161_3285.method1262(Class348_Sub23_Sub1.aClass297_8992, (byte) 36)); Class225.anInt2955 = 2; } @@ -129,7 +129,7 @@ static final void method843(byte i) { Class348_Sub3.method2739(0); Class348_Sub47 class348_sub47 = Class203.method1478(true); Class348_Sub49_Sub2 class348_sub49_sub2 = (class348_sub47.aClass348_Sub49_Sub2_7116); - if (Class239_Sub12.anInt5969 == 2 || Loader.skipLobby) { + if (Class239_Sub12.anInt5969 == 2) { if (Class240.anInt4674 != 13) class348_sub49_sub2.writeByte(false, Class178.aClass29_2342.anInt400); else class348_sub49_sub2.writeByte(false, Class178.aClass29_2344.anInt400); class348_sub49_sub2.writeShort((byte) 107, 0); @@ -261,7 +261,7 @@ static final void method843(byte i) { } else { if (Class225.anInt2955 == 9) { Class348_Sub49_Sub2 class348_sub49_sub2 = Class299.aClass348_Sub49_Sub2_3813; - if (Class239_Sub12.anInt5969 == 2 || Loader.skipLobby) { + if (Class239_Sub12.anInt5969 == 2) { if (!Class348_Sub40_Sub8.aClass238_9165.method1705(Class76.anInt1288, 93)) return; Class348_Sub40_Sub8.aClass238_9165.method1701(Class76.anInt1288, 0, (byte) 60, (class348_sub49_sub2.aByteArray7154)); class348_sub49_sub2.anInt7197 = 0; @@ -337,7 +337,7 @@ static final void method843(byte i) { /* empty */ } } - if (Class239_Sub12.anInt5969 == 2 || Loader.skipLobby) Class225.anInt2955 = 11; + if (Class239_Sub12.anInt5969 == 2) Class225.anInt2955 = 11; else { Class225.anInt2955 = 0; Class14_Sub4.method254(2, (byte) -92); diff --git a/client/src/Loader.java b/client/src/Loader.java index 29d47df..4a5c3e3 100644 --- a/client/src/Loader.java +++ b/client/src/Loader.java @@ -14,6 +14,7 @@ public class Loader extends Applet { public static boolean loadRunescape = false; public static boolean showCoordinates = true; public static boolean skipLobby = true; + public static boolean splitPorts = true; public static boolean debug = false; public static boolean trace = false; public static int port = 43594; From fc8518e1656dfda85fe5f6cc5bb2b4a05e1b2f5f Mon Sep 17 00:00:00 2001 From: GregHib Date: Thu, 8 Jun 2023 16:59:47 +0100 Subject: [PATCH 2/3] Fix --- client/src/Class14_Sub4.java | 5 ++++- client/src/Class151.java | 5 +---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/client/src/Class14_Sub4.java b/client/src/Class14_Sub4.java index 4133f03..f23aacd 100644 --- a/client/src/Class14_Sub4.java +++ b/client/src/Class14_Sub4.java @@ -213,7 +213,10 @@ public final void method70(int i, int i_42_, byte i_43_, int i_44_, int i_45_, i static final void method254(int i, byte i_48_) { if (i_48_ > -79) method252(127, 53); - if (Class239_Sub12.anInt5969 != 1) { + if (Loader.skipLobby) { + Class348_Sub6.anInt6634 = i; + Class107.anInt1645 = i; + } else if (Class239_Sub12.anInt5969 != 1) { if (Class239_Sub12.anInt5969 == 2) Class348_Sub6.anInt6634 = i; } else Class107.anInt1645 = i; anInt8643++; diff --git a/client/src/Class151.java b/client/src/Class151.java index 75ff7f5..ba02524 100644 --- a/client/src/Class151.java +++ b/client/src/Class151.java @@ -72,11 +72,8 @@ static final void method1213(String string, String string_16_, int i) { if (i > -48) aClass114_2068 = null; anInt2063++; RuntimeException_Sub1.anInt4596 = -1; - Class239_Sub12.anInt5969 = 1; + Class239_Sub12.anInt5969 = Loader.skipLobby ? 2 : 1; Class132.method1138(string, false, string_16_, (byte) -95); - if (Loader.skipLobby) { - Class239_Sub12.anInt5969 = 2; - } } catch (RuntimeException runtimeexception) { throw Class348_Sub17.method2929(runtimeexception, ("ok.E(" + (string != null ? "{...}" : "null") + ',' + (string_16_ != null ? "{...}" : "null") + ',' + i + ')')); } From 08809bea3d7fa53633d68868690c4f0e0522ee98 Mon Sep 17 00:00:00 2001 From: GregHib Date: Mon, 22 Jan 2024 15:02:53 +0000 Subject: [PATCH 3/3] Don't split ports --- client/src/Loader.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/Loader.java b/client/src/Loader.java index 4a5c3e3..49006a1 100644 --- a/client/src/Loader.java +++ b/client/src/Loader.java @@ -14,7 +14,7 @@ public class Loader extends Applet { public static boolean loadRunescape = false; public static boolean showCoordinates = true; public static boolean skipLobby = true; - public static boolean splitPorts = true; + public static boolean splitPorts = false; public static boolean debug = false; public static boolean trace = false; public static int port = 43594;