Merge pull request #4199 from AWarbear/OtherworldlyBeingsTypoFix

Fix SlayerPlugin NPEs

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

@@ -32,7 +32,6 @@ import java.time.Duration;
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -54,6 +53,8 @@ import net.runelite.api.events.ConfigChanged;
 import net.runelite.api.events.ExperienceChanged;
 import net.runelite.api.events.GameStateChanged;
 import net.runelite.api.events.GameTick;
+import net.runelite.api.events.NpcDespawned;
+import net.runelite.api.events.NpcSpawned;
 import net.runelite.api.widgets.Widget;
 import net.runelite.api.widgets.WidgetInfo;
 import net.runelite.client.Notifier;
@@ -159,6 +160,7 @@ public class SlayerPlugin extends Plugin
 	private int cachedXp;
 	private Instant infoTimer;
 	private boolean loginFlag;
+	private List<String> targetNames = new ArrayList<>();
 
 	@Override
 	protected void startUp() throws Exception
@@ -232,6 +234,23 @@ public class SlayerPlugin extends Plugin
 		config.slaughter(slaughterChargeCount);
 	}
 
+	@Subscribe
+	public void onNpcSpawned(NpcSpawned npcSpawned)
+	{
+		NPC npc = npcSpawned.getNpc();
+		if (isTarget(npc))
+		{
+			highlightedTargets.add(npc);
+		}
+	}
+
+	@Subscribe
+	public void onNpcDespawned(NpcDespawned npcDespawned)
+	{
+		NPC npc = npcDespawned.getNpc();
+		highlightedTargets.remove(npc);
+	}
+
 	@Subscribe
 	public void onGameTick(GameTick tick)
 	{
@@ -294,15 +313,6 @@ public class SlayerPlugin extends Plugin
 				removeCounter();
 			}
 		}
-
-		if (config.highlightTargets())
-		{
-			highlightedTargets = buildTargetsToHighlight();
-		}
-		else
-		{
-			highlightedTargets.clear();
-		}
 	}
 
 	@Subscribe
@@ -474,14 +484,72 @@ public class SlayerPlugin extends Plugin
 		infoTimer = Instant.now();
 	}
 
