mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-07-03 05:21:34 +00:00
Code Issues Releases Wiki Activity

[Client] Fix packetOrigin comparisons when sending ObjectState

Browse source
This commit is contained in:
David Cernat 2022-05-22 16:43:15 +03:00
parent 01208ba90c
commit 81251675a4
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
apps/openmw/mwscript/miscextensions.cpp
View file

@ -200,12 +200,12 @@ namespace MWScript
last packet regarding its state did not already attempt to enable it (to prevent
packet spam)
*/
if (mwmp::Main::get().getLocalPlayer()->isLoggedIn())
if (mwmp::Main::get().getLocalPlayer()->isLoggedIn() && ptr.isInCell())
{
unsigned char packetOrigin = ScriptController::getPacketOriginFromContextType(runtime.getContext().getContextType());
if (packetOrigin == Interpreter::Context::CONSOLE || packetOrigin == Interpreter::Context::DIALOGUE ||
(ptr.isInCell() && ptr.getRefData().getLastCommunicatedState() != MWWorld::RefData::StateCommunication::Enabled))
if (packetOrigin == mwmp::CLIENT_CONSOLE || packetOrigin == mwmp::CLIENT_DIALOGUE ||
ptr.getRefData().getLastCommunicatedState() != MWWorld::RefData::StateCommunication::Enabled)
{
ptr.getRefData().setLastCommunicatedState(MWWorld::RefData::StateCommunication::Enabled);
@ -251,12 +251,12 @@ namespace MWScript
last packet regarding its state did not already attempt to disable it (to prevent
packet spam)
*/
if (mwmp::Main::get().getLocalPlayer()->isLoggedIn())
if (mwmp::Main::get().getLocalPlayer()->isLoggedIn() && ptr.isInCell())
{
unsigned char packetOrigin = ScriptController::getPacketOriginFromContextType(runtime.getContext().getContextType());
if (packetOrigin == Interpreter::Context::CONSOLE || packetOrigin == Interpreter::Context::DIALOGUE ||
(ptr.isInCell() && ptr.getRefData().getLastCommunicatedState() != MWWorld::RefData::StateCommunication::Disabled))
if (packetOrigin == mwmp::CLIENT_CONSOLE || packetOrigin == mwmp::CLIENT_DIALOGUE ||
ptr.getRefData().getLastCommunicatedState() != MWWorld::RefData::StateCommunication::Disabled)
{
ptr.getRefData().setLastCommunicatedState(MWWorld::RefData::StateCommunication::Disabled);