Merge branch 'master' into Mario/vaporizer_damage

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / bot / navigation.qc

diff --git a/qcsrc/server/bot/navigation.qc b/qcsrc/server/bot/navigation.qc
index 001617722ae1fc61eb781bb659061cad7e95edc1..0f4c330ed8882b2037a6e99bb5f7652d76a421bb 100644 (file)
--- a/qcsrc/server/bot/navigation.qc
+++ b/qcsrc/server/bot/navigation.qc
@@ -430,7 +430,7 @@ entity navigation_findnearestwaypoint(entity ent, float walkfromwp)
        if (autocvar_g_waypointeditor_auto)
        {
                entity wp2 = navigation_findnearestwaypoint_withdist_except(ent, walkfromwp, 1050, wp);
-               if (!wp2)
+               if (wp && !wp2)
                        wp.wpflags |= WAYPOINTFLAG_PROTECTED;
        }
        return wp;