Fixed some entity-related issues, still having a currentmodificationexception if an entity dies by fire