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

Merge branch 'upstream-master' into runelite

Browse Source 
# Conflicts:
#	cache-client/pom.xml
#	cache-updater/pom.xml
#	cache/pom.xml
#	http-api/pom.xml
#	http-service/pom.xml
#	pom.xml
#	runelite-api/pom.xml
#	runelite-api/src/main/java/net/runelite/api/Client.java
#	runelite-api/src/main/java/net/runelite/api/events/MenuEntryAdded.java
#	runelite-api/src/main/java/net/runelite/api/events/NpcActionChanged.java
#	runelite-api/src/main/java/net/runelite/api/events/PlayerMenuOptionClicked.java
#	runelite-client/pom.xml
#	runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldSwitcherPanel.java
#	runelite-client/src/test/java/net/runelite/client/plugins/slayer/SlayerPluginTest.java
#	runelite-script-assembler-plugin/pom.xml
This commit is contained in:
zeruth
2021-01-29 21:19:28 -05:00
parent 48fdf79e65 e3b0755385
commit 7b0678d0a1
55 changed files with 1763 additions and 395 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
runescape-client/src/main/java/ItemContainer.java
View File

@@ -170,8 +170,8 @@ public class ItemContainer extends Node {
var8 = var7 + (var6 << 8); // L: 5317
if (!var16 || var7 != 49 && var7 != 149 && var7 != 147 && var6 != 50 && (var6 != 49 || var7 != 47)) { // L: 5318
FileSystem.regions[var4] = var8; // L: 5319
class41.regionMapArchiveIds[var4] = GameShell.archive5.getGroupId("m" + var6 + "_" + var7); // L: 5320
GrandExchangeOfferTotalQuantityComparator.regionLandArchiveIds[var4] = GameShell.archive5.getGroupId("l" + var6 + "_" + var7); // L: 5321
class41.regionMapArchiveIds[var4] = GameEngine.archive5.getGroupId("m" + var6 + "_" + var7); // L: 5320
GrandExchangeOfferTotalQuantityComparator.regionLandArchiveIds[var4] = GameEngine.archive5.getGroupId("l" + var6 + "_" + var7); // L: 5321
++var4; // L: 5322
}
}
@@ -236,8 +236,8 @@ public class ItemContainer extends Node {
FileSystem.regions[var5] = var12; // L: 5368
var13 = var12 >> 8 & 255; // L: 5369
int var14 = var12 & 255; // L: 5370
class41.regionMapArchiveIds[var5] = GameShell.archive5.getGroupId("m" + var13 + "_" + var14); // L: 5371
GrandExchangeOfferTotalQuantityComparator.regionLandArchiveIds[var5] = GameShell.archive5.getGroupId("l" + var13 + "_" + var14); // L: 5372
class41.regionMapArchiveIds[var5] = GameEngine.archive5.getGroupId("m" + var13 + "_" + var14); // L: 5371
GrandExchangeOfferTotalQuantityComparator.regionLandArchiveIds[var5] = GameEngine.archive5.getGroupId("l" + var13 + "_" + var14); // L: 5372
++var5; // L: 5373
}
}