From: LegendaryGuard <rootuser999@gmail.com>
Date: Thu, 6 Jan 2022 23:46:54 +0000 (+0100)
Subject: Enhance fix details in show_tint entity
X-Git-Tag: xonotic-v0.8.5~240^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=642f5e83e784a0cffe2569cf48c00320ae1cd0ae;p=xonotic%2Fxonotic-data.pk3dir.git

Enhance fix details in show_tint entity
---

diff --git a/qcsrc/common/mutators/mutator/nades/nades.qc b/qcsrc/common/mutators/mutator/nades/nades.qc
index e0666048f..f4eb49b61 100644
--- a/qcsrc/common/mutators/mutator/nades/nades.qc
+++ b/qcsrc/common/mutators/mutator/nades/nades.qc
@@ -591,7 +591,7 @@ void nade_entrap_touch(entity this, entity toucher)
 
 	if ( IS_REAL_CLIENT(toucher) || (IS_VEHICLE(toucher) && toucher.owner) )
 	{
-		entity show_tint = (IS_VEHICLE(toucher)) ? toucher.owner : toucher;
+		entity show_tint = (IS_VEHICLE(toucher) && toucher.owner) ? toucher.owner : toucher;
 		STAT(ENTRAP_ORB, show_tint) = time + 0.1;
 
 		float tint_alpha = 0.75;
@@ -647,7 +647,7 @@ void nade_heal_touch(entity this, entity toucher)
 
 	if ( IS_REAL_CLIENT(toucher) || (IS_VEHICLE(toucher) && toucher.owner) )
 	{
-		entity show_red = (IS_VEHICLE(toucher)) ? toucher.owner : toucher;
+		entity show_red = (IS_VEHICLE(toucher) && toucher.owner) ? toucher.owner : toucher;
 		STAT(HEALING_ORB, show_red) = time+0.1;
 		STAT(HEALING_ORB_ALPHA, show_red) = 0.75 * (this.ltime - time) / this.orb_lifetime;
 	}
@@ -676,7 +676,7 @@ void nade_veil_touch(entity this, entity toucher)
 {
 	if ( IS_REAL_CLIENT(toucher) || (IS_VEHICLE(toucher) && toucher.owner) )
 	{
-		entity show_tint = (IS_VEHICLE(toucher)) ? toucher.owner : toucher;
+		entity show_tint = (IS_VEHICLE(toucher) && toucher.owner) ? toucher.owner : toucher;
 
 		float tint_alpha = 0.75;
 		if(SAME_TEAM(toucher, this.realowner))