changes to entity updating, implemented entityFighting