Merge branch 'master' into registered-server

This commit is contained in:
Andrew Steinborn
2018-09-18 16:50:13 -04:00
6 changed files with 80 additions and 43 deletions

View File

@@ -23,7 +23,7 @@ public enum StateRegistry {
},
STATUS {
{
SERVERBOUND.register(StatusRequest.class, StatusRequest::new,
SERVERBOUND.register(StatusRequest.class, () -> StatusRequest.INSTANCE,
genericMappings(0x00));
SERVERBOUND.register(StatusPing.class, StatusPing::new,
genericMappings(0x01));

View File

@@ -5,6 +5,12 @@ import com.velocitypowered.proxy.protocol.MinecraftPacket;
import io.netty.buffer.ByteBuf;
public class StatusRequest implements MinecraftPacket {
public static final StatusRequest INSTANCE = new StatusRequest();
private StatusRequest() {
}
@Override
public void decode(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion) {
@@ -14,4 +20,9 @@ public class StatusRequest implements MinecraftPacket {
public void encode(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion) {
}
@Override
public String toString() {
return "StatusRequest";
}
}