Merge branch 'marin-t/fix' into 'master'

Fix for hash change

See merge request xonotic/xonotic-data.pk3dir!678

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dd18ca4a7041e35163701c56fb6106220555bf9b..633a224955a0f3d6ed145e73ccb1d7d7c34cdcb1 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -29,7 +29,7 @@ test_sv_game:
     - wget -O data/maps/stormkeep.waypoints https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints
     - wget -O data/maps/stormkeep.waypoints.cache https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints.cache
     - make
-    - EXPECT=0bff07a368ae61253bf725b0a7e794e7
+    - EXPECT=31f883fe0cf71816f7862521a8014eea
     - HASH=$(${ENGINE} -noconfig -nohome +exec serverbench.cfg
       | tee /dev/stderr
       | grep '^:'

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;
        }