Temporary fix for some of our combat checks not being called properly. A
better fix will be coming soon.