Merge branch 'dev' into syntax-highlighter-unified

This commit is contained in:
bigguy345 committed 2026-02-04 05:22:19 +02:00
commit bd9d0a3889
46 files changed
+2067 -698

No files matched your search

@@ -535,7 +535,10 @@ public abstract class GuiNPCInterface extends GuiScreen {
pendingSubGuiResult = null;
handler.accept(gui);
}
subgui = null;
// Only null out subgui if it wasn't replaced by a new one during subGuiClosed
if (subgui == gui) {
subgui = null;
}
initGui();
}