Merge remote-tracking branch 'runelite/master'

runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePlugin.java

@@ -183,7 +183,6 @@ public class GrandExchangePlugin extends Plugin
 	private RuneLiteConfig runeLiteConfig;
 
 	private Widget grandExchangeText;
-	private Widget grandExchangeItem;
 	private String grandExchangeExamine;
 
 	@Inject
@@ -319,7 +318,6 @@ public class GrandExchangePlugin extends Plugin
 		mouseManager.unregisterMouseListener(inputListener);
 		keyManager.unregisterKeyListener(inputListener);
 		grandExchangeText = null;
-		grandExchangeItem = null;
 		lastUsername = machineUuid = null;
 		tradeSeq = 0;
 	}
@@ -597,14 +595,11 @@ public class GrandExchangePlugin extends Plugin
 		{
 			// Grand exchange was opened.
 			case WidgetID.GRAND_EXCHANGE_GROUP_ID:
-				Widget grandExchangeOffer = client.getWidget(WidgetInfo.GRAND_EXCHANGE_OFFER_CONTAINER);
 				grandExchangeText = client.getWidget(WidgetInfo.GRAND_EXCHANGE_OFFER_TEXT);
-				grandExchangeItem = grandExchangeOffer.getChild(OFFER_CONTAINER_ITEM);
 				break;
 			// Grand exchange was closed (if it was open before).
 			case WidgetID.INVENTORY_GROUP_ID:
 				grandExchangeText = null;
-				grandExchangeItem = null;
 				break;
 		}
 	}
@@ -825,7 +820,17 @@ public class GrandExchangePlugin extends Plugin
 
 	private void rebuildGeText()
 	{
-		if (grandExchangeText == null || grandExchangeItem == null || grandExchangeItem.isHidden())
+		if (grandExchangeText == null)
+		{
+			return;
+		}
+		Widget grandExchangeOffer = client.getWidget(WidgetInfo.GRAND_EXCHANGE_OFFER_CONTAINER);
+		if (grandExchangeOffer == null)
+		{
+			return;
+		}
+		Widget grandExchangeItem = grandExchangeOffer.getChild(OFFER_CONTAINER_ITEM);
+		if (grandExchangeItem == null || grandExchangeItem.isHidden())
 		{
 			return;
 		}

runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java

@@ -114,7 +114,7 @@ public class HiscorePanel extends PluginPanel
 	);
 
 	private static final HiscoreEndpoint[] ENDPOINTS = {
-		HiscoreEndpoint.NORMAL, HiscoreEndpoint.IRONMAN, HiscoreEndpoint.HARDCORE_IRONMAN, HiscoreEndpoint.ULTIMATE_IRONMAN, HiscoreEndpoint.DEADMAN, HiscoreEndpoint.TOURNAMENT
+		HiscoreEndpoint.NORMAL, HiscoreEndpoint.IRONMAN, HiscoreEndpoint.HARDCORE_IRONMAN, HiscoreEndpoint.ULTIMATE_IRONMAN, HiscoreEndpoint.DEADMAN, HiscoreEndpoint.LEAGUE
 	};
 
 	private final HiscorePlugin plugin;

runelite-client/src/main/resources/item_variations.json

@@ -9752,7 +9752,23 @@
     25224,
     25225,
     25226,
-    25227
+    25227,
+    26184,
+    26185,
+    26186,
+    26187,
+    26188,
+    26189,
+    26190,
+    26191,
+    26192,
+    26193,
+    26194,
+    26195,
+    26196,
+    26197,
+    26198,
+    26199
   ],
   "red icon": [
     25228,
@@ -9770,7 +9786,23 @@
     25240,
     25241,
     25242,
-    25243
+    25243,
+    26200,
+    26201,
+    26202,
+    26203,
+    26204,
+    26205,
+    26206,
+    26207,
+    26208,
+    26209,
+    26210,
+    26211,
+    26212,
+    26213,
+    26214,
+    26215
   ],
   "essence pack": [
     25280,
@@ -10144,5 +10176,17 @@
   "sigil of the guardian angel": [
     26146,
     26147
+  ],
+  "group iron platebody": [
+    26158,
+    26160,
+    26162,
+    26164
+  ],
+  "hardcore group iron platebody": [
+    26172,
+    26174,
+    26176,
+    26178
   ]
 }

runelite-client/src/main/scripts/ChatBuilder.hash

@@ -1 +1 @@
-D8865833BC828A91FC7D4A10B6A7629786ED2099E2F45689BECD55A9E933323D
+09B4102BE45BA918A3B5D24F9DC1BF92925B15BEC9FAA67638AFB26DF13D8F88