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

4
runescape-client/src/main/java/GrandExchangeEvent.java
View File

@@ -132,11 +132,11 @@ public class GrandExchangeEvent {
int var0;
for (var0 = 0; var0 < 32; ++var0) { // L: 422
GameShell.graphicsTickTimes[var0] = 0L;
GameEngine.graphicsTickTimes[var0] = 0L;
}
for (var0 = 0; var0 < 32; ++var0) { // L: 423
GameShell.clientTickTimes[var0] = 0L;
GameEngine.clientTickTimes[var0] = 0L;
}
class8.gameCyclesToDo = 0; // L: 424