Changeset 9485 in orxonox.OLD

Timestamp:

Jul 26, 2006, 10:51:20 AM (18 years ago)

Author:

patrick

Message:

the proxy server receives to force clients creating world entities

File:

• branches/proxy/src/lib/network/network_stream.cc (modified) (1 diff)

branches/proxy/src/lib/network/network_stream.cc

@@ -965 +965 @@
           }
 
-          // if the node we got this unknown sync from is a client we ignore it (since it has no rights to create a new sync)
-          if ( peers[peer->second.userId].isClient() || peers[peer->second.userId].isProxyServerActive())
+          // if the node we got this unknown sync we ignore it if:
+          //  - the remote host is a client
+          //  - the remote host is a proxy server and we are master server
+          // (since it has no rights to create a new sync)
+          if ( peers[peer->second.userId].isClient() ||
+               (peers[peer->second.userId].isProxyServerActive() && SharedNetworkData::getInstance()->isMasterServer()))
           {
             offset += syncDataLength;