From 6970e2d00c07398fdcebafeb1f3b7631eeb944d9 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 5 Nov 2024 21:48:43 +0100
Subject: [PATCH] Properly check entity sight against passOwnerNum

---
 code/server/sv_world.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/code/server/sv_world.c b/code/server/sv_world.c
index 33b40ca1..d334f3b1 100644
--- a/code/server/sv_world.c
+++ b/code/server/sv_world.c
@@ -669,9 +669,12 @@ qboolean SV_ClipSightToEntities( moveclip_t *clip, int passEntityNum2 )
 			if( touchlist[ i ] == clip->passEntityNum ) {
 				continue;	// don't clip against the pass entity
 			}
-			if( touch->r.ownerNum == clip->passEntityNum ) {
+			if( touchlist[ i ] == passOwnerNum ) {
 				continue;	// don't clip against own missiles
 			}
+			if( touch->r.ownerNum == clip->passEntityNum ) {
+				continue;	// don't clip against the pass entity
+			}
 			if( touch->r.ownerNum == passOwnerNum ) {
 				continue;	// don't clip against other missiles from our owner
 			}
@@ -681,11 +684,11 @@ qboolean SV_ClipSightToEntities( moveclip_t *clip, int passEntityNum2 )
 			if( touchlist[ i ] == passEntityNum2 ) {
 				continue;	// don't clip against the pass entity
 			}
-			if( touch->r.ownerNum == passEntityNum2 ) {
+			if( touchlist[ i ] == passOwnerNum2 ) {
 				continue;	// don't clip against own missiles
 			}
-			if( touch->r.ownerNum == passOwnerNum2 ) {
-				continue;	// don't clip against other missiles from our owner
+			if( touch->r.ownerNum == passEntityNum2 ) {
+				continue;	// don't clip against own missiles
 			}
 		}