X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fsv_main.qc;h=a5f35aa89ae3bc04a0e8d51d9ab5587dea084c1d;hb=4fcb58083fe92b7165ab775ba48c6b0a7bcf37f6;hp=5b8ca7ff867daae82bfe1f4f9ac5f03fabe2f037;hpb=2805e22b6636b63410a30e4fec68e1ae5ecadc87;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/sv_main.qc b/qcsrc/server/sv_main.qc
index 5b8ca7ff8..a5f35aa89 100644
--- a/qcsrc/server/sv_main.qc
+++ b/qcsrc/server/sv_main.qc
@@ -34,7 +34,7 @@ void CreatureFrame (void)
 				}
 				if (self.dmgtime < time)
 				{
-					self.dmgtime = time + 0.1;
+					self.dmgtime = time + 0.2;
 					if (self.watertype == CONTENT_LAVA)
 					{
 						if (self.watersound_finished < time)
@@ -199,6 +199,8 @@ void StartFrame (void)
 	sv_airspeedlimit_nonqw = cvar("sv_airspeedlimit_nonqw");
 	teamplay = cvar ("teamplay");
 	sys_frametime = cvar("sys_ticrate") * cvar("slowmo");
+	if(sys_frametime <= 0)
+		sys_frametime = 1.0 / 60.0; // somewhat safe fallback
 	sv_doublejump = cvar("sv_doublejump");
 
 	if (timeoutStatus == 1) // just before the timeout (when timeoutStatus will be 2)