From eea7cba805421bcabcb5f6036d7c7a8510f697f3 Mon Sep 17 00:00:00 2001
From: Ottermandias <nickroederspam+git1@gmail.com>
Date: Tue, 17 Aug 2021 18:30:34 +0200
Subject: [PATCH] Check clientstate validity on every player watcher iteration.

---
 Penumbra.PlayerWatch/PlayerWatchBase.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Penumbra.PlayerWatch/PlayerWatchBase.cs b/Penumbra.PlayerWatch/PlayerWatchBase.cs
index 6fa43c00..954ff098 100644
--- a/Penumbra.PlayerWatch/PlayerWatchBase.cs
+++ b/Penumbra.PlayerWatch/PlayerWatchBase.cs
@@ -214,6 +214,11 @@ namespace Penumbra.PlayerWatch
 
             for( var i = 0; i < ActorsPerFrame; ++i )
             {
+                if( _pi.ClientState.LocalPlayer == null )
+                {
+                    return;
+                }
+
                 _frameTicker = _frameTicker < actors.Length - 2
                     ? _frameTicker + 2
                     : 0;