Synchronize changes from 1.6 master branch [ci skip]

9af03b3 Fix elements sometimes being visible from other dimensions in the current dimension (#4184)

Author: github-actions[bot]

Client/mods/deathmatch/logic/CClientStreamElement.cpp

@@ -61,7 +61,7 @@ void CClientStreamElement::InternalStreamIn(bool bInstantly)
     }
 }
 
-void CClientStreamElement::InternalStreamOut()
+void CClientStreamElement::InternalStreamOut(bool ignoreSendingEvent)
 {
     if (m_bStreamedIn)
     {
@@ -83,13 +83,24 @@ void CClientStreamElement::InternalStreamOut()
             }
         }
 
-        CLuaArguments Arguments;
-        CallEvent("onClientElementStreamOut", Arguments, true);
+        if (!ignoreSendingEvent)
+        {
+            CLuaArguments Arguments;
+            CallEvent("onClientElementStreamOut", Arguments, true);
+        }
     }
 }
 
 void CClientStreamElement::NotifyCreate()
 {
+    // If the dimensions are different, stream out and do not continue
+    if (GetDimension() != m_pStreamer->m_usDimension)
+    {
+        m_bStreamedIn = true; // InternalStreamOut need it
+        InternalStreamOut(true);
+        return;
+    }
+
     // Update common atrributes
     if (!m_bDoubleSidedInit)
         m_bDoubleSided = IsDoubleSided();

Client/mods/deathmatch/logic/CClientStreamElement.h

@@ -30,7 +30,7 @@ class CClientStreamElement : public CClientEntity
     CClientStreamSector*    GetStreamSector() { return m_pStreamSector; }
     bool                    IsStreamedIn() { return m_bStreamedIn; }
     void                    InternalStreamIn(bool bInstantly);
-    void                    InternalStreamOut();
+    void                    InternalStreamOut(bool ignoreSendingEvent = false);
     virtual void            StreamIn(bool bInstantly) = 0;
     virtual void            StreamOut() = 0;
     virtual void            NotifyCreate();