diff --git a/voxygen/src/scene/figure/mod.rs b/voxygen/src/scene/figure/mod.rs
index c4d50dba35..0a1e935f54 100644
--- a/voxygen/src/scene/figure/mod.rs
+++ b/voxygen/src/scene/figure/mod.rs
@@ -39,7 +39,7 @@ use common::{
     vol::RectRasterableVol,
 };
 use common_base::span;
-use common_sys::state::State;
+use common_state::State;
 use core::{
     borrow::Borrow,
     convert::TryFrom,
@@ -793,7 +793,7 @@ impl FigureMgr {
                     let target_base = match (
                         physics.on_ground,
                         rel_vel.magnitude_squared() > MOVING_THRESHOLD_SQR, // Moving
-                        physics.in_liquid.is_some(),                        // In water
+                        physics.in_liquid().is_some(),                      // In water
                     ) {
                         // Standing
                         (true, false, false) => anim::character::StandAnimation::update_skeleton(
@@ -1421,7 +1421,7 @@ impl FigureMgr {
                             skeleton_attr,
                         ),
                         CharacterState::Wielding { .. } => {
-                            if physics.in_liquid.is_some() {
+                            if physics.in_liquid().is_some() {
                                 anim::character::SwimWieldAnimation::update_skeleton(
                                     &target_base,
                                     (
@@ -1581,7 +1581,7 @@ impl FigureMgr {
                     let target_base = match (
                         physics.on_ground,
                         rel_vel.magnitude_squared() > MOVING_THRESHOLD_SQR, // Moving
-                        physics.in_liquid.is_some(),                        // In water
+                        physics.in_liquid().is_some(),                      // In water
                     ) {
                         // Standing
                         (true, false, false) => {
@@ -1783,7 +1783,7 @@ impl FigureMgr {
                     let target_base = match (
                         physics.on_ground,
                         rel_vel.magnitude_squared() > 0.25, // Moving
-                        physics.in_liquid.is_some(),        // In water
+                        physics.in_liquid().is_some(),      // In water
                     ) {
                         // Standing
                         (true, false, false) => {
@@ -2110,7 +2110,7 @@ impl FigureMgr {
                     let target_base = match (
                         physics.on_ground,
                         rel_vel.magnitude_squared() > MOVING_THRESHOLD_SQR, // Moving
-                        physics.in_liquid.is_some(),                        // In water
+                        physics.in_liquid().is_some(),                      // In water
                     ) {
                         // Standing
                         (true, false, false) => {
@@ -2469,7 +2469,7 @@ impl FigureMgr {
                     let target_base = match (
                         physics.on_ground,
                         rel_vel.magnitude_squared() > MOVING_THRESHOLD_SQR, // Moving
-                        physics.in_liquid.is_some(),                        // In water
+                        physics.in_liquid().is_some(),                      // In water
                     ) {
                         // Standing
                         (true, false, false) => anim::bird_medium::IdleAnimation::update_skeleton(
@@ -2579,7 +2579,7 @@ impl FigureMgr {
                     let target_base = match (
                         physics.on_ground,
                         rel_vel.magnitude_squared() > MOVING_THRESHOLD_SQR, // Moving
-                        physics.in_liquid.is_some(),                        // In water
+                        physics.in_liquid().is_some(),                      // In water
                     ) {
                         // Idle
                         (_, false, _) => anim::fish_medium::IdleAnimation::update_skeleton(
@@ -2668,7 +2668,7 @@ impl FigureMgr {
                     let target_base = match (
                         physics.on_ground,
                         rel_vel.magnitude_squared() > MOVING_THRESHOLD_SQR, // Moving
-                        physics.in_liquid.is_some(),                        // In water
+                        physics.in_liquid().is_some(),                      // In water
                     ) {
                         // Idle
                         (true, false, false) => anim::biped_small::IdleAnimation::update_skeleton(
@@ -3013,7 +3013,7 @@ impl FigureMgr {
                     let target_base = match (
                         physics.on_ground,
                         rel_vel.magnitude_squared() > MOVING_THRESHOLD_SQR, // Moving
-                        physics.in_liquid.is_some(),                        // In water
+                        physics.in_liquid().is_some(),                      // In water
                     ) {
                         // Standing
                         (true, false, false) => anim::dragon::IdleAnimation::update_skeleton(
@@ -3108,7 +3108,7 @@ impl FigureMgr {
                     let target_base = match (
                         physics.on_ground,
                         rel_vel.magnitude_squared() > MOVING_THRESHOLD_SQR, // Moving
-                        physics.in_liquid.is_some(),                        // In water
+                        physics.in_liquid().is_some(),                      // In water
                     ) {
                         // Standing
                         (true, false, false) => anim::theropod::IdleAnimation::update_skeleton(
@@ -3297,7 +3297,7 @@ impl FigureMgr {
                     let target_base = match (
                         physics.on_ground,
                         rel_vel.magnitude_squared() > MOVING_THRESHOLD_SQR, // Moving
-                        physics.in_liquid.is_some(),                        // In water
+                        physics.in_liquid().is_some(),                      // In water
                     ) {
                         // Standing
                         (true, false, false) => anim::bird_small::IdleAnimation::update_skeleton(
@@ -3388,7 +3388,7 @@ impl FigureMgr {
                     let target_base = match (
                         physics.on_ground,
                         rel_vel.magnitude_squared() > MOVING_THRESHOLD_SQR, // Moving
-                        physics.in_liquid.is_some(),                        // In water
+                        physics.in_liquid().is_some(),                      // In water
                     ) {
                         // Idle
                         (_, false, _) => anim::fish_small::IdleAnimation::update_skeleton(
@@ -3477,7 +3477,7 @@ impl FigureMgr {
                     let target_base = match (
                         physics.on_ground,
                         rel_vel.magnitude_squared() > MOVING_THRESHOLD_SQR, // Moving
-                        physics.in_liquid.is_some(),                        // In water
+                        physics.in_liquid().is_some(),                      // In water
                     ) {
                         // Running
                         (true, true, false) => anim::biped_large::RunAnimation::update_skeleton(
@@ -3998,7 +3998,7 @@ impl FigureMgr {
                     let target_base = match (
                         physics.on_ground,
                         rel_vel.magnitude_squared() > MOVING_THRESHOLD_SQR, // Moving
-                        physics.in_liquid.is_some(),                        // In water
+                        physics.in_liquid().is_some(),                      // In water
                     ) {
                         // Standing
                         (true, false, false) => anim::golem::IdleAnimation::update_skeleton(
@@ -4184,7 +4184,7 @@ impl FigureMgr {
                     let target_base = match (
                         physics.on_ground,
                         rel_vel.magnitude_squared() > MOVING_THRESHOLD_SQR, // Moving
-                        physics.in_liquid.is_some(),                        // In water
+                        physics.in_liquid().is_some(),                      // In water
                     ) {
                         // Standing
                         (true, false, false) => anim::object::IdleAnimation::update_skeleton(
@@ -4313,7 +4313,7 @@ impl FigureMgr {
                     let target_base = match (
                         physics.on_ground,
                         rel_vel.magnitude_squared() > MOVING_THRESHOLD_SQR, // Moving
-                        physics.in_liquid.is_some(),                        // In water
+                        physics.in_liquid().is_some(),                      // In water
                     ) {
                         // Standing
                         (true, false, false) => anim::ship::IdleAnimation::update_skeleton(