Fix TriggerSkillByAttack NPE and proper weapon check

Reported by: St3eT