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

screenshot plugin: fix up chatMessage events

Browse Source
This commit is contained in:
Seth
2018-02-15 19:15:16 -06:00
parent 03bf1da654
commit 930ac3f5c5
1 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java
View File

@@ -190,32 +190,26 @@ public class ScreenshotPlugin extends Plugin
return; return;
} }
if (event.getMessage().contains("Treasure")) String chatMessage = event.getMessage();
{
String chatMessage = event.getMessage().replaceAll("<col=3300ff>", "");
if (chatMessage.startsWith("You have completed")) if (chatMessage.contains("You have completed") && chatMessage.contains("Treasure"))
{
Matcher m = NUMBER_PATTERN.matcher(chatMessage.replaceAll("<[^>]*>", ""));
if (m.find())
{ {
Matcher m = NUMBER_PATTERN.matcher(chatMessage); clueNumber = Integer.valueOf(m.group());
if (m.find()) clueType = chatMessage.substring(chatMessage.lastIndexOf(m.group()) + m.group().length() + 1, chatMessage.indexOf("Treasure") - 1);
{ return;
clueNumber = Integer.valueOf(m.group());
clueType = chatMessage.substring(chatMessage.lastIndexOf(m.group()) + m.group().length() + 1, chatMessage.indexOf("Treasure") - 1);
}
} }
} }
if (event.getMessage().contains("Barrows")) if (chatMessage.startsWith("Your Barrows chest count is"))
{ {
String chatMessage = event.getMessage().replaceAll("<col=ff0000>", ""); Matcher m = NUMBER_PATTERN.matcher(chatMessage.replaceAll("<[^>]*>", ""));
if (m.find())
if (chatMessage.startsWith("Your Barrows chest count is"))
{ {
Matcher m = NUMBER_PATTERN.matcher(chatMessage); barrowsNumber = Integer.valueOf(m.group());
if (m.find()) return;
{
barrowsNumber = Integer.valueOf(m.group());
}
} }
} }
} }