Fixed drowning while in battle.

Implemented by canceling onUpdate for entities in battle.
Might create new unforseen bugs.