Skip to content
Permalink
Browse files
Disable inventory if player's inventory formspec is blank (#11827)
  • Loading branch information
rollerozxa committed Dec 13, 2021
1 parent 84efe27 commit fcf86ded8f8f5f0b0da9a59e4e9035838bf19d01
Showing with 15 additions and 7 deletions.
  1. +1 −0 doc/lua_api.txt
  2. +14 −7 src/client/game.cpp
@@ -6690,6 +6690,7 @@ object you are working with still exists.
* `set_inventory_formspec(formspec)`
* Redefine player's inventory form
* Should usually be called in `on_joinplayer`
* If `formspec` is `""`, the player's inventory is disabled.
* `get_inventory_formspec()`: returns a formspec string
* `set_formspec_prepend(formspec)`:
* the formspec string will be added to every formspec shown to the user,
@@ -2060,15 +2060,22 @@ void Game::openInventory()
InventoryLocation inventoryloc;
inventoryloc.setCurrentPlayer();

if (!client->modsLoaded()
|| !client->getScript()->on_inventory_open(fs_src->m_client->getInventory(inventoryloc))) {
TextDest *txt_dst = new TextDestPlayerInventory(client);
auto *&formspec = m_game_ui->updateFormspec("");
GUIFormSpecMenu::create(formspec, client, m_rendering_engine->get_gui_env(),
&input->joystick, fs_src, txt_dst, client->getFormspecPrepend(), sound);
if (client->modsLoaded() && client->getScript()->on_inventory_open(fs_src->m_client->getInventory(inventoryloc))) {
delete fs_src;
return;
}

formspec->setFormSpec(fs_src->getForm(), inventoryloc);
if (fs_src->getForm().empty()) {
delete fs_src;
return;
}

TextDest *txt_dst = new TextDestPlayerInventory(client);
auto *&formspec = m_game_ui->updateFormspec("");
GUIFormSpecMenu::create(formspec, client, m_rendering_engine->get_gui_env(),
&input->joystick, fs_src, txt_dst, client->getFormspecPrepend(), sound);

formspec->setFormSpec(fs_src->getForm(), inventoryloc);
}


0 comments on commit fcf86de

Please sign in to comment.