Dont invoke ItemGroupEvents.MODIFY_ENTRIES_ALL for the OP tab, when t…

…he OP tab is disabled (FabricMC#4045) (cherry picked from commit 3fc0e55)
apple502j · Aug 26, 2024 · ca1fb63 · ca1fb63
1 parent 024d2db
commit ca1fb63
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/...c-item-group-api-v1/src/main/java/net/fabricmc/fabric/mixin/itemgroup/ItemGroupMixin.java b/...c-item-group-api-v1/src/main/java/net/fabricmc/fabric/mixin/itemgroup/ItemGroupMixin.java
@@ -71,14 +71,14 @@ public void getStacks(ItemGroup.DisplayContext context, CallbackInfo ci) {
 		var mutableSearchTabStacks = new LinkedList<>(searchTabStacks);
 		var entries = new FabricItemGroupEntries(context, mutableDisplayStacks, mutableSearchTabStacks);
 
-		final Event<ItemGroupEvents.ModifyEntries> modifyEntriesEvent = ItemGroupEventsImpl.getModifyEntriesEvent(registryKey);
+		// Now trigger the events
+		if (registryKey != ItemGroups.OPERATOR || context.hasPermissions()) {
+			final Event<ItemGroupEvents.ModifyEntries> modifyEntriesEvent = ItemGroupEventsImpl.getModifyEntriesEvent(registryKey);
 
-		if (modifyEntriesEvent != null) {
-			modifyEntriesEvent.invoker().modifyEntries(entries);
-		}
+			if (modifyEntriesEvent != null) {
+				modifyEntriesEvent.invoker().modifyEntries(entries);
+			}
 
-		// Now trigger the global event
-		if (registryKey != ItemGroups.OPERATOR || context.hasPermissions()) {
 			ItemGroupEvents.MODIFY_ENTRIES_ALL.invoker().modifyEntries(self, entries);
 		}