Skip to content

Commit 77a0499

Browse files
MiaoMiao4567MiaoMiao4567
committed
dnt update
1 parent 7b1c1ac commit 77a0499

13 files changed

Lines changed: 88 additions & 23 deletions

File tree

‎Causality0.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public sealed class Causality0 : Plugin<Causality0Config>
3838

3939
public override string Author { get; } = "MiaoMiao";
4040

41-
public override Version Version { get; } = new(1, 0, 1);
41+
public override Version Version { get; } = new(1, 0, 2);
4242

4343
public override Version RequiredApiVersion { get; } = new(LabApiProperties.CompiledVersion);
4444

‎Core/Timeline.cs‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,14 @@ public static int Count
119119
}
120120
}
121121

122+
private static bool CanRec(ReferenceHub h)
123+
{
124+
return h != null && !h.isLocalPlayer && h.PlayerId != 0 && (h.authManager == null || !h.authManager.DoNotTrack);
125+
}
126+
122127
public static void TrackActor(ReferenceHub h)
123128
{
124-
if (!IsRec || h == null || h.isLocalPlayer || h.PlayerId == 0 || Tracks.ContainsKey(h.PlayerId))
129+
if (!IsRec || !CanRec(h) || Tracks.ContainsKey(h.PlayerId))
125130
{
126131
return;
127132
}
@@ -154,7 +159,7 @@ public static void StartRecord(ReferenceHub h)
154159
_dm.Clear();
155160
foreach (ReferenceHub hub in ReferenceHub.AllHubs)
156161
{
157-
if (hub == null || hub.isLocalPlayer || hub.PlayerId == 0)
162+
if (!CanRec(hub))
158163
{
159164
continue;
160165
}
@@ -1045,7 +1050,7 @@ private static void ReplayInteract(InteractFrame x)
10451050

10461051
public static void TrackProjectile(ThrownProjectile p, ItemType t, ReferenceHub h)
10471052
{
1048-
if (!IsRec || p == null || h == null)
1053+
if (!IsRec || p == null || !CanRec(h) || !Tracks.ContainsKey(h.PlayerId))
10491054
{
10501055
return;
10511056
}

‎Event/PlayerEvent/Interacting.cs‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,12 @@ private void OnInteractedDoor(PlayerInteractedDoorEventArgs ev)
2323
return;
2424
}
2525

26-
Timeline.TrackInteract(ev.Player.ReferenceHub.PlayerId, ev.Door.Base.DoorId, 1, ev.CanOpen, ev.Door.Base.transform.position);
26+
ReferenceHub h = ev.Player.ReferenceHub;
27+
if (h == null || h.authManager?.DoNotTrack == true)
28+
{
29+
return;
30+
}
31+
32+
Timeline.TrackInteract(h.PlayerId, ev.Door.Base.DoorId, 1, ev.CanOpen, ev.Door.Base.transform.position);
2733
}
2834
}

‎Event/PlayerEvent/Lifecycle.cs‎

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,13 @@ private void OnChangedRole(PlayerChangedRoleEventArgs ev)
2727
return;
2828
}
2929

30-
Timeline.TrackLifecycleRole(ev.Player.ReferenceHub.PlayerId, ev.NewRole.RoleTypeId);
30+
ReferenceHub h = ev.Player.ReferenceHub;
31+
if (h == null || h.authManager?.DoNotTrack == true)
32+
{
33+
return;
34+
}
35+
36+
Timeline.TrackLifecycleRole(h.PlayerId, ev.NewRole.RoleTypeId);
3137
}
3238

3339
private void OnDying(PlayerDyingEventArgs ev)
@@ -37,7 +43,13 @@ private void OnDying(PlayerDyingEventArgs ev)
3743
return;
3844
}
3945

40-
Timeline.TrackLifecycleDeath(ev.Player.ReferenceHub.PlayerId, ev.DamageHandler);
46+
ReferenceHub h = ev.Player.ReferenceHub;
47+
if (h == null || h.authManager?.DoNotTrack == true)
48+
{
49+
return;
50+
}
51+
52+
Timeline.TrackLifecycleDeath(h.PlayerId, ev.DamageHandler);
4153
}
4254

4355
private void OnLeft(PlayerLeftEventArgs ev)
@@ -47,6 +59,12 @@ private void OnLeft(PlayerLeftEventArgs ev)
4759
return;
4860
}
4961

