[Experimental] Partially implement movement related fixes found in noted commit

https://github.com/mangoszero/server/commit/8d0d8b918bb8101b11ab80d9a80aa4c8d1716c0a