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

14
runescape-client/src/main/java/GrandExchangeOfferNameComparator.java
View File

@@ -108,8 +108,8 @@ final class GrandExchangeOfferNameComparator implements Comparator {
GarbageCollectorMXBean var2 = (GarbageCollectorMXBean)var1.next(); // L: 570
if (var2.isValid()) { // L: 572
class25.garbageCollector = var2; // L: 573
GameShell.garbageCollectorLastCheckTimeMs = -1L; // L: 574
GameShell.garbageCollectorLastCollectionTime = -1L; // L: 575
GameEngine.garbageCollectorLastCheckTimeMs = -1L; // L: 574
GameEngine.garbageCollectorLastCollectionTime = -1L; // L: 575
}
}
} catch (Throwable var11) { // L: 580
@@ -119,16 +119,16 @@ final class GrandExchangeOfferNameComparator implements Comparator {
if (class25.garbageCollector != null) { // L: 582
long var9 = class298.currentTimeMillis(); // L: 583
long var3 = class25.garbageCollector.getCollectionTime(); // L: 584
if (-1L != GameShell.garbageCollectorLastCollectionTime) { // L: 585
long var5 = var3 - GameShell.garbageCollectorLastCollectionTime; // L: 586
long var7 = var9 - GameShell.garbageCollectorLastCheckTimeMs; // L: 587
if (-1L != GameEngine.garbageCollectorLastCollectionTime) { // L: 585
long var5 = var3 - GameEngine.garbageCollectorLastCollectionTime; // L: 586
long var7 = var9 - GameEngine.garbageCollectorLastCheckTimeMs; // L: 587
if (var7 != 0L) { // L: 588
var0 = (int)(100L * var5 / var7);
}
}
GameShell.garbageCollectorLastCollectionTime = var3; // L: 590
GameShell.garbageCollectorLastCheckTimeMs = var9; // L: 591
GameEngine.garbageCollectorLastCollectionTime = var3; // L: 590
GameEngine.garbageCollectorLastCheckTimeMs = var9; // L: 591
}
return var0; // L: 593