implement creature logic on server
fix merge conflicts