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

Merge remote-tracking branch 'upstream/master' into runelite-master-1

Browse Source 
# Conflicts:
#	runelite-api/src/main/java/net/runelite/api/Varbits.java
#	runelite-client/src/test/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdTemperatureTest.java
This commit is contained in:
Zeruth
2019-07-05 00:59:14 -04:00
parent 4045d18b14 d7a1e51041
commit f4b024804e
25 changed files with 317 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cache/pom.xml vendored
View File

@@ -29,7 +29,7 @@
<parent>
<groupId>net.runelite</groupId>
<artifactId>runelite-parent</artifactId>
<version>1.5.28-SNAPSHOT</version>
<version>1.5.29-SNAPSHOT</version>
</parent>
<artifactId>cache</artifactId>

2
cache/src/test/java/net/runelite/cache/FrameDumper.java vendored
View File

@@ -88,7 +88,7 @@ public class FrameDumper
int framemapArchiveId = (contents[0] & 0xff) << 8 | contents[1] & 0xff;
Archive framemapArchive = framemapIndex.getArchives().get(framemapArchiveId);
Archive framemapArchive = framemapIndex.getArchive(framemapArchiveId);
archiveData = storage.loadArchive(framemapArchive);
byte[] framemapContents = framemapArchive.decompress(archiveData);