Synchronize changes from 1.6 master branch [ci skip]

github-actions[bot] · github-actions[bot] · commit c184e914fed8 · 2025-05-05T14:16:46.000Z
d88f667 Fix dimension -1 after #4184 (#4198)
diff --git a/Client/mods/deathmatch/logic/CClientStreamElement.cpp b/Client/mods/deathmatch/logic/CClientStreamElement.cpp
@@ -94,7 +94,7 @@ void CClientStreamElement::InternalStreamOut(bool ignoreSendingEvent)
 void CClientStreamElement::NotifyCreate()
 {
     // If the dimensions are different, stream out and do not continue
-    if (GetDimension() != m_pStreamer->m_usDimension)
+    if (GetDimension() != -1 && GetDimension() != m_pStreamer->m_usDimension)
     {
         m_bStreamedIn = true; // InternalStreamOut need it
         InternalStreamOut(true);

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ void CClientStreamElement::InternalStreamOut(bool ignoreSendingEvent)`
`94`	`94`	`void CClientStreamElement::NotifyCreate()`
`95`	`95`	`{`
`96`	`96`	`// If the dimensions are different, stream out and do not continue`
`97`		`- if (GetDimension() != m_pStreamer->m_usDimension)`
	`97`	`+ if (GetDimension() != -1 && GetDimension() != m_pStreamer->m_usDimension)`
`98`	`98`	`{`
`99`	`99`	`m_bStreamedIn = true; // InternalStreamOut need it`
`100`	`100`	`InternalStreamOut(true);`