]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Fix spamming CSQC errors when a vehicle is inside nade orb
authorLegendaryGuard <rootuser999@gmail.com>
Wed, 5 Jan 2022 17:44:27 +0000 (18:44 +0100)
committerLegendaryGuard <rootuser999@gmail.com>
Wed, 5 Jan 2022 17:44:27 +0000 (18:44 +0100)
qcsrc/common/mutators/mutator/nades/nades.qc

index 04c61a6d73c5e8cf23c135e780372cb892d6a74e..cd4a00f98b4ded845fffb8835ebe70b2c50bbe2f 100644 (file)
@@ -589,7 +589,7 @@ void nade_entrap_touch(entity this, entity toucher)
        #endif
        }
 
-       if ( IS_REAL_CLIENT(toucher) || IS_VEHICLE(toucher) || IS_MONSTER(toucher) )
+       if ( IS_REAL_CLIENT(toucher) && !IS_VEHICLE(toucher) )
        {
                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) )
        {
                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) || IS_MONSTER(toucher) )
+       if ( IS_REAL_CLIENT(toucher) && !IS_VEHICLE(toucher) )
        {
                entity show_tint = (IS_VEHICLE(toucher)) ? toucher.owner : toucher;