diff --git a/src/main/java/cactusServer/entities/Account.java b/src/main/java/cactusServer/entities/Account.java index 491178b..e5153d6 100644 --- a/src/main/java/cactusServer/entities/Account.java +++ b/src/main/java/cactusServer/entities/Account.java @@ -1,21 +1,13 @@ package cactusServer.entities; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +//import com.fasterxml.jackson.annotation.JsonIgnore; +//import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import cactusServer.utils.RandomStringGenerator; import net.arnx.jsonic.JSONHint; -public class Account extends Entity{ - private String id, name, token; - - - private String pass; - - @JSONHint(ignore=true) - private String uniqueID; - - @JSONHint(ignore=true) +public class Account extends Entity { + private String id, name, token, pass, uniqueID; private boolean login = false; public Account(String userID, String userName, String userPass, String uniqueID) { @@ -41,7 +33,8 @@ public void setName(String name) { this.name = name; } - @JSONHint(ignore=true) + + @JSONHint(ignore = true) public String getPass() { return pass; } @@ -49,7 +42,8 @@ public void setPass(String pass) { this.pass = pass; } - @JSONHint(ignore=true) + + @JSONHint(ignore = true) public boolean isLogin() { return login; } @@ -66,7 +60,8 @@ token = RandomStringGenerator.generateRandomString(64, RandomStringGenerator.ALPHA_NUMERIC); return token; } - @JSONHint(ignore=true) + + @JSONHint(ignore = true) public String getUniqueID() { return uniqueID; }