Fix entitydamage NPE, some formatting