Merge pull request ddnet#9295 from SollyBunny/spikes_freeze_instead_o…

…f_kill_in_practice Spikes freeze instead of kill in practice
Robyt3 · Dec 1, 2024 · 738df62 · 738df62
2 parents e0527a1 + 1b85bf2
commit 738df62
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/game/server/entities/character.cpp b/src/game/server/entities/character.cpp
@@ -1386,7 +1386,10 @@ void CCharacter::HandleSkippableTiles(int Index)
 		   Collision()->GetFCollisionAt(m_Pos.x - GetProximityRadius() / 3.f, m_Pos.y + GetProximityRadius() / 3.f) == TILE_DEATH) &&
 		!m_Core.m_Super && !m_Core.m_Invincible && !(Team() && Teams()->TeeFinished(m_pPlayer->GetCid())))
 	{
-		Die(m_pPlayer->GetCid(), WEAPON_WORLD);
+		if(Team() && Teams()->IsPractice(Team()))
+			Freeze();
+		else
+			Die(m_pPlayer->GetCid(), WEAPON_WORLD);
 		return;
 	}