Parker2991/MCProtocolLib
1
0
Fork 0
mirror of https://github.com/GeyserMC/MCProtocolLib.git synced 2024-12-04 21:01:02 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make ServerListener use default ServerInfoBuilder and compression threshold if the flag is not set

Browse source
This commit is contained in:
Final Child 2016-06-12 16:36:31 +09:00
parent 01ab4566ba
commit 456fb5c084
2 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/main/java/org/spacehq/mc/protocol/ServerListener.java
View file

@ -4,7 +4,11 @@ import org.spacehq.mc.auth.data.GameProfile;
import org.spacehq.mc.auth.exception.request.RequestException; import org.spacehq.mc.auth.exception.request.RequestException;
import org.spacehq.mc.auth.service.SessionService; import org.spacehq.mc.auth.service.SessionService;
import org.spacehq.mc.protocol.data.SubProtocol; import org.spacehq.mc.protocol.data.SubProtocol;
import org.spacehq.mc.protocol.data.game.entity.type.object.MinecartType;
import org.spacehq.mc.protocol.data.message.Message;
import org.spacehq.mc.protocol.data.status.PlayerInfo;
import org.spacehq.mc.protocol.data.status.ServerStatusInfo; import org.spacehq.mc.protocol.data.status.ServerStatusInfo;
import org.spacehq.mc.protocol.data.status.VersionInfo;
import org.spacehq.mc.protocol.data.status.handler.ServerInfoBuilder; import org.spacehq.mc.protocol.data.status.handler.ServerInfoBuilder;
import org.spacehq.mc.protocol.packet.handshake.client.HandshakePacket; import org.spacehq.mc.protocol.packet.handshake.client.HandshakePacket;
import org.spacehq.mc.protocol.packet.ingame.client.ClientKeepAlivePacket; import org.spacehq.mc.protocol.packet.ingame.client.ClientKeepAlivePacket;
@ -108,8 +112,12 @@ public class ServerListener extends SessionAdapter {
if(event.getPacket() instanceof StatusQueryPacket) { if(event.getPacket() instanceof StatusQueryPacket) {
ServerInfoBuilder builder = event.getSession().getFlag(MinecraftConstants.SERVER_INFO_BUILDER_KEY); ServerInfoBuilder builder = event.getSession().getFlag(MinecraftConstants.SERVER_INFO_BUILDER_KEY);
if(builder == null) { if(builder == null) {
event.getSession().disconnect("No server info builder set."); builder = new ServerInfoBuilder() {
return; @Override
public ServerStatusInfo buildInfo(Session session) {
return new ServerStatusInfo(VersionInfo.CURRENT, new PlayerInfo(0, 20, new GameProfile[]{}), Message.fromString("A Minecraft Server"), null);
}
};
} }
ServerStatusInfo info = builder.buildInfo(event.getSession()); ServerStatusInfo info = builder.buildInfo(event.getSession());
@ -174,7 +182,13 @@ public class ServerListener extends SessionAdapter {
profile = new GameProfile(UUID.nameUUIDFromBytes(("OfflinePlayer:" + username).getBytes()), username); profile = new GameProfile(UUID.nameUUIDFromBytes(("OfflinePlayer:" + username).getBytes()), username);
} }
int threshold = this.session.getFlag(MinecraftConstants.SERVER_COMPRESSION_THRESHOLD); int threshold;
if (this.session.hasFlag(MinecraftConstants.SERVER_COMPRESSION_THRESHOLD)) {
threshold = this.session.getFlag(MinecraftConstants.SERVER_COMPRESSION_THRESHOLD);
} else {
threshold = 256;
}
this.session.send(new LoginSetCompressionPacket(threshold)); this.session.send(new LoginSetCompressionPacket(threshold));
this.session.setCompressionThreshold(threshold); this.session.setCompressionThreshold(threshold);
this.session.send(new LoginSuccessPacket(profile)); this.session.send(new LoginSuccessPacket(profile));

5
src/main/java/org/spacehq/mc/protocol/data/status/VersionInfo.java
View file

@ -1,6 +1,11 @@
package org.spacehq.mc.protocol.data.status; package org.spacehq.mc.protocol.data.status;
import org.spacehq.mc.protocol.MinecraftConstants;
public class VersionInfo { public class VersionInfo {
public static final VersionInfo CURRENT = new VersionInfo(MinecraftConstants.GAME_VERSION, MinecraftConstants.PROTOCOL_VERSION);
private String name; private String name;
private int protocol; private int protocol;