From 8b6aafef68b40c817fc37f23de0f260cd6149f10 Mon Sep 17 00:00:00 2001
From: Owain van Brakel <owain.vanbrakel@gmail.com>
Date: Thu, 21 Apr 2022 10:42:43 +0200
Subject: [PATCH] project(mixins): Always try to grab a widget

---
 .../mixins/RuneLiteMenuEntryMixin.java        | 31 ++++++++++---------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RuneLiteMenuEntryMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RuneLiteMenuEntryMixin.java
index 0848d94a56..8baa25e250 100644
--- a/runelite-mixins/src/main/java/net/runelite/mixins/RuneLiteMenuEntryMixin.java
+++ b/runelite-mixins/src/main/java/net/runelite/mixins/RuneLiteMenuEntryMixin.java
@@ -65,23 +65,26 @@ public abstract class RuneLiteMenuEntryMixin implements RSRuneLiteMenuEntry
 	@Override
 	public Widget getWidget()
 	{
-		MenuAction menuAction = this.getType();
-		if (menuAction == MenuAction.CC_OP || menuAction == MenuAction.CC_OP_LOW_PRIORITY)
-		{
-			int param1 = this.getParam1();
-			int param0 = this.getParam0();
-			if (param1 == 9764864)
-			{
-				Widget widget = client.getWidget(param1);
-				if (param0 != -1)
-				{
-					widget = widget.getChild(param0);
-				}
+		int param1 = this.getParam1();
+		int param0 = this.getParam0();
 
-				return widget;
+		Widget widget = client.getWidget(param1);
+
+		if (widget == null)
+		{
+			return null;
+		}
+
+		if (param0 != -1)
+		{
+			Widget child = widget.getChild(param0);
+
+			if (child != null)
+			{
+				return child;
 			}
 		}
 
-		return null;
+		return widget;
 	}
 }