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

Merge pull request #10496 from Hydrox6/library-complete-reset

Browse Source 
kourendlibrary: only reset if layout changes when complete
This commit is contained in:
Adam
2019-12-29 13:20:16 -05:00
committed by GitHub
parent a969a17fcf 40aedfb10e
commit 2586da3a70
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/Library.java
View File

@@ -131,18 +131,25 @@ class Library
else if (state != SolvedState.NO_DATA) else if (state != SolvedState.NO_DATA)
{ {
// Reset if the book we found isn't what we expected // Reset if the book we found isn't what we expected
// Reset if we found nothing when we expected something that wasn't a Dark Manuscript, since the layout has changed
if ((book != null && !bookcase.getPossibleBooks().contains(book)) || if (book != null && !bookcase.getPossibleBooks().contains(book))
(book == null && !bookcase.getPossibleBooks().isEmpty() && bookcase.getPossibleBooks().stream().noneMatch(Book::isDarkManuscript)))
{ {
reset(); reset();
} }
} }
// Everything is known, nothing to do
if (state == SolvedState.COMPLETE) if (state == SolvedState.COMPLETE)
{ {
return; // Reset if we found nothing when we expected something that wasn't a Dark Manuscript, since the layout has changed
if (book == null && !bookcase.getPossibleBooks().isEmpty() && bookcase.getPossibleBooks().stream().noneMatch(Book::isDarkManuscript))
{
reset();
}
else
{
// Everything is known, nothing to do
return;
}
} }
log.info("Setting bookcase {} to {}", bookcase.getIndex(), book); log.info("Setting bookcase {} to {}", bookcase.getIndex(), book);