From ba45ae896d5ebd71235046eadc9e15aae42b95e5 Mon Sep 17 00:00:00 2001 From: sansfromf0rtnite <52166093+sansfromf0rtnite@users.noreply.github.com> Date: Tue, 25 Jun 2019 15:09:56 +0200 Subject: [PATCH] Fix npe when using instance reloader (#747) --- .../client/plugins/pestcontrol/PestControlPlugin.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PestControlPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PestControlPlugin.java index b9ce9922a9..272ec5d6ab 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PestControlPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PestControlPlugin.java @@ -73,6 +73,8 @@ import net.runelite.client.util.Text; ) public class PestControlPlugin extends Plugin { + private static final int VOID_KNIGHTS_OUTPOST = 10537; + private final int NOVICE_GANGPLANK = 14315; // Combat 40+ (3 points) private final int INTERMEDIATE_GANGPLANK = 25631; // Combat 70+ (4 points) private final int VETERAN_GANGPLANK = 25632; // Combat 100+ (5 points) @@ -662,6 +664,10 @@ public class PestControlPlugin extends Plugin boolean isOnPestControlMainIsland() { - return client.getLocalPlayer().getWorldLocation().getRegionID() == 10537; + if (client.getLocalPlayer() != null) + { + return client.getLocalPlayer().getWorldLocation().getRegionID() == VOID_KNIGHTS_OUTPOST; + } + return false; } }