From 91753a113150fc15d8a21cdb73087c9c144397d3 Mon Sep 17 00:00:00 2001
From: bundabrg <bundabrg@grieve.com.au>
Date: Fri, 2 Jul 2021 15:16:40 +0800
Subject: [PATCH] Implement support for Education v1.14.70

* Bump Reversion to v1.0.29
* Fix issue with disconnects leaving a ghost player

Squashed commit of the following:

commit 35a459cde5547c62ecb1908d089fb45f8707c144
Author: bundabrg <bundabrg@grieve.com.au>
Date:   Fri Jul 2 15:15:23 2021 +0800

    Fix issue with disconnects not registering

commit 485e8db9788aedb4fceae7d6839b1ae8a81d7201
Author: bundabrg <bundabrg@grieve.com.au>
Date:   Wed Jun 30 16:00:00 2021 +0800

    Start work on Education v1.14.70
---
 README.md                                     | 21 +++++++++++++------
 docs/index.md                                 |  1 +
 .../reversion/server/GeyserServerSession.java |  7 ++++++-
 pom.xml                                       |  2 +-
 4 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 9ace9cb..c68a6eb 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@
 [![GitHub issues](https://img.shields.io/github/issues/Bundabrg/GeyserReversion)](https://GitHub.com/Bundabrg/GeyserReversion/issues/)
 [![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/Bundabrg/GeyserReversion.svg)](http://isitmaintained.com/project/Bundabrg/GeyserReversion "Average time to resolve an issue")
 [![GitHub pull-requests](https://img.shields.io/github/issues-pr/Bundabrg/GeyserReversion)](https://GitHub.com/Bundabrg/GeyserReversion/pull/)
- 
+
 
 ---
 
@@ -22,12 +22,19 @@
 
 ---
 
-GeyserReversion is a Geyser Extension that provides protocol level support for MultiVersion in Geyser and will eventually
-allow any supported version to connect to any supported Geyser.
+PLEASE NOTE: At present this only works
+with [Geyser v1.16-b55](https://github.com/bundabrg/Geyser/releases/tag/v1.16-b55) until I manage to finish translating
+between server and non-server inventory management. So please use this version for Education (as long as you run
+ViaVersion on your java server it will accept the older connections).
+
+---
 
-If you've heard of [ViaVersion](https://github.com/ViaVersion/ViaVersion) then this is the equivalent but for the Bedrock
-side of Geyser. It allows any of the supported client versions listed below to connect to any of the supported server
-versions.
+GeyserReversion is a Geyser Extension that provides protocol level support for MultiVersion in Geyser and will
+eventually allow any supported version to connect to any supported Geyser.
+
+If you've heard of [ViaVersion](https://github.com/ViaVersion/ViaVersion) then this is the equivalent but for the
+Bedrock side of Geyser. It allows any of the supported client versions listed below to connect to any of the supported
+server versions.
 
 ## Features
 
@@ -37,6 +44,7 @@ versions.
 ## Client Versions Supported
 
 ### Minecraft Bedrock
+
 * Minecraft Bedrock v1.16.0
 * Minecraft Bedrock v1.16.2
 * Minecraft Bedrock v1.16.3
@@ -45,6 +53,7 @@ versions.
 ### Minecraft Education
 * Minecraft Education v1.14.31
 * Minecraft Education v1.14.50
+* Minecraft Education v1.14.70
 
 ## Server Versions Supported
 * Minecraft Bedrock v1.16.2
diff --git a/docs/index.md b/docs/index.md
index a2ee172..da83c2e 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -23,6 +23,7 @@ versions.
 ### Minecraft Education
 * Minecraft Education v1.14.31
 * Minecraft Education v1.14.50
+* Minecraft Education v1.14.70
 
 ## Server Versions Supported
 * Minecraft Bedrock v1.16.2
diff --git a/geyser-reversion/src/main/java/au/com/grieve/geyser/reversion/server/GeyserServerSession.java b/geyser-reversion/src/main/java/au/com/grieve/geyser/reversion/server/GeyserServerSession.java
index 7c2f5f0..87ce2d2 100644
--- a/geyser-reversion/src/main/java/au/com/grieve/geyser/reversion/server/GeyserServerSession.java
+++ b/geyser-reversion/src/main/java/au/com/grieve/geyser/reversion/server/GeyserServerSession.java
@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2020 GeyserReversion Developers
+ * Copyright (c) 2021 GeyserReversion Developers
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -175,6 +175,11 @@ public void addDisconnectHandler(Consumer<DisconnectReason> disconnectHandler) {
         reversionSession.addDisconnectHandler(disconnectHandler);
     }
 
+    @Override
+    public InetSocketAddress getRealAddress() {
+        return reversionSession.getAddress();
+    }
+
     @Override
     public long getLatency() {
         return reversionSession.getLatency();
diff --git a/pom.xml b/pom.xml
index ccd241a..f2eb61f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,7 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <reversion.version>1.0.28</reversion.version>
+        <reversion.version>1.0.29</reversion.version>
     </properties>
 
     <build>