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

slayer plugin: validate !task name and location

Browse Source
This commit is contained in:
Adam
2019-08-03 10:11:08 -04:00
parent 4b239d2600
commit 715c7a26b9
2 changed files with 46 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java
View File

@@ -770,7 +770,8 @@ public class SlayerPlugin extends Plugin
} }
if (TASK_STRING_VALIDATION.matcher(task.getTask()).find() || task.getTask().length() > TASK_STRING_MAX_LENGTH || if (TASK_STRING_VALIDATION.matcher(task.getTask()).find() || task.getTask().length() > TASK_STRING_MAX_LENGTH ||
TASK_STRING_VALIDATION.matcher(task.getLocation()).find() || task.getLocation().length() > TASK_STRING_MAX_LENGTH) TASK_STRING_VALIDATION.matcher(task.getLocation()).find() || task.getLocation().length() > TASK_STRING_MAX_LENGTH ||
Task.getTask(task.getTask()) == null || !Task.LOCATIONS.contains(task.getLocation()))
{ {
log.debug("Validation failed for task name or location: {}", task); log.debug("Validation failed for task name or location: {}", task);
return; return;

44
runelite-client/src/main/java/net/runelite/client/plugins/slayer/Task.java
View File

@@ -26,7 +26,9 @@
package net.runelite.client.plugins.slayer; package net.runelite.client.plugins.slayer;
import com.google.common.base.Preconditions; import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import java.util.List;
import java.util.Map; import java.util.Map;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import lombok.Getter; import lombok.Getter;
@@ -176,6 +178,48 @@ enum Task
//</editor-fold> //</editor-fold>
private static final Map<String, Task> tasks; private static final Map<String, Task> tasks;
static final List<String> LOCATIONS = ImmutableList.of(
"", // no location is a valid location
"Abyss",
"Ancient Cavern",
"Asgarnian Ice Dungeon",
"Brimhaven Dungeon",
"Brine Rat Cavern",
"Catacombs of Kourend",
"Chasm of Fire",
"Clan Wars",
"Death Plateau",
"Evil Chicken's Lair",
"Fossil Island",
"Fremennik Slayer Dungeon",
"God Wars Dungeon",
"Iorwerth Dungeon",
"Kalphite Lair",
"Karuulm Slayer Dungeon",
"Keldagrim",
"Kraken Cove",
"Lighthouse",
"Lithkren Vault",
"Lizardman Canyon",
"Lizardman Settlement",
"Molch",
"Mount Quidamortem",
"Mourner Tunnels",
"Ogre Enclave",
"Slayer Tower",
"Smoke Devil Dungeon",
"Smoke Dungeon",
"Stronghold of Security",
"Stronghold Slayer Dungeon",
"task-only Kalphite Cave",
"Taverley Dungeon",
"Troll Stronghold",
"Waterbirth Island",
"Waterfall Dungeon",
"Wilderness",
"Witchaven Dungeon",
"Zanaris"
);
private final String name; private final String name;
private final int itemSpriteId; private final int itemSpriteId;