Revert "fixing Ship class"

This reverts commit 13e815887ededc7fce4be53474be09a934c6b07c.
Revert "Revert "fixing Ship class""

This reverts commit c37c145c14bfbaf9e9c8821362684eb85b59a2f5.