Merge pull request #899 from se7enAte9/typeidentifiers

menuentryadded: fix incorrect type/identifier

runelite-client/src/main/java/net/runelite/client/plugins/inventorytags/InventoryTagsPlugin.java

@@ -227,6 +227,8 @@ public class InventoryTagsPlugin extends Plugin
 				menuList[num++] = newMenu;
 			}
 
+			// Need to set the event entries to prevent conflicts
+			event.setMenuEntries(menuList);
 			client.setMenuEntries(menuList);
 		}
 	}

runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsPlugin.java

@@ -332,11 +332,13 @@ public class NpcIndicatorsPlugin extends Plugin
 			if (mn != null && isNpcMemorizationUnnecessary(mn))
 			{
 				memorizedNpcs.remove(npc.getIndex());
+				rebuildAllNpcs();
 			}
 		}
 		else
 		{
 			npcTags.add(id);
+			rebuildAllNpcs();
 		}
 
 		click.consume();

runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java

@@ -673,8 +673,8 @@ public abstract class RSClientMixin implements RSClient
 				new MenuEntry(
 					client.getMenuOptions()[oldCount],
 					client.getMenuTargets()[oldCount],
-					client.getMenuTypes()[oldCount],
 					client.getMenuIdentifiers()[oldCount],
+					client.getMenuTypes()[oldCount],
 					client.getMenuActionParams0()[oldCount],
 					client.getMenuActionParams1()[oldCount],
 					client.getMenuForceLeftClick()[oldCount]