From d43de53e8a47b9b6576b01a141a7862ec0efef60 Mon Sep 17 00:00:00 2001
From: Simon <simonbrown77@googlemail.com>
Date: Sun, 2 Apr 2023 19:41:50 +0100
Subject: [PATCH] Added missed saber blocking check

might explain why some people find JKA a bit easy if it is auto-blocking in 1st person
---
 Projects/Android/jni/OpenJK/code/game/wp_saber.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/Projects/Android/jni/OpenJK/code/game/wp_saber.cpp b/Projects/Android/jni/OpenJK/code/game/wp_saber.cpp
index 674a231..6ad27a6 100644
--- a/Projects/Android/jni/OpenJK/code/game/wp_saber.cpp
+++ b/Projects/Android/jni/OpenJK/code/game/wp_saber.cpp
@@ -7498,9 +7498,17 @@ void WP_SaberStartMissileBlockCheck( gentity_t *self, usercmd_t *ucmd  )
 					return;
 				}
 
-				if ( !g_saberAutoBlocking->integer && self->client->ps.saberBlockingTime<level.time )
+				if (cg_thirdPerson.integer) {
+					if (!self->s.number && !g_saberAutoBlocking->integer &&
+						self->client->ps.saberBlockingTime < level.time) {
+						return;
+					}
+				} else // first person
 				{
-					return;
+					if (!self->s.number && !g_saberAutoDeflect1stPerson->integer &&
+						self->client->ps.saberBlockingTime < level.time) {
+						return;
+					}
 				}
 			}