From 1b60dbb5757af168f7f55b2151f5672646425146 Mon Sep 17 00:00:00 2001 From: dekvall Date: Wed, 23 Oct 2019 00:04:54 +0200 Subject: [PATCH] random events: fix npe on login on login, interactingChanged fires once with both player and target set to null. --- .../client/plugins/randomevents/RandomEventPlugin.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/randomevents/RandomEventPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/randomevents/RandomEventPlugin.java index bc9cb52977..85aace2e7c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/randomevents/RandomEventPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/randomevents/RandomEventPlugin.java @@ -118,7 +118,11 @@ public class RandomEventPlugin extends Plugin // Check that the npc is interacting with the player and the player isn't interacting with the npc, so // that the notification doesn't fire from talking to other user's randoms - if (target != player || player.getInteracting() == source || !(source instanceof NPC) || !EVENT_NPCS.contains(((NPC) source).getId())) + if (player == null + || target != player + || player.getInteracting() == source + || !(source instanceof NPC) + || !EVENT_NPCS.contains(((NPC) source).getId())) { return; }