Fixed lava ones and for all + fixed flying state persisting through -hax.

Signed-off-by: andrewphorn <andrewphorn@gmail.com>