From 819ff09ee6f390f112950212913908006b4b37bb Mon Sep 17 00:00:00 2001
From: Tim203 <mctim203@gmail.com>
Date: Fri, 30 Oct 2020 01:31:22 +0100
Subject: [PATCH] Manually resolved merge conflicts

This specific commit isn't compilable, since StatisticsUtils hasn't been updated to match the new Form style.
---
 .../org/geysermc/connector/network/UpstreamPacketHandler.java   | 2 +-
 .../main/java/org/geysermc/connector/utils/StatisticsUtils.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/connector/src/main/java/org/geysermc/connector/network/UpstreamPacketHandler.java b/connector/src/main/java/org/geysermc/connector/network/UpstreamPacketHandler.java
index 72574b591..20d2bb9e7 100644
--- a/connector/src/main/java/org/geysermc/connector/network/UpstreamPacketHandler.java
+++ b/connector/src/main/java/org/geysermc/connector/network/UpstreamPacketHandler.java
@@ -139,7 +139,7 @@ public class UpstreamPacketHandler extends LoggingPacketHandler {
     @Override
     public boolean handle(ModalFormResponsePacket packet) {
         session.getFormCache().handleResponse(packet);
-        return true; //todo change the Statistics Form to match the new style
+        return true;
     }
 
     private boolean couldLoginUserByName(String bedrockUsername) {
diff --git a/connector/src/main/java/org/geysermc/connector/utils/StatisticsUtils.java b/connector/src/main/java/org/geysermc/connector/utils/StatisticsUtils.java
index 3c42182d7..732217c24 100644
--- a/connector/src/main/java/org/geysermc/connector/utils/StatisticsUtils.java
+++ b/connector/src/main/java/org/geysermc/connector/utils/StatisticsUtils.java
@@ -37,7 +37,7 @@ import org.geysermc.connector.network.translators.world.block.BlockTranslator;
 
 import java.util.Map;
 
-public class StatisticsUtils {
+public class StatisticsUtils { //todo make Geyser compilable
 
     // Used in UpstreamPacketHandler.java
     public static final int STATISTICS_MENU_FORM_ID = 1339;