Fixed onClick on Custom Component

[ianrios]

1. Updated CombatModal to send prop onClickMethod instead of using protected onClick, which does not get sent as a prop
2. Fixed Scar.js to receive incoming onClick prop, removed unnecessary conditional render