From 56bcd7a7304f1764a56a32804c40550d46b1f6f0 Mon Sep 17 00:00:00 2001
From: DmitriyMX <dimon550@gmail.com>
Date: Thu, 6 Sep 2018 13:20:59 +0300
Subject: [PATCH] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=20H2Player?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/src/main/java/mc/core/player/Player.java |  2 +-
 .../java/mc/core/player/SimplePlayer.java     |  2 +-
 .../src/main/java/mc/core/h2db/H2Player.java  | 23 +++++++++++++++++++
 .../netty/handlers/LoginHandler.java          |  4 ++--
 4 files changed, 27 insertions(+), 4 deletions(-)
 create mode 100644 h2_playermanager/src/main/java/mc/core/h2db/H2Player.java

diff --git a/core/src/main/java/mc/core/player/Player.java b/core/src/main/java/mc/core/player/Player.java
index 11c41a3..ad8e8ad 100644
--- a/core/src/main/java/mc/core/player/Player.java
+++ b/core/src/main/java/mc/core/player/Player.java
@@ -12,7 +12,7 @@ import java.util.UUID;
 
 public interface Player {
     int getId();
-    UUID getUUID();
+    UUID getUuid();
     String getName();
     boolean isOnline();
 
diff --git a/core/src/main/java/mc/core/player/SimplePlayer.java b/core/src/main/java/mc/core/player/SimplePlayer.java
index 2472758..e88ae77 100644
--- a/core/src/main/java/mc/core/player/SimplePlayer.java
+++ b/core/src/main/java/mc/core/player/SimplePlayer.java
@@ -30,7 +30,7 @@ public class SimplePlayer implements Player {
     }
 
     @Override
-    public UUID getUUID() {
+    public UUID getUuid() {
         return uuid;
     }
 
diff --git a/h2_playermanager/src/main/java/mc/core/h2db/H2Player.java b/h2_playermanager/src/main/java/mc/core/h2db/H2Player.java
new file mode 100644
index 0000000..c02aa15
--- /dev/null
+++ b/h2_playermanager/src/main/java/mc/core/h2db/H2Player.java
@@ -0,0 +1,23 @@
+package mc.core.h2db;
+
+import lombok.Data;
+import mc.core.EntityLocation;
+import mc.core.network.NetChannel;
+import mc.core.player.Player;
+import mc.core.player.PlayerSettings;
+
+import java.util.List;
+import java.util.UUID;
+
+@Data
+public class H2Player implements Player {
+    private int id;
+    private UUID uuid;
+    private String name;
+    private boolean online = false;
+    private List<Integer> loadedChunks;
+    private NetChannel channel;
+    private EntityLocation location;
+    private boolean flying = false;
+    private PlayerSettings settings;
+}
diff --git a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/LoginHandler.java b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/LoginHandler.java
index 771b1c3..0444e64 100644
--- a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/LoginHandler.java
+++ b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/LoginHandler.java
@@ -53,7 +53,7 @@ public class LoginHandler extends AbstractStateHandler implements LoginStateHand
                             world.getSpawn()));
 
             channel.writeAndFlush(new LoginSuccessPacket(
-                    player.getUUID(),
+                    player.getUuid(),
                     packet.getPlayerName()));
             channel.attr(ATTR_PLAYER).set(player);
             channel.attr(ATTR_STATE).set(State.PLAY);
@@ -102,7 +102,7 @@ public class LoginHandler extends AbstractStateHandler implements LoginStateHand
             PlayerListItemPacket pkt5 = new PlayerListItemPacket();
             pkt5.setAction(PlayerListItemPacket.Action.ADD_PLAYER);
             PlayerListItemPacket.PlayerData playerData = new PlayerListItemPacket.PlayerData();
-            playerData.setUuid(player.getUUID());
+            playerData.setUuid(player.getUuid());
             playerData.setName(player.getName());
             playerData.setGameMode(PlayerMode.CREATIVE);
             playerData.setPing(0);