Manually resolved merge conflicts

This specific commit isn't compilable, since StatisticsUtils hasn't been updated to match the new Form style.
This commit is contained in:
Tim203 2020-10-30 01:31:22 +01:00
parent 36419e5931
commit 819ff09ee6
No known key found for this signature in database
GPG key ID: 064EE9F5BF7C3EE8
2 changed files with 2 additions and 2 deletions

View file

@ -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) {

View file

@ -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;