diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorytags/InventoryTagsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorytags/InventoryTagsPlugin.java index 4438f22e34..0a87706e6e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorytags/InventoryTagsPlugin.java +++ b/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); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsPlugin.java index a65fbf0b4c..0f8f150190 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsPlugin.java +++ b/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(); diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java index 5336cf43d2..43d8582787 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java +++ b/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]