50-
Timeline.TrackLifecycleLeft(ev.Player.ReferenceHub.PlayerId);
62+
ReferenceHub h = ev.Player.ReferenceHub;
63+
if (h == null || h.authManager?.DoNotTrack == true)
64+
{
65+
return;
66+
}
67+
68+
Timeline.TrackLifecycleLeft(h.PlayerId);
5169
}
5270
}

‎Event/PlayerEvent/Reloading.cs‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,12 @@ private void OnReloadingWeapon(PlayerReloadingWeaponEventArgs ev)
2323
return;
2424
}
2525

26-
Timeline.MarkInput(ev.Player.ReferenceHub.PlayerId, Timeline.InputReload);
26+
ReferenceHub h = ev.Player.ReferenceHub;
27+
if (h == null || h.authManager?.DoNotTrack == true)
28+
{
29+
return;
30+
}
31+
32+
Timeline.MarkInput(h.PlayerId, Timeline.InputReload);
2733
}
2834
}

‎Event/PlayerEvent/Shooting.cs‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,12 @@ private void OnShootingWeapon(PlayerShootingWeaponEventArgs ev)
2323
return;
2424
}
2525

26-
Timeline.MarkInput(ev.Player.ReferenceHub.PlayerId, Timeline.InputShoot);
26+
ReferenceHub h = ev.Player.ReferenceHub;
27+
if (h == null || h.authManager?.DoNotTrack == true)
28+
{
29+
return;
30+
}
31+
32+
Timeline.MarkInput(h.PlayerId, Timeline.InputShoot);
2733
}
2834
}

‎Event/PlayerEvent/Throwing.cs‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,12 @@ private void OnThrewProjectile(PlayerThrewProjectileEventArgs ev)
3333
return;
3434
}
3535

36-
Timeline.TrackProjectile(ev.Projectile.Base, ev.ThrowableItem.Base.ItemTypeId, ev.Player.ReferenceHub);
36+
ReferenceHub h = ev.Player.ReferenceHub;
37+
if (h == null || h.authManager?.DoNotTrack == true)
38+
{
39+
return;
40+
}
41+
42+
Timeline.TrackProjectile(ev.Projectile.Base, ev.ThrowableItem.Base.ItemTypeId, h);
3743
}
3844
}

‎Event/PlayerEvent/Using.cs‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,13 @@ private void OnUsingItem(PlayerUsingItemEventArgs ev)
2525
return;
2626
}
2727

28-
Timeline.MarkInput(ev.Player.ReferenceHub.PlayerId, Timeline.InputUse);
28+
ReferenceHub h = ev.Player.ReferenceHub;
29+
if (h == null || h.authManager?.DoNotTrack == true)
30+
{
31+
return;
32+
}
33+
34+
Timeline.MarkInput(h.PlayerId, Timeline.InputUse);
2935
}
3036

3137
private void OnCancellingUsingItem(PlayerCancellingUsingItemEventArgs ev)
@@ -35,6 +41,12 @@ private void OnCancellingUsingItem(PlayerCancellingUsingItemEventArgs ev)
3541
return;
3642
}
3743

38-
Timeline.MarkInput(ev.Player.ReferenceHub.PlayerId, Timeline.InputUseCancel);
44+
ReferenceHub h = ev.Player.ReferenceHub;
45+
if (h == null || h.authManager?.DoNotTrack == true)
46+
{
47+
return;
48+
}
49+
50+
Timeline.MarkInput(h.PlayerId, Timeline.InputUseCancel);
3951
}
4052
}

‎Event/PlayerEvent/Verified.cs‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,12 @@ private void OnJoined(PlayerJoinedEventArgs ev)
2323
return;
2424
}
2525

26-
Timeline.TrackActor(ev.Player.ReferenceHub);
26+
ReferenceHub h = ev.Player.ReferenceHub;
27+
if (h == null || h.authManager?.DoNotTrack == true)
28+
{
29+
return;
30+
}
31+
32+
Timeline.TrackActor(h);
2733
}
2834
}

‎Event/PlayerEvent/VoiceChat.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ private void OnSendingVoice(PlayerSendingVoiceMessageEventArgs ev)
2727
}
2828

2929
ref VoiceMessage m = ref ev.Message;
30-
if (m.SpeakerNull || m.Speaker == null)
30+
if (m.SpeakerNull || m.Speaker == null || m.Speaker.authManager?.DoNotTrack == true)
3131
{
3232
return;
3333
}

0 commit comments

Comments
 (0)