X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fsv_main.qc;h=09446203db69cf85d1588c0cdb459625244ff80e;hb=06a08d0c6b573f2562297147171aff3d990fa42d;hp=367cc99b7a64f3f45f25a2242b8ec0c350ba1219;hpb=aacbe6fbbfc83dbf63234d28aa21e362077bc6b2;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/sv_main.qc b/qcsrc/server/sv_main.qc
index 367cc99b7..09446203d 100644
--- a/qcsrc/server/sv_main.qc
+++ b/qcsrc/server/sv_main.qc
@@ -4,6 +4,7 @@
 #include "g_hook.qh"
 #include "g_damage.qh"
 #include "g_world.qh"
+#include <server/gamelog.qh>
 
 #include "bot/api.qh"
 
@@ -46,7 +47,14 @@ void CreatureFrame_hotliquids(entity this)
 	}
 	else
 	{
-		if (this.watertype == CONTENT_LAVA)
+		if (STAT(FROZEN, this))
+		{
+			if (this.watertype == CONTENT_LAVA)
+				Damage(this, NULL, NULL, 10000, DEATH_LAVA.m_id, DMG_NOWEP, this.origin, '0 0 0');
+			else if (this.watertype == CONTENT_SLIME)
+				Damage(this, NULL, NULL, 10000, DEATH_SLIME.m_id, DMG_NOWEP, this.origin, '0 0 0');
+		}
+		else if (this.watertype == CONTENT_LAVA)
 		{
 			if (this.watersound_finished < time)
 			{
@@ -89,7 +97,6 @@ void CreatureFrame_Liquids(entity this)
 			this.flags &= ~FL_INWATER;
 			this.dmgtime = 0;
 		}
-		this.air_finished = time + autocvar_g_balance_contents_drowndelay;
 	}
 }