evert/osb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix crash when disconnecting with inventory open

Browse Source 
additionally, fix humanoid identity being constantly sent by the server even when unchanged
This commit is contained in:
Kae 2023-06-22 13:29:42 +10:00
parent ca195431ff
commit 87163147b3
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
source/frontend/StarMainInterface.cpp
View File

@ -96,7 +96,8 @@ MainInterface::MainInterface(UniverseClientPtr client, WorldPainterPtr painter,
m_inventoryWindow = make_shared<InventoryPane>(this, m_client->mainPlayer(), m_containerInteractor); m_inventoryWindow = make_shared<InventoryPane>(this, m_client->mainPlayer(), m_containerInteractor);
m_paneManager.registerPane(MainInterfacePanes::Inventory, PaneLayer::Window, m_inventoryWindow, [this](PanePtr const&) { m_paneManager.registerPane(MainInterfacePanes::Inventory, PaneLayer::Window, m_inventoryWindow, [this](PanePtr const&) {
m_client->mainPlayer()->clearSwap(); if (auto player = m_client->mainPlayer())
player->clearSwap();
if (m_containerPane) { if (m_containerPane) {
m_containerPane->dismiss(); m_containerPane->dismiss();
m_containerPane = {}; m_containerPane = {};
@ -216,7 +217,8 @@ void MainInterface::openCraftingWindow(Json const& config, EntityId sourceEntity
m_craftingWindow = make_shared<CraftingPane>(m_client->worldClient(), m_client->mainPlayer(), config, sourceEntityId); m_craftingWindow = make_shared<CraftingPane>(m_client->worldClient(), m_client->mainPlayer(), config, sourceEntityId);
m_paneManager.displayPane(PaneLayer::Window, m_craftingWindow, [this](PanePtr const&) { m_paneManager.displayPane(PaneLayer::Window, m_craftingWindow, [this](PanePtr const&) {
m_client->mainPlayer()->clearSwap(); if (auto player = m_client->mainPlayer())
player->clearSwap();
}); });
} }
@ -233,7 +235,8 @@ void MainInterface::openMerchantWindow(Json const& config, EntityId sourceEntity
m_paneManager.displayPane(PaneLayer::Window, m_paneManager.displayPane(PaneLayer::Window,
m_merchantWindow, m_merchantWindow,
[this](PanePtr const&) { [this](PanePtr const&) {
m_client->mainPlayer()->clearSwap(); if (auto player = m_client->mainPlayer())
player->clearSwap();
m_paneManager.dismissRegisteredPane(MainInterfacePanes::Inventory); m_paneManager.dismissRegisteredPane(MainInterfacePanes::Inventory);
}); });
m_paneManager.displayRegisteredPane(MainInterfacePanes::Inventory); m_paneManager.displayRegisteredPane(MainInterfacePanes::Inventory);
@ -401,7 +404,8 @@ void MainInterface::handleInteractAction(InteractAction interactAction) {
m_containerPane = make_shared<ContainerPane>(world, m_client->mainPlayer(), m_containerInteractor); m_containerPane = make_shared<ContainerPane>(world, m_client->mainPlayer(), m_containerInteractor);
m_paneManager.displayPane(PaneLayer::Window, m_containerPane, [this](PanePtr const&) { m_paneManager.displayPane(PaneLayer::Window, m_containerPane, [this](PanePtr const&) {
m_client->mainPlayer()->clearSwap(); if (auto player = m_client->mainPlayer())
player->clearSwap();
m_paneManager.dismissRegisteredPane(MainInterfacePanes::Inventory); m_paneManager.dismissRegisteredPane(MainInterfacePanes::Inventory);
}); });
@ -496,7 +500,8 @@ void MainInterface::handleInteractAction(InteractAction interactAction) {
if (scriptPane->openWithInventory()) { if (scriptPane->openWithInventory()) {
m_paneManager.displayPane(PaneLayer::Window, scriptPane, [this](PanePtr const&) { m_paneManager.displayPane(PaneLayer::Window, scriptPane, [this](PanePtr const&) {
m_client->mainPlayer()->clearSwap(); if (auto player = m_client->mainPlayer())
player->clearSwap();
m_paneManager.dismissRegisteredPane(MainInterfacePanes::Inventory); m_paneManager.dismissRegisteredPane(MainInterfacePanes::Inventory);
}); });
m_paneManager.displayRegisteredPane(MainInterfacePanes::Inventory); m_paneManager.displayRegisteredPane(MainInterfacePanes::Inventory);

1
source/game/StarPlayer.cpp
View File

@ -1759,7 +1759,6 @@ void Player::getNetStates(bool initial) {
if (m_identityNetState.pullUpdated()) { if (m_identityNetState.pullUpdated()) {
m_identity = m_identityNetState.get(); m_identity = m_identityNetState.get();
m_identityUpdated = true;
m_humanoid->setIdentity(m_identity); m_humanoid->setIdentity(m_identity);
} }