1.6 proof entity HP manipulation

Fixes entity HP manipulation in 1.6.1 and 1.6.2

Fully tested.