Merge pull request #1485 from Hoikas/subworld_msg_problem

Fix 3 problems with `plSubWorldMsg`.
H-uru · Sep 18, 2023 · dedae35 · dedae35
2 parents accab6a + 5931bd0
commit dedae35
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/Sources/Plasma/PubUtilLib/plAvatar/plArmatureMod.cpp b/Sources/Plasma/PubUtilLib/plAvatar/plArmatureMod.cpp
@@ -1379,7 +1379,7 @@ bool plArmatureMod::MsgReceive(plMessage* msg)
         if (fController)
         {
             fController->SetSubworld(subMsg->fWorldKey);
-            DirtySynchState(kSDLAvatar, plSynchedObject::kBCastToClients);
+            DirtyPhysicalSynchState(plSynchedObject::kBCastToClients);
         }
         return true;
     }

diff --git a/Sources/Plasma/PubUtilLib/plModifier/plResponderModifier.cpp b/Sources/Plasma/PubUtilLib/plModifier/plResponderModifier.cpp
@@ -208,6 +208,8 @@ bool plResponderModifier::IIsLocalOnlyCmd(plMessage* cmd)
         return true;
     if (plCameraMsg::ConvertNoRef(cmd))     // don't want to change our camera
         return true;
+    if (plSubWorldMsg::ConvertNoRef(cmd))   // don't want to enter a subworld (changes the avatar SDL)
+        return true;
 
     plSoundMsg *snd = plSoundMsg::ConvertNoRef( cmd );
     if (snd != nullptr && snd->Cmd(plSoundMsg::kIsLocalOnly))
@@ -351,6 +353,7 @@ bool plResponderModifier::IContinueSending()
                     plArmatureMod *avatar = plAvatarMgr::GetInstance()->GetLocalAvatar();
                     if(avatar)
                     {
+                        swMsg->ClearReceivers();
                         swMsg->AddReceiver(avatar->GetKey());
                     }
                 }