Skip to content

Commit fffb4cd

Browse files
committed
Refactor defactor
1 parent 75fb347 commit fffb4cd

File tree

3 files changed

+17
-11
lines changed

3 files changed

+17
-11
lines changed

src/main/java/org/runejs/client/cache/CacheArchive.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -162,39 +162,39 @@ public int getPercentLoaded() {
162162

163163
}
164164

165-
public void method198(boolean arg1, byte[] arg2, int arg3, CacheIndex arg4) {
166-
if(metaIndex == arg4) {
165+
public void method198(boolean arg1, byte[] fileData, int arg3, CacheIndex cacheIndex) {
166+
if(metaIndex == cacheIndex) {
167167
if(aBoolean1800)
168168
throw new RuntimeException();
169-
if(arg2 == null) {
169+
if(fileData == null) {
170170
UpdateServer.method327(true, this, 255, cacheIndexId, (byte) 0,
171171
archiveCrcValue);
172172
return;
173173
}
174174
crc32.reset();
175-
crc32.update(arg2, 0, arg2.length);
175+
crc32.update(fileData, 0, fileData.length);
176176
int i = (int) crc32.getValue();
177177
if(i != archiveCrcValue) {
178178
/*UpdateServer.method327(true, this, 255, cacheIndexId, (byte) 0,
179179
archiveCrcValue);
180180
return;*/
181181
}
182182

183-
decodeArchive(arg2);
183+
decodeArchive(fileData);
184184
method199();
185185
} else {
186186
if(!arg1 && anInt1797 == arg3)
187187
aBoolean1800 = true;
188-
if(arg2 == null || arg2.length <= 2) {
188+
if(fileData == null || fileData.length <= 2) {
189189
aBooleanArray1796[arg3] = false;
190190
if(hasVersionNumbers || arg1)
191191
UpdateServer.method327(arg1, this, cacheIndexId, arg3, (byte) 2, anIntArray252[arg3]);
192192
return;
193193
}
194194
crc32.reset();
195-
crc32.update(arg2, 0, arg2.length - 2);
195+
crc32.update(fileData, 0, fileData.length - 2);
196196
int i = (int) crc32.getValue();
197-
int i_0_ = ((arg2[-2 + arg2.length] & 0xff) << 8) + (0xff & arg2[arg2.length + -1]);
197+
int i_0_ = ((fileData[-2 + fileData.length] & 0xff) << 8) + (0xff & fileData[fileData.length + -1]);
198198
if(i != anIntArray252[arg3] || i_0_ != anIntArray224[arg3]) {
199199
aBooleanArray1796[arg3] = false;
200200
if(hasVersionNumbers || arg1)
@@ -203,7 +203,7 @@ public void method198(boolean arg1, byte[] arg2, int arg3, CacheIndex arg4) {
203203
}
204204
aBooleanArray1796[arg3] = true;
205205
if(arg1)
206-
aByteArrayArray212[arg3] = arg2;
206+
aByteArrayArray212[arg3] = fileData;
207207
}
208208
}
209209

src/main/java/org/runejs/client/cache/media/gameInterface/GameInterface.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,13 @@ public static GameInterface getInterface(int interfaceData) {
269269
}
270270
}
271271

272-
return cachedInterfaces[parentInterfaceId][childInterfaceId];
272+
try {
273+
return cachedInterfaces[parentInterfaceId][childInterfaceId];
274+
} catch(Exception error) {
275+
System.out.println(parentInterfaceId + " " + childInterfaceId);
276+
error.printStackTrace();
277+
return null;
278+
}
273279
}
274280

275281
public static void updateGameInterface(GameInterface gameInterface) {

src/main/java/org/runejs/client/net/UpdateServer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ public static boolean processUpdateServerResponse() {
199199
updateServerSocket.kill();
200200
} catch(Exception exception) {
201201
}
202-
aByte302 = (byte) (int) (Math.random() * 255.0 + 1.0);
202+
archiveIndex = (byte) (int) (Math.random() * 255.0 + 1.0);
203203
updateServerSocket = null;
204204
MovedStatics.anInt813++;
205205
return false;*/

0 commit comments

Comments
 (0)