ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Revert "Merge branch 'master' into master"

Browse Source 
This reverts commit 43520c1958, reversing
changes made to 2e7aea3c62.
This commit is contained in:
zeruth
2019-06-22 02:38:35 -04:00
parent 43520c1958
commit c655c9f542
224 changed files with 16901 additions and 17108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
runescape-client/src/main/java/WorldMapLabel.java
View File

@@ -90,60 +90,60 @@ public class WorldMapLabel {
var0.writeInt(var6);
}
Method var7;
Method var25;
if(var4 != 3) {
if(var4 == 4) {
var7 = var1.methods[var3];
var6 = var7.getModifiers();
var25 = var1.methods[var3];
var6 = var25.getModifiers();
var0.writeByte(0);
var0.writeInt(var6);
}
} else {
var7 = var1.methods[var3];
byte[][] var8 = var1.arguments[var3];
Object[] var9 = new Object[var8.length];
var25 = var1.methods[var3];
byte[][] var10 = var1.arguments[var3];
Object[] var7 = new Object[var10.length];
for(int var10 = 0; var10 < var8.length; ++var10) {
ObjectInputStream var11 = new ObjectInputStream(new ByteArrayInputStream(var8[var10]));
var9[var10] = var11.readObject();
for(int var8 = 0; var8 < var10.length; ++var8) {
ObjectInputStream var9 = new ObjectInputStream(new ByteArrayInputStream(var10[var8]));
var7[var8] = var9.readObject();
}
Object var24 = Reflection.invoke(var7, (Object)null, var9);
if(var24 == null) {
Object var11 = Reflection.invoke(var25, (Object)null, var7);
if(var11 == null) {
var0.writeByte(0);
} else if(var24 instanceof Number) {
} else if(var11 instanceof Number) {
var0.writeByte(1);
var0.writeLong(((Number)var24).longValue());
} else if(var24 instanceof String) {
var0.writeLong(((Number)var11).longValue());
} else if(var11 instanceof String) {
var0.writeByte(2);
var0.writeStringCp1252NullTerminated((String)var24);
var0.writeStringCp1252NullTerminated((String)var11);
} else {
var0.writeByte(4);
}
}
} catch (ClassNotFoundException var12) {
} catch (ClassNotFoundException var13) {
var0.writeByte(-10);
} catch (InvalidClassException var13) {
} catch (InvalidClassException var14) {
var0.writeByte(-11);
} catch (StreamCorruptedException var14) {
} catch (StreamCorruptedException var15) {
var0.writeByte(-12);
} catch (OptionalDataException var15) {
} catch (OptionalDataException var16) {
var0.writeByte(-13);
} catch (IllegalAccessException var16) {
} catch (IllegalAccessException var17) {
var0.writeByte(-14);
} catch (IllegalArgumentException var17) {
} catch (IllegalArgumentException var18) {
var0.writeByte(-15);
} catch (InvocationTargetException var18) {
} catch (InvocationTargetException var19) {
var0.writeByte(-16);
} catch (SecurityException var19) {
} catch (SecurityException var20) {
var0.writeByte(-17);
} catch (IOException var20) {
} catch (IOException var21) {
var0.writeByte(-18);
} catch (NullPointerException var21) {
} catch (NullPointerException var22) {
var0.writeByte(-19);
} catch (Exception var22) {
} catch (Exception var23) {
var0.writeByte(-20);
} catch (Throwable var23) {
} catch (Throwable var24) {
var0.writeByte(-21);
}
}
@@ -152,7 +152,6 @@ public class WorldMapLabel {
var0.__aa_312(var2);
var1.remove();
}
}
@ObfuscatedName("f")
@@ -190,7 +189,7 @@ public class WorldMapLabel {
VarbitDefinition.indexedSpriteWidths = null;
SecureRandomCallable.indexedSpriteHeights = null;
class328.indexedSpritePalette = null;
class328.spritePixels = (byte[][])null;
class328.spritePixels = null;
return var0;
}
@@ -226,8 +225,8 @@ public class WorldMapLabel {
garbageValue = "60"
)
public static void method440() {
NPCDefinition.NpcDefinition_cached.clear();
NPCDefinition.NpcDefinition_cachedModels.clear();
NpcDefinition.NpcDefinition_cached.clear();
NpcDefinition.NpcDefinition_cachedModels.clear();
}
@ObfuscatedName("gx")
@@ -258,10 +257,10 @@ public class WorldMapLabel {
Client.viewportTempX = -1;
Client.viewportTempY = -1;
}
} else {
Client.viewportTempX = -1;
Client.viewportTempY = -1;
}
}
}