Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-30 11:33:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix server-side formspec state keeping issue (#13332)

Browse Source
This commit is contained in:
luk3yx 2023-03-20 08:23:11 +13:00 committed by GitHub
parent 6fe9bc8ae1
commit 5fa63a0b0c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/server.cpp
View File

@ -1539,10 +1539,13 @@ void Server::SendShowFormspecMessage(session_t peer_id, const std::string &forms
{ {
NetworkPacket pkt(TOCLIENT_SHOW_FORMSPEC, 0, peer_id); NetworkPacket pkt(TOCLIENT_SHOW_FORMSPEC, 0, peer_id);
if (formspec.empty()){ if (formspec.empty()){
//the client should close the formspec // The client should close the formspec
//but make sure there wasn't another one open in meantime // But make sure there wasn't another one open in meantime
// If the formname is empty, any open formspec will be closed so the
// form name should always be erased from the state.
const auto it = m_formspec_state_data.find(peer_id); const auto it = m_formspec_state_data.find(peer_id);
if (it != m_formspec_state_data.end() && it->second == formname) { if (it != m_formspec_state_data.end() &&
(it->second == formname || formname.empty())) {
m_formspec_state_data.erase(peer_id); m_formspec_state_data.erase(peer_id);
} }
pkt.putLongString(""); pkt.putLongString("");