From: LegendaryGuard <rootuser999@gmail.com>
Date: Thu, 6 Jan 2022 21:37:19 +0000 (+0100)
Subject: Enhance fix nades orb
X-Git-Tag: xonotic-v0.8.5~240^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=172ed1d0f214cf1c8badbd9dc4ab6eeff3944dcc;p=xonotic%2Fxonotic-data.pk3dir.git

Enhance fix nades orb
---

diff --git a/qcsrc/common/mutators/mutator/nades/nades.qc b/qcsrc/common/mutators/mutator/nades/nades.qc
index cd4a00f98..e0666048f 100644
--- a/qcsrc/common/mutators/mutator/nades/nades.qc
+++ b/qcsrc/common/mutators/mutator/nades/nades.qc
@@ -589,7 +589,7 @@ void nade_entrap_touch(entity this, entity toucher)
 	#endif
 	}
 
-	if ( IS_REAL_CLIENT(toucher) && !IS_VEHICLE(toucher) )
+	if ( IS_REAL_CLIENT(toucher) || (IS_VEHICLE(toucher) && toucher.owner) )
 	{
 		entity show_tint = (IS_VEHICLE(toucher)) ? toucher.owner : toucher;
 		STAT(ENTRAP_ORB, show_tint) = time + 0.1;
@@ -645,7 +645,7 @@ void nade_heal_touch(entity this, entity toucher)
 
 	}
 
-	if ( IS_REAL_CLIENT(toucher) && !IS_VEHICLE(toucher) )
+	if ( IS_REAL_CLIENT(toucher) || (IS_VEHICLE(toucher) && toucher.owner) )
 	{
 		entity show_red = (IS_VEHICLE(toucher)) ? toucher.owner : toucher;
 		STAT(HEALING_ORB, show_red) = time+0.1;
@@ -674,7 +674,7 @@ void nade_monster_boom(entity this)
 
 void nade_veil_touch(entity this, entity toucher)
 {
-	if ( IS_REAL_CLIENT(toucher) && !IS_VEHICLE(toucher) )
+	if ( IS_REAL_CLIENT(toucher) || (IS_VEHICLE(toucher) && toucher.owner) )
 	{
 		entity show_tint = (IS_VEHICLE(toucher)) ? toucher.owner : toucher;