Post-merge fixes

Author: ShadauxCat

com.unity.netcode.gameobjects/Runtime/Core/NetworkManager.cs

@@ -471,9 +471,14 @@ public void NetworkUpdate(NetworkUpdateStage updateStage)
 
                         // This should be invoked just prior to the MessageManager processes its outbound queue.
                         SceneManager.CheckForAndSendNetworkObjectSceneChanged();
-#if !UNIFIED_NETCODE
-                        // Process outbound messages
-                        MessageManager.ProcessSendQueues();
+#if UNIFIED_NETCODE
+                        if (!NetworkConfig.Prefabs.HasGhostPrefabs)
+                        {
+#endif
+                            // Process outbound messages
+                            MessageManager.ProcessSendQueues();
+#if UNIFIED_NETCODE
+                        }
 #endif
 
                         // Metrics update needs to be driven by NetworkConnectionManager's update to assure metrics are dispatched after the send queue is processed.

com.unity.netcode.gameobjects/Runtime/Transports/Unified/UnifiedNetcodeTransport.cs

@@ -144,7 +144,7 @@ public void SendRpc(TransportRpc rpc)
         {
             var rpcQueue = SystemAPI.GetSingleton<RpcCollection>().GetRpcQueue<TransportRpc, TransportRpc>();
             var ghostInstance = GetComponentLookup<GhostInstance>();
-            foreach (var rpcDataStreamBuffer in SystemAPI.Query<DynamicBuffer<OutgoingRpcDataStreamBuffer>>())
+            foreach (var rpcDataStreamBuffer in SystemAPI.Query<DynamicBuffer<OutgoingOutOfBandRpcDataStreamBuffer>>())
             {
                 rpcQueue.Schedule(rpcDataStreamBuffer, ghostInstance, rpc);
             }
@@ -273,7 +273,7 @@ private void OnClientConnectedToServer(Connection connection, NetCodeConnectionE
             };
             m_ServerClientId = connection.NetworkId.Value;
             InvokeOnTransportEvent(NetworkEvent.Connect, (ulong)connection.NetworkId.Value, default, m_RealTimeProvider.RealTimeSinceStartup);
-            var updateSystem = NetCode.Netcode.GetWorld(false).GetExistingSystemManaged<UnifiedNetcodeUpdateSystem>();
+            var updateSystem = m_NetworkManager.NetcodeWorld.GetExistingSystemManaged<UnifiedNetcodeUpdateSystem>();
             updateSystem.EntityManager.AddBuffer<TransportRpcData>(connection.ConnectionEntity);
         }
 
@@ -286,7 +286,7 @@ private void OnServerNewClientConnection(Connection connection, NetCodeConnectio
                 Connection = connection
             }; ;
             InvokeOnTransportEvent(NetworkEvent.Connect, (ulong)connection.NetworkId.Value, default, m_RealTimeProvider.RealTimeSinceStartup);
-            var updateSystem = NetCode.Netcode.GetWorld(false).GetExistingSystemManaged<UnifiedNetcodeUpdateSystem>();
+            var updateSystem = m_NetworkManager.NetcodeWorld.GetExistingSystemManaged<UnifiedNetcodeUpdateSystem>();
             updateSystem.EntityManager.AddBuffer<TransportRpcData>(connection.ConnectionEntity);
         }