Barbarians trace player holding torch
Improve tracing
Merge branch 'raincole_working'