Improvements to trap disarming, prevented player from killing self when casting spells with blood sorcerer trait