Merge branch 'master' into marin-t/fix

diff --git a/qcsrc/server/sv_main.qc b/qcsrc/server/sv_main.qc
index a281e9054be8a17ebebcb44efa0454a1a2e7a947..6b5b19d79ec8a60d141da4248e547b8deaca1480 100644 (file)
--- a/qcsrc/server/sv_main.qc
+++ b/qcsrc/server/sv_main.qc
@@ -30,7 +30,7 @@
 
 void CreatureFrame_hotliquids(entity this)
 {
-       if (this.dmgtime > time)
+       if (this.dmgtime >= time)
        {
                return;
        }