Merge branch 'master' into Mario/weaponorder

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

diff --git a/qcsrc/server/handicap.qc b/qcsrc/server/handicap.qc
index d0dfc4dac98889f48fcda790d63f1d4796de189c..ccb585f013db803975bb0bc12052c375db1c0d3c 100644 (file)
--- a/qcsrc/server/handicap.qc
+++ b/qcsrc/server/handicap.qc
@@ -22,7 +22,7 @@ float Handicap_GetVoluntaryHandicap(entity player)
 
 float Handicap_GetForcedHandicap(entity player)
 {
-       return CS(player).m_handicap;
+       return (CS(player)) ? CS(player).m_handicap : 1;
 }
 
 void Handicap_SetForcedHandicap(entity player, float value)