2 files changed, 29 insertions, 20 deletions
diff --git a/server/src/main/java/kz/ilotterytea/frogartha/server/PlayerConnection.java b/server/src/main/java/kz/ilotterytea/frogartha/server/PlayerConnection.java
index 8744e58..f30dcfe 100644
--- a/server/src/main/java/kz/ilotterytea/frogartha/server/PlayerConnection.java
+++ b/server/src/main/java/kz/ilotterytea/frogartha/server/PlayerConnection.java
@@ -1,18 +1,15 @@
 package kz.ilotterytea.frogartha.server;
 
-import kz.ilotterytea.frogartha.domain.Identity;
-import kz.ilotterytea.frogartha.domain.PlayerState;
+import kz.ilotterytea.frogartha.domain.PlayerData;
 import org.java_websocket.WebSocket;
 
 import java.sql.Timestamp;
 
-public class PlayerConnection {
+public class PlayerConnection extends PlayerData {
     private static int TOTAL_CONNECTION_IDS = 0;
 
     private final int id;
     private final WebSocket connection;
-    private Identity identity;
-    private PlayerState state;
 
     private final Timestamp connectedTimestamp;
 
@@ -22,8 +19,6 @@ public class PlayerConnection {
         TOTAL_CONNECTION_IDS++;
 
         this.connectedTimestamp = new Timestamp(System.currentTimeMillis());
-        this.identity = null;
-        this.state = null;
     }
 
     public void send(Object object) {
@@ -47,19 +42,6 @@ public class PlayerConnection {
         return connectedTimestamp;
     }
 
-    public Identity getIdentity() {
-        return identity;
-    }
-
-    public void setIdentity(Identity identity) {
-        this.identity = identity;
-        if (state == null) state = new PlayerState();
-    }
-
-    public PlayerState getState() {
-        return state;
-    }
-
     @Override
     public String toString() {
         return "PlayerConnection{" +
diff --git a/shared/src/main/java/kz/ilotterytea/frogartha/domain/PlayerData.java b/shared/src/main/java/kz/ilotterytea/frogartha/domain/PlayerData.java
new file mode 100644
index 0000000..ec6e1cd
--- /dev/null
+++ b/shared/src/main/java/kz/ilotterytea/frogartha/domain/PlayerData.java
@@ -0,0 +1,27 @@
+package kz.ilotterytea.frogartha.domain;
+
+public class PlayerData {
+    private Identity identity;
+    private PlayerState state;
+
+    public PlayerData() {
+    }
+
+    public PlayerData(Identity identity, PlayerState state) {
+        this.identity = identity;
+        this.state = state;
+    }
+
+    public Identity getIdentity() {
+        return identity;
+    }
+
+    public void setIdentity(Identity identity) {
+        this.identity = identity;
+        if (state == null) state = new PlayerState();
+    }
+
+    public PlayerState getState() {
+        return state;
+    }
+}