@@ -357,16 +357,16 @@ internal void VarUpdate()
357
357
358
358
private void SyncedVarUpdate ( )
359
359
{
360
- if ( ! CouldHaveDirtySyncedVars ( ) )
360
+ if ( ! IsServer || ! CouldHaveDirtySyncedVars ( ) )
361
361
return ;
362
362
363
363
syncedVarIndexesToReset . Clear ( ) ;
364
364
syncedVarIndexesToResetSet . Clear ( ) ;
365
365
366
- for ( int i = 0 ; i < ( IsServer ? NetworkingManager . Singleton . ConnectedClientsList . Count : 1 ) ; i ++ )
366
+ for ( int i = 0 ; i < NetworkingManager . Singleton . ConnectedClientsList . Count ; i ++ )
367
367
{
368
368
// Do this check here to prevent doing all the expensive dirty checks
369
- if ( ! IsServer || this . NetworkedObject . observers . Contains ( NetworkingManager . Singleton . ConnectedClientsList [ i ] . ClientId ) )
369
+ if ( this . NetworkedObject . observers . Contains ( NetworkingManager . Singleton . ConnectedClientsList [ i ] . ClientId ) )
370
370
{
371
371
// This iterates over every "channel group".
372
372
for ( int j = 0 ; j < channelMappedSyncedVarIndexes . Count ; j ++ )
@@ -378,7 +378,7 @@ private void SyncedVarUpdate()
378
378
writer . WriteUInt64Packed ( NetworkId ) ;
379
379
writer . WriteUInt16Packed ( NetworkedObject . GetOrderIndex ( this ) ) ;
380
380
381
- ulong clientId = IsServer ? NetworkingManager . Singleton . ConnectedClientsList [ i ] . ClientId : NetworkingManager . Singleton . ServerClientId ;
381
+ ulong clientId = NetworkingManager . Singleton . ConnectedClientsList [ i ] . ClientId ;
382
382
bool writtenAny = false ;
383
383
for ( int k = 0 ; k < syncedVars . Count ; k ++ )
384
384
{
@@ -397,21 +397,20 @@ private void SyncedVarUpdate()
397
397
}
398
398
399
399
bool isDirty = syncedVars [ k ] . IsDirty ( ) ; // cache this here. You never know what operations users will do in the dirty methods
400
- bool shouldWrite = isDirty && IsServer ;
401
400
402
401
if ( NetworkingManager . Singleton . NetworkConfig . EnsureNetworkedVarLengthSafety )
403
402
{
404
- if ( ! shouldWrite )
403
+ if ( ! isDirty )
405
404
{
406
405
writer . WriteUInt16Packed ( 0 ) ;
407
406
}
408
407
}
409
408
else
410
409
{
411
- writer . WriteBool ( shouldWrite ) ;
410
+ writer . WriteBool ( isDirty ) ;
412
411
}
413
412
414
- if ( shouldWrite )
413
+ if ( isDirty )
415
414
{
416
415
writtenAny = true ;
417
416
@@ -441,10 +440,7 @@ private void SyncedVarUpdate()
441
440
442
441
if ( writtenAny )
443
442
{
444
- if ( IsServer )
445
- InternalMessageSender . Send ( clientId , MLAPIConstants . MLAPI_SYNCED_VAR , channelsForSyncedVarGroups [ j ] , stream , SecuritySendFlags . None , this . NetworkedObject ) ;
446
- else
447
- InternalMessageSender . Send ( NetworkingManager . Singleton . ServerClientId , MLAPIConstants . MLAPI_SYNCED_VAR , channelsForSyncedVarGroups [ j ] , stream , SecuritySendFlags . None , null ) ;
443
+ InternalMessageSender . Send ( clientId , MLAPIConstants . MLAPI_SYNCED_VAR , channelsForSyncedVarGroups [ j ] , stream , SecuritySendFlags . None , this . NetworkedObject ) ;
448
444
}
449
445
}
450
446
}
0 commit comments