Skip to content

Close non-InvUI containers before opening a window #131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
R00tB33rMan wants to merge 1 commit into
base: main
Choose a base branch
from
+9 −0
Open

Close non-InvUI containers before opening a window #131

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions invui/src/main/java/xyz/xenondevs/invui/window/AbstractWindow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import org.bukkit.Bukkit;
import org.bukkit.GameMode;
import org.bukkit.NamespacedKey;
import org.bukkit.craftbukkit.entity.CraftPlayer;
import org.bukkit.craftbukkit.inventory.CraftItemStack;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.*;
Expand Down Expand Up @@ -538,6 +539,14 @@ public void open() {
throw new IllegalStateException("Opening a window is not allowed while handling window close. Consider setting a fallback window or scheduling a task instead.");
ThreadCheck.checkOwnedBy(viewer);

// close containers that weren't opened by InvUI, so that they return their items and call their close event
var serverPlayer = ((CraftPlayer) viewer).getHandle();
if (serverPlayer.containerMenu != serverPlayer.inventoryMenu && WindowManager.getInstance().getOpenWindow(viewer) == null) {
viewer.closeInventory(Reason.OPEN_NEW);
if (isOpen || !viewer.isValid() || !viewer.isConnected())
return;
}

try {
isInOpeningContext.set(true);

Expand Down