Skip to content

Commit cc6eb05

Browse files
committed
remove BindOnChangeFlags.ExecuteOnNew for better consistency
1 parent 0b06225 commit cc6eb05

3 files changed

Lines changed: 2 additions & 26 deletions

File tree

LiteEntitySystem/ClientEntityManager.cs

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1077,29 +1077,10 @@ private unsafe void ApplyEntityDelta(
10771077
if (field.IsPredicted)
10781078
RefMagic.CopyBlock(predictedData + field.PredictedOffset, fieldData, field.Size);
10791079

1080-
if (field.OnSync != null && insideNewRPC)
1081-
{
1082-
if ((field.OnSyncFlags & BindOnChangeFlags.ExecuteOnNew) != 0)
1083-
{
1084-
//execute immediately using temp data buffer inside SetFromAndSync
1085-
field.TypeProcessor.SetFromAndSync(target, offset, fieldData, field.OnSync);
1086-
}
1087-
// call sync calls on first sync in new because constructed will be empty (to reduce datasize)
1088-
if (firstSync && (field.OnSyncFlags & BindOnChangeFlags.ExecuteOnSync) != 0)
1089-
{
1090-
if (field.TypeProcessor.SetFromAndSync(target, offset, fieldData))
1091-
_syncCalls[_syncCallsCount++] = new SyncCallInfo(entity, readerPosition, i, !hasData);
1092-
}
1093-
//else skip set? because will be triggered in OnConstructed
1094-
}
1095-
else if (field.OnSync != null && (field.OnSyncFlags & BindOnChangeFlags.ExecuteOnSync) != 0 && field.TypeProcessor.SetFromAndSync(target, offset, fieldData))
1096-
{
1080+
if (field.OnSync != null && (field.OnSyncFlags & BindOnChangeFlags.ExecuteOnSync) != 0 && field.TypeProcessor.SetFromAndSync(target, offset, fieldData))
10971081
_syncCalls[_syncCallsCount++] = new SyncCallInfo(entity, readerPosition, i, !hasData);
1098-
}
10991082
else
1100-
{
11011083
field.TypeProcessor.SetFrom(target, offset, fieldData);
1102-
}
11031084

11041085
if (hasData)
11051086
readerPosition += field.IntSize;

LiteEntitySystem/ControllerLogic.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ protected override void RegisterRPC(ref RPCRegistrator r)
3838
r.BindOnChange<ControllerLogic, EntitySharedReference>(
3939
ref _controlledEntity,
4040
static (e, prev) => e.OnControlledEntityChanged(e.EntityManager.GetEntityById<PawnLogic>(prev)),
41-
BindOnChangeFlags.ExecuteOnSync | BindOnChangeFlags.ExecuteOnNew | BindOnChangeFlags.ExecuteOnServer);
41+
BindOnChangeFlags.ExecuteOnSync | BindOnChangeFlags.ExecuteOnServer);
4242
}
4343

4444
/// <summary>

LiteEntitySystem/RPCRegistrator.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,6 @@ public enum BindOnChangeFlags
2828
/// </summary>
2929
ExecuteOnRollbackReset = 1 << 3,
3030

31-
/// <summary>
32-
/// Execute after entity new() called and initial state read before OnConstructed
33-
/// </summary>
34-
ExecuteOnNew = 1 << 4,
35-
3631
/// <summary>
3732
/// Combines ExecuteOnSync, ExecuteOnPrediction and ExecuteOnServer flags
3833
/// </summary>

0 commit comments

Comments
 (0)