[Teyir]

Problem

A menu with clear-inventory: true (DEFAULT mode) never gives the player's inventory back when one of its buttons opens an inventory that has no holder, for example an InvUI window opened by a player-command:

clear-inventory: true
items:
  quests:
    slot: 13
    item:
      material: PAPER
    actions:
      - type: player-command
        commands:
          - "dailyquests"   # opens an InvUI window
  head:
    slot: 2
    player-inventory: true
    item:
      material: PLAYER_HEAD

Result: once the other inventory is open, and after it is closed, the player still has the player-inventory buttons as real items, and their own items are gone. They only come back when the player reconnects (forceGiveInventory) or opens and closes another clear-inventory menu.

Cause

ZInventory#closeInventory waits one tick, then only cleans up when the new top inventory is not a zMenu one:

if (newHolder != null && !(newHolder instanceof InventoryDefault)) {

Inventories created without holder return null here: InvUI windows (their Bukkit view is built on new CraftInventory(new SimpleContainer(0))), and any Bukkit.createInventory(null, ...). The player-inventory buttons are therefore not cleared and the saved inventory is not given back. The close actions just below already treat a null holder as "not a zMenu inventory".

Fix

The condition is now !isInNewzMenuInventory, so every inventory that is not a zMenu menu (with or without holder) clears the buttons and gives the saved inventory back, as when the menu is closed normally.

Tests

The plugin builds and the Test:v26_1_2 suite passes. Not tested in game yet: we hit the bug on our server (Paper 26.1.2, InvUI 2 windows opened from a clear-inventory menu) and will test the jar there.

🤖 Generated with Claude Code