+	private boolean isTarget(NPC npc)
+	{
+		if (targetNames.isEmpty())
+		{
+			return false;
+		}
+
+		String name = npc.getName();
+		if (name == null)
+		{
+			return false;
+		}
+
+		name = name.toLowerCase();
+
+		for (String target : targetNames)
+		{
+			if (name.contains(target))
+			{
+				NPCComposition composition = npc.getTransformedComposition();
+				if (composition != null && Arrays.asList(composition.getActions()).contains("Attack"))
+				{
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
+	private void rebuildTargetNames(Task task)
+	{
+		targetNames.clear();
+		Arrays.stream(task.getTargetNames())
+			.map(String::toLowerCase)
+			.forEach(targetNames::add);
+		targetNames.add(taskName.toLowerCase().replaceAll("s$", ""));
+	}
+
+	private void rebuildTargetList()
+	{
+		highlightedTargets.clear();
+
+		for (NPC npc : client.getNpcs())
+		{
+			if (isTarget(npc))
+			{
+				highlightedTargets.add(npc);
+			}
+		}
+	}
+
 	private void setTask(String name, int amt)
 	{
-		taskName = name.toLowerCase();
+		taskName = name;
 		amount = amt;
 		save();
 		removeCounter();
 		addCounter();
 		infoTimer = Instant.now();
+
+		Task task = Task.getTask(name);
+		if (task != null)
+		{
+			rebuildTargetNames(task);
+		}
+		rebuildTargetList();
 	}
 
 	private void addCounter()
@@ -517,57 +585,6 @@ public class SlayerPlugin extends Plugin
 		counter = null;
 	}
 
-	private List<NPC> buildTargetsToHighlight()
-	{
-		if (Strings.isNullOrEmpty(taskName))
-			return Collections.EMPTY_LIST;
-
-		List<NPC> npcs = new ArrayList<>();
-		List<String> highlightedNpcs = new ArrayList<>(Arrays.asList(Task.getTask(taskName).getTargetNames()));
-		highlightedNpcs.add(taskName.replaceAll("s$", ""));
-
-		for (NPC npc : client.getNpcs())
-		{
-			NPCComposition composition = getComposition(npc);
-
-			if (composition == null || composition.getName() == null)
-				continue;
-
-			String name = npc.getName();
-			for (String highlight : highlightedNpcs)
-			{
-				if (name.toLowerCase().contains(highlight.toLowerCase())
-					&& Arrays.asList(composition.getActions()).contains("Attack"))
-				{
-					npcs.add(npc);
-					break;
-				}
-			}
-		}
-
-		return npcs;
-	}
-
-	/**
-	 * Get npc composition, account for imposters
-	 *
-	 * @param npc
-	 * @return
-	 */
-	private static NPCComposition getComposition(NPC npc)
-	{
-		if (npc == null)
-			return null;
-
-		NPCComposition composition = npc.getComposition();
-		if (composition != null && composition.getConfigs() != null)
-		{
-			composition = composition.transform();
-		}
-
-		return composition;
-	}
-
 	//Utils
 	private String capsString(String str)
 	{

runelite-client/src/main/java/net/runelite/client/plugins/slayer/TargetMinimapOverlay.java

@@ -55,6 +55,11 @@ public class TargetMinimapOverlay extends Overlay
 	@Override
 	public Dimension render(Graphics2D graphics)
 	{
+		if (!config.highlightTargets())
+		{
+			return null;
+		}
+
 		List<NPC> targets = plugin.getHighlightedTargets();
 		for (NPC target : targets)
 		{

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

@@ -28,107 +28,110 @@ package net.runelite.client.plugins.slayer;
 import com.google.common.base.Preconditions;
 import java.util.HashMap;
 import java.util.Map;
+import lombok.Getter;
 import net.runelite.api.ItemID;
 
+@Getter
 enum Task
 {
 	//<editor-fold desc="Enums">
-	ABERRANT_SPECTRES("aberrant spectres", ItemID.ABERRANT_SPECTRE, "spectre"),
-	ABYSSAL_DEMONS("abyssal demons", ItemID.ABYSSAL_DEMON),
-	ADAMANT_DRAGONS("adamant dragons", ItemID.ADAMANTITE_BAR),
-	ANKOU("ankou", ItemID.ANKOU_MASK),
-	AVIANSIES("aviansies", ItemID.ENSOULED_AVIANSIE_HEAD),
-	BANSHEES("banshees", ItemID.BANSHEE),
-	BASILISKS("basilisks", ItemID.BASILISK),
-	BATS("bats", ItemID.GIRAL_BAT_2),
-	BEARS("bears", ItemID.ENSOULED_BEAR_HEAD),
-	BIRDS("birds", ItemID.FEATHER, "chicken", "rooster", "terrorbird"),
-	BLACK_DEMONS("black demons", ItemID.BLACK_DEMON_MASK),
-	BLACK_DRAGONS("black dragons", ItemID.BLACK_DRAGON_MASK),
-	BLOODVELD("bloodveld", ItemID.BLOODVELD),
-	BLUE_DRAGONS("blue dragons", ItemID.BLUE_DRAGON_MASK),
-	BRINE_RATS("brine rats", ItemID.BRINE_RAT),
-	BRONZE_DRAGONS("bronze dragons", ItemID.BRONZE_DRAGON_MASK),
-	CATABLEPON("catablepon", ItemID.LEFT_SKULL_HALF),
-	CAVE_BUGS("cave bugs", ItemID.SWAMP_CAVE_BUG),
-	CAVE_CRAWLERS("cave crawlers", ItemID.CAVE_CRAWLER, "chasm crawler"),
-	CAVE_HORRORS("cave horrors", ItemID.CAVE_HORROR, "cave abomination"),
-	CAVE_KRAKEN("cave kraken", ItemID.CAVE_KRAKEN),
-	CAVE_SLIMES("cave slimes", ItemID.SWAMP_CAVE_SLIME),
-	COCKATRICE("cockatrice", ItemID.COCKATRICE, "cockathrice"),
-	COWS("cows", ItemID.COW_MASK),
-	CRAWLING_HANDS("crawling hands", ItemID.CRAWLING_HAND, "crushing hand"),
-	CROCODILES("crocodiles", ItemID.SWAMP_LIZARD),
-	DAGANNOTH("dagannoth", ItemID.DAGANNOTH),
-	DARK_BEASTS("dark beasts", ItemID.DARK_BEAST, "night beast"),
-	DESERT_LIZARDS("desert lizards", ItemID.DESERT_LIZARD),
-	DOGS("dogs", ItemID.GUARD_DOG, "jackal"),
-	DUST_DEVILS("dust devils", ItemID.DUST_DEVIL, "choke devil"),
-	DWARVES("dwarves", ItemID.DWARVEN_HELMET, "dwarf"),
-	EARTH_WARRIORS("earth warriors", ItemID.BRONZE_FULL_HELM_T),
-	ELVES("elves", ItemID.ELF, "elf"),
-	FEVER_SPIDERS("fever spiders", ItemID.FEVER_SPIDER),
-	FIRE_GIANTS("fire giants", ItemID.FIRE_BATTLESTAFF),
-	FLESH_CRAWLERS("flesh crawlers", ItemID.ENSOULED_SCORPION_HEAD),
-	FOSSIL_ISLAND_WYVERNS("fossil island wyverns", ItemID.FOSSIL_ISLAND_WYVERN, "ancient wyvern", "long-tailed wyvern", "spitting wyvern", "taloned wyvern"),
-	GARGOYLES("gargoyles", ItemID.GARGOYLE),
-	GHOSTS("ghosts", ItemID.GHOSTSPEAK_AMULET, "tortured soul"),
-	GHOULS("ghouls", ItemID.ZOMBIE_HEAD),
-	GOBLINS("goblins", ItemID.ENSOULED_GOBLIN_HEAD),
-	GREATER_DEMONS("greater demons", ItemID.GREATER_DEMON_MASK),
-	GREEN_DRAGONS("green dragons", ItemID.GREEN_DRAGON_MASK),
-	HARPIE_BUG_SWARMS("harpie bug swarms", ItemID.SWARM),
-	HELLHOUNDS("hellhounds", ItemID.HELLHOUND),
-	HILL_GIANTS("hill giants", ItemID.ENSOULED_GIANT_HEAD),
-	HOBGOBLINS("hobgoblins", ItemID.HOBGOBLIN_GUARD),
-	ICE_GIANTS("ice giants", ItemID.ICE_DIAMOND),
-	ICE_WARRIORS("ice warriors", ItemID.MITHRIL_FULL_HELM_T),
-	ICEFIENDS("icefiends", ItemID.ICE_DIAMOND),
-	INFERNAL_MAGES("infernal mages", ItemID.INFERNAL_MAGE, "malevolent mage"),
-	IRON_DRAGONS("iron dragons", ItemID.IRON_DRAGON_MASK),
-	JELLIES("jellies", ItemID.JELLY, "jelly"),
-	JUNGLE_HORROR("jungle horrors", ItemID.ENSOULED_HORROR_HEAD),
-	KALPHITE("kalphite", ItemID.KALPHITE_SOLDIER),
-	KILLERWATTS("killerwatts", ItemID.KILLERWATT),
-	KURASK("kurask", ItemID.KURASK),
-	LESSER_DEMONS("lesser demons", ItemID.LESSER_DEMON_MASK),
-	LIZARDMEN("lizardmen", ItemID.LIZARDMAN_FANG, "lizardman"),
-	MINIONS_OF_SCABARAS("minions of scabaras", ItemID.GOLDEN_SCARAB, "scarab swarm", "locust rider", "scarab mage"),
-	MINOTAURS("minotaurs", ItemID.ENSOULED_MINOTAUR_HEAD),
-	MITHRIL_DRAGONS("mithril dragons", ItemID.MITHRIL_DRAGON_MASK),
-	MOGRES("mogres", ItemID.MOGRE),
-	MOLANISKS("molanisks", ItemID.MOLANISK),
-	MONKEYS("monkeys", ItemID.ENSOULED_MONKEY_HEAD),
-	MOSS_GIANTS("moss giants", ItemID.HILL_GIANT_CLUB),
-	MUTATED_ZYGOMITES("mutated zygomites", ItemID.MUTATED_ZYGOMITE),
-	NECHRYAEL("nechryael", ItemID.NECHRYAEL, "nechryarch"),
-	OGRES("ogres", ItemID.ENSOULED_OGRE_HEAD),
-	OTHERWORLDLY_BEING("otherworldly being", ItemID.GHOSTLY_HOOD),
-	PYREFIENDS("pyrefiends", ItemID.PYREFIEND, "flaming pyrelord"),
-	RATS("rats", ItemID.RATS_TAIL),
-	RED_DRAGONS("red dragons", ItemID.BABY_RED_DRAGON),
-	ROCKSLUGS("rockslugs", ItemID.ROCKSLUG),
-	RUNE_DRAGONS("rune dragons", ItemID.RUNITE_BAR),
-	SCORPIONS("scorpions", ItemID.ENSOULED_SCORPION_HEAD),
-	SEA_SNAKES("sea snakes", ItemID.SNAKE_CORPSE),
-	SHADES("shades", ItemID.SHADE_ROBE_TOP),
-	SHADOW_WARRIORS("shadow warriors", ItemID.BLACK_FULL_HELM),
-	SKELETAL_WYVERNS("skeletal wyverns", ItemID.SKELETAL_WYVERN),
-	SKELETONS("skeletons", ItemID.SKELETON_GUARD),
-	SMOKE_DEVILS("smoke devils", ItemID.SMOKE_DEVIL),
-	SPIDERS("spiders", ItemID.HUGE_SPIDER),
-	STEEL_DRAGONS("steel dragons", ItemID.STEEL_DRAGON),
-	SUQAHS("suqahs", ItemID.SUQAH_TOOTH),
-	TERROR_DOGS("terror dogs", ItemID.TERROR_DOG),
-	TROLLS("trolls", ItemID.TROLL_GUARD),
-	TUROTH("turoth", ItemID.TUROTH),
-	TZHAAR("tzhaar", ItemID.ENSOULED_TZHAAR_HEAD),
-	VAMPIRES("vampires", ItemID.STAKE),
-	WALL_BEASTS("wall beasts", ItemID.SWAMP_WALLBEAST),
-	WATERFIENDS("waterfiends", ItemID.WATER_ORB),
-	WEREWOLVES("werewolves", ItemID.WOLFBANE, "werewolf"),
-	WOLVES("wolves", ItemID.GREY_WOLF_FUR, "wolf"),
-	ZOMBIES("zombies", ItemID.ZOMBIE_HEAD, "undead");
+	ABERRANT_SPECTRES("Aberrant spectres", ItemID.ABERRANT_SPECTRE, "Spectre"),
+	ABYSSAL_DEMONS("Abyssal demons", ItemID.ABYSSAL_DEMON),
+	ADAMANT_DRAGONS("Adamant dragons", ItemID.ADAMANTITE_BAR),
+	ANKOU("Ankou", ItemID.ANKOU_MASK),
+	AVIANSIES("Aviansies", ItemID.ENSOULED_AVIANSIE_HEAD),
+	BANSHEES("Banshees", ItemID.BANSHEE),
+	BASILISKS("Basilisks", ItemID.BASILISK),
+	BATS("Bats", ItemID.GIRAL_BAT_2),
+	BEARS("Bears", ItemID.ENSOULED_BEAR_HEAD),
+	BIRDS("Birds", ItemID.FEATHER, "Chicken", "Rooster", "Terrorbird", "Seagull"),
+	BLACK_DEMONS("Black demons", ItemID.BLACK_DEMON_MASK),
+	BLACK_DRAGONS("Black dragons", ItemID.BLACK_DRAGON_MASK),
+	BLOODVELD("Bloodveld", ItemID.BLOODVELD),
+	BLUE_DRAGONS("Blue dragons", ItemID.BLUE_DRAGON_MASK),
+	BRINE_RATS("Brine rats", ItemID.BRINE_RAT),
+	BRONZE_DRAGONS("Bronze dragons", ItemID.BRONZE_DRAGON_MASK),
+	CATABLEPON("Catablepon", ItemID.LEFT_SKULL_HALF),
+	CAVE_BUGS("Cave bugs", ItemID.SWAMP_CAVE_BUG),
+	CAVE_CRAWLERS("Cave crawlers", ItemID.CAVE_CRAWLER, "Chasm crawler"),
+	CAVE_HORRORS("Cave horrors", ItemID.CAVE_HORROR, "Cave abomination"),
+	CAVE_KRAKEN("Cave kraken", ItemID.CAVE_KRAKEN),
+	CAVE_SLIMES("Cave slimes", ItemID.SWAMP_CAVE_SLIME),
+	COCKATRICE("Cockatrice", ItemID.COCKATRICE, "Cockathrice"),
+	COWS("Cows", ItemID.COW_MASK),
+	CRAWLING_HANDS("Crawling hands", ItemID.CRAWLING_HAND, "Crushing hand"),
+	CROCODILES("Crocodiles", ItemID.SWAMP_LIZARD),
+	DAGANNOTH("Dagannoth", ItemID.DAGANNOTH),
+	DARK_BEASTS("Dark beasts", ItemID.DARK_BEAST, "Night beast"),
+	DESERT_LIZARDS("Desert lizards", ItemID.DESERT_LIZARD, "Small lizard", "Lizard"),
+	DOGS("Dogs", ItemID.GUARD_DOG, "Jackal"),
+	DUST_DEVILS("Dust devils", ItemID.DUST_DEVIL, "Choke devil"),
+	DWARVES("Dwarves", ItemID.DWARVEN_HELMET, "Dwarf"),
+	EARTH_WARRIORS("Earth warriors", ItemID.BRONZE_FULL_HELM_T),
+	ELVES("Elves", ItemID.ELF, "Elf"),
+	FEVER_SPIDERS("Fever spiders", ItemID.FEVER_SPIDER),
+	FIRE_GIANTS("Fire giants", ItemID.FIRE_BATTLESTAFF),
+	FLESH_CRAWLERS("Flesh crawlers", ItemID.ENSOULED_SCORPION_HEAD),
+	FOSSIL_ISLAND_WYVERNS("Fossil island wyverns", ItemID.FOSSIL_ISLAND_WYVERN, "Ancient wyvern", "Long-tailed wyvern", "Spitting wyvern", "Taloned wyvern"),
+	GARGOYLES("Gargoyles", ItemID.GARGOYLE),
+	GHOSTS("Ghosts", ItemID.GHOSTSPEAK_AMULET, "Tortured soul"),
+	GHOULS("Ghouls", ItemID.ZOMBIE_HEAD),
+	GOBLINS("Goblins", ItemID.ENSOULED_GOBLIN_HEAD),
+	GREATER_DEMONS("Greater demons", ItemID.GREATER_DEMON_MASK),
+	GREEN_DRAGONS("Green dragons", ItemID.GREEN_DRAGON_MASK),
+	HARPIE_BUG_SWARMS("Harpie bug swarms", ItemID.SWARM),
+	HELLHOUNDS("Hellhounds", ItemID.HELLHOUND),
+	HILL_GIANTS("Hill giants", ItemID.ENSOULED_GIANT_HEAD),
+	HOBGOBLINS("Hobgoblins", ItemID.HOBGOBLIN_GUARD),
+	ICE_GIANTS("Ice giants", ItemID.ICE_DIAMOND),
+	ICE_WARRIORS("Ice warriors", ItemID.MITHRIL_FULL_HELM_T),
+	ICEFIENDS("Icefiends", ItemID.ICE_DIAMOND),
+	INFERNAL_MAGES("Infernal mages", ItemID.INFERNAL_MAGE, "Malevolent mage"),
+	IRON_DRAGONS("Iron dragons", ItemID.IRON_DRAGON_MASK),
+	JELLIES("Jellies", ItemID.JELLY, "Jelly"),
+	JUNGLE_HORROR("Jungle horrors", ItemID.ENSOULED_HORROR_HEAD),
+	KALPHITE("Kalphite", ItemID.KALPHITE_SOLDIER),
+	KILLERWATTS("Killerwatts", ItemID.KILLERWATT),
+	KURASK("Kurask", ItemID.KURASK),
+	LESSER_DEMONS("Lesser demons", ItemID.LESSER_DEMON_MASK),
+	LIZARDMEN("Lizardmen", ItemID.LIZARDMAN_FANG, "Lizardman"),
+	MINIONS_OF_SCABARAS("Minions of scabaras", ItemID.GOLDEN_SCARAB, "Scarab swarm", "Locust rider", "Scarab mage"),
+	MINOTAURS("Minotaurs", ItemID.ENSOULED_MINOTAUR_HEAD),
+	MITHRIL_DRAGONS("Mithril dragons", ItemID.MITHRIL_DRAGON_MASK),
+	MOGRES("Mogres", ItemID.MOGRE),
+	MOLANISKS("Molanisks", ItemID.MOLANISK),
+	MONKEYS("Monkeys", ItemID.ENSOULED_MONKEY_HEAD),
+	MOSS_GIANTS("Moss giants", ItemID.HILL_GIANT_CLUB),
+	MUTATED_ZYGOMITES("Mutated zygomites", ItemID.MUTATED_ZYGOMITE),
+	NECHRYAEL("Nechryael", ItemID.NECHRYAEL, "Nechryarch"),
+	OGRES("Ogres", ItemID.ENSOULED_OGRE_HEAD),
+	OTHERWORLDLY_BEING("Otherworldly beings", ItemID.GHOSTLY_HOOD),
+	PYREFIENDS("Pyrefiends", ItemID.PYREFIEND, "Flaming pyrelord"),
+	RATS("Rats", ItemID.RATS_TAIL),
+	RED_DRAGONS("Red dragons", ItemID.BABY_RED_DRAGON),
+	ROCKSLUGS("Rockslugs", ItemID.ROCKSLUG),
+	RUNE_DRAGONS("Rune dragons", ItemID.RUNITE_BAR),
+	SCORPIONS("Scorpions", ItemID.ENSOULED_SCORPION_HEAD),
+	SEA_SNAKES("Sea snakes", ItemID.SNAKE_CORPSE),
+	SHADES("Shades", ItemID.SHADE_ROBE_TOP),
+	SHADOW_WARRIORS("Shadow warriors", ItemID.BLACK_FULL_HELM),
+	SKELETAL_WYVERNS("Skeletal wyverns", ItemID.SKELETAL_WYVERN),
+	SKELETONS("Skeletons", ItemID.SKELETON_GUARD),
+	SMOKE_DEVILS("Smoke devils", ItemID.SMOKE_DEVIL),
+	SPIDERS("Spiders", ItemID.HUGE_SPIDER),
+	SPIRITUAL_CREATURES("Spiritual creatures", ItemID.DRAGON_BOOTS, "Spiritual ranger", "Spiritual mage", "Spiritual warrior"),
+	STEEL_DRAGONS("Steel dragons", ItemID.STEEL_DRAGON),
+	SUQAHS("Suqahs", ItemID.SUQAH_TOOTH),
+	TERROR_DOGS("Terror dogs", ItemID.TERROR_DOG),
+	TROLLS("Trolls", ItemID.TROLL_GUARD),
+	TUROTH("Turoth", ItemID.TUROTH),
+	TZHAAR("Tzhaar", ItemID.ENSOULED_TZHAAR_HEAD),
+	VAMPIRES("Vampires", ItemID.STAKE),
+	WALL_BEASTS("Wall beasts", ItemID.SWAMP_WALLBEAST),
+	WATERFIENDS("Waterfiends", ItemID.WATER_ORB),
+	WEREWOLVES("Werewolves", ItemID.WOLFBANE, "Werewolf"),
+	WOLVES("Wolves", ItemID.GREY_WOLF_FUR, "Wolf"),
+	ZOMBIES("Zombies", ItemID.ZOMBIE_HEAD, "Undead");
 	//</editor-fold>
 
 	private static final Map<String, Task> tasks = new HashMap<>();
@@ -141,7 +144,7 @@ enum Task
 	{
 		for (Task task : values())
 		{
-			tasks.put(task.getName(), task);
+			tasks.put(task.getName().toLowerCase(), task);
 		}
 	}
 
@@ -153,23 +156,8 @@ enum Task
 		this.targetNames = targetNames;
 	}
 
-	public static Task getTask(String taskName)
+	static Task getTask(String taskName)
 	{
-		return tasks.get(taskName);
-	}
-
-	public String getName()
-	{
-		return this.name;
-	}
-
-	public int getItemSpriteId()
-	{
-		return itemSpriteId;
-	}
-
-	public String[] getTargetNames()
-	{
-		return this.targetNames;
+		return tasks.get(taskName.toLowerCase());
 	}
 }

runelite-client/src/test/java/net/runelite/client/plugins/slayer/SlayerPluginTest.java

@@ -130,7 +130,7 @@ public class SlayerPluginTest
 		when(client.getWidget(WidgetInfo.DIALOG_NPC_TEXT)).thenReturn(npcDialog);
 		slayerPlugin.onGameTick(new GameTick());
 
-		assertEquals("suqahs", slayerPlugin.getTaskName());
+		assertEquals("Suqahs", slayerPlugin.getTaskName());
 		assertEquals(231, slayerPlugin.getAmount());
 	}
 
@@ -142,7 +142,7 @@ public class SlayerPluginTest
 		when(client.getWidget(WidgetInfo.DIALOG_NPC_TEXT)).thenReturn(npcDialog);
 		slayerPlugin.onGameTick(new GameTick());
 
-		assertEquals("suqahs", slayerPlugin.getTaskName());
+		assertEquals("Suqahs", slayerPlugin.getTaskName());
 		assertEquals(211, slayerPlugin.getAmount());
 	}