OpenSource/GeyserMC
OpenSource/GeyserMC
1
0
Fork 0
mirror of https://github.com/GeyserMC/Geyser.git synced 2024-12-04 14:04:53 +01:00
Code Issues Projects Releases Packages Wiki Activity

Manually resolved merge conflicts

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
connector/src/main/java/org/geysermc/connector/network/UpstreamPacketHandler.java
View file

@ -139,7 +139,7 @@ public class UpstreamPacketHandler extends LoggingPacketHandler {
@Override @Override
public boolean handle(ModalFormResponsePacket packet) { public boolean handle(ModalFormResponsePacket packet) {
session.getFormCache().handleResponse(packet); session.getFormCache().handleResponse(packet);
return true; //todo change the Statistics Form to match the new style return true;
} }
private boolean couldLoginUserByName(String bedrockUsername) { private boolean couldLoginUserByName(String bedrockUsername) {

2
connector/src/main/java/org/geysermc/connector/utils/StatisticsUtils.java
View file

@ -37,7 +37,7 @@ import org.geysermc.connector.network.translators.world.block.BlockTranslator;
import java.util.Map; import java.util.Map;
public class StatisticsUtils { public class StatisticsUtils { //todo make Geyser compilable
// Used in UpstreamPacketHandler.java // Used in UpstreamPacketHandler.java
public static final int STATISTICS_MENU_FORM_ID = 1339; public static final int STATISTICS_MENU_FORM_ID = 1339;