Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add improved lobby skipping #2

Merged
merged 3 commits into from
Jan 22, 2024
Merged

Add improved lobby skipping #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d61a46c
Improve lobby skipping
GregHib Jun 6, 2023
fc8518e
Fix
GregHib Jun 8, 2023
08809be
Don't split ports
GregHib Jan 22, 2024
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
5 changes: 4 additions & 1 deletion client/src/Class14_Sub4.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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++;
Expand Down
5 changes: 3 additions & 2 deletions client/src/Class151.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_);
Expand Down Expand Up @@ -71,7 +72,7 @@ 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);
} catch (RuntimeException runtimeexception) {
throw Class348_Sub17.method2929(runtimeexception, ("ok.E(" + (string != null ? "{...}" : "null") + ',' + (string_16_ != null ? "{...}" : "null") + ',' + i + ')'));
Expand Down
8 changes: 4 additions & 4 deletions client/src/Class88.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down
1 change: 1 addition & 0 deletions client/src/Loader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = false;
public static boolean debug = false;
public static boolean trace = false;
public static int port = 43594;
Expand Down