Merge branch 'model' into 'master'

added missing variable to user

See merge request reswp-2020/galaxytrucker!24

core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Ship.java

@@ -115,22 +115,4 @@ public class Ship implements Serializable {
     @DatabaseField(foreign = true, columnName = "inventory")
     private List<Weapon> inventory;
 
-    /**
-     * Take damage
-     */
-    private void takeDamage(int amount) {
-    }
-
-    /**
-     * Add hp
-     */
-    private void heal(int hp) {
-    }
-
-    /**
-     * Add shields
-     */
-    private void applyShields(int shields) {
-    }
-
 }

core/src/com/galaxytrucker/galaxytruckerreloaded/Model/User.java

@@ -25,4 +25,9 @@ public class User implements Serializable {
      */
     @DatabaseField(columnName = "userShip", foreign = true)
     private Ship userShip;
+
+    /** Whether or not the user is logged in */
+    @NonNull
+    @DatabaseField(columnName = "loggedIn")
+    private boolean loggedIn = false;
 }

core/src/com/galaxytrucker/galaxytruckerreloaded/Server/Services/UserService.java

@@ -54,4 +54,18 @@ public class UserService {
 
     }
 
+    /**
+     * Save game
+     *
+     * @param username - the username of the user
+     */
+    public void saveGame(String username) {
+    }
+
+    /** Login
+     * @param username - the username of the user
+     * @return true - if the login was successful else return false */
+    public boolean login(String username){
+        return false;
+    }
 }