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

slayer: Fix NPE when getting unsupported task (#9490)

Browse Source
This commit is contained in:
AttackOfTheMoons
2019-07-28 21:59:12 -10:00
committed by Tomas Slusny
parent 529570d91a
commit e5d9dd4ceb
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -535,7 +535,14 @@ public class SlayerPlugin extends Plugin
return; return;
} }
final int taskKillExp = Task.getTask(taskName).getExpectedKillExp(); final Task task = Task.getTask(taskName);
if (task == null)
{
return;
}
final int taskKillExp = task.getExpectedKillExp();
// Only count exp gain as a kill if the task either has no expected exp for a kill, or if the exp gain is equal // Only count exp gain as a kill if the task either has no expected exp for a kill, or if the exp gain is equal
// to the expected exp gain for the task. // to the expected exp gain for the task.
@@ -595,7 +602,7 @@ public class SlayerPlugin extends Plugin
private boolean doubleTroubleExtraKill() private boolean doubleTroubleExtraKill()
{ {
return WorldPoint.fromLocalInstance(client, client.getLocalPlayer().getLocalLocation()).getRegionID() == GROTESQUE_GUARDIANS_REGION && return WorldPoint.fromLocalInstance(client, client.getLocalPlayer().getLocalLocation()).getRegionID() == GROTESQUE_GUARDIANS_REGION &&
SlayerUnlock.GROTESQUE_GUARDIAN_DOUBLE_COUNT.isEnabled(client); SlayerUnlock.GROTESQUE_GUARDIAN_DOUBLE_COUNT.isEnabled(client);
} }
private boolean isTarget(NPC npc) private boolean isTarget(NPC npc)

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

@@ -28,6 +28,7 @@ package net.runelite.client.plugins.slayer;
import com.google.common.base.Preconditions; import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import java.util.Map; import java.util.Map;
import javax.annotation.Nullable;
import lombok.Getter; import lombok.Getter;
import net.runelite.api.ItemID; import net.runelite.api.ItemID;
@@ -228,6 +229,7 @@ enum Task
this.expectedKillExp = expectedKillExp; this.expectedKillExp = expectedKillExp;
} }
@Nullable
static Task getTask(String taskName) static Task getTask(String taskName)
{ {
return tasks.get(taskName.toLowerCase()); return tasks.get(taskName.toLowerCase());