From 5d523d7f5c28c542320b28278b21994dd9f48676 Mon Sep 17 00:00:00 2001 From: Ganom Date: Thu, 7 Nov 2019 13:41:05 -0500 Subject: [PATCH] menumanager: fix npe on removeswaps --- .../main/java/net/runelite/client/menus/MenuManager.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java b/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java index 667f68f24b..144f84ad5d 100644 --- a/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java +++ b/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java @@ -753,9 +753,9 @@ public class MenuManager for (String target : fromTarget) { final String s = Text.standardize(target); - swaps.keySet().removeIf(e -> e.getTarget().equals(s)); - priorityEntries.removeIf(e -> e.getTarget().equals(s)); - hiddenEntries.removeIf(e -> e.getTarget().equals(s)); + swaps.keySet().removeIf(e -> e.getTarget() != null && e.getTarget().equals(s)); + priorityEntries.removeIf(e -> e.getTarget() != null && e.getTarget().equals(s)); + hiddenEntries.removeIf(e -> e.getTarget() != null && e.getTarget().equals(s)); } }