updated dragon onHit
merged entity.js