Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

src/server/scripts/Commands/cs_cheat.cpp

@@ -198,16 +198,14 @@ public:
         if (argstr == "off")
         {
             target->SetCommandStatusOff(CHEAT_WATERWALK);
-            target->RemoveUnitMovementFlag(MOVEMENTFLAG_WATERWALKING);
-            target->SendMovementWaterWalking();         // OFF
+            target->SetWaterWalking(false);
             handler->SendSysMessage("Waterwalking is OFF. You can't walk on water.");
             return true;
         }
         else if (argstr == "on")
         {
             target->SetCommandStatusOn(CHEAT_WATERWALK);
-            target->AddUnitMovementFlag(MOVEMENTFLAG_WATERWALKING);
-            target->SendMovementWaterWalking();          // ON
+            target->SetWaterWalking(true);
             handler->SendSysMessage("Waterwalking is ON. You can walk on water.");
             return true;
         }