From d618a1f594e9f70deeb685f073685ecbfd320738 Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Thu, 19 Apr 2018 09:02:14 +0300 Subject: [PATCH] fix Kick packet --- src/main/java/mc/core/network/CSPacket.java | 5 +---- .../network/proto_125/packets/KickPacket.java | 15 +++++++++++++-- .../network/proto_125/packets/PingPacket.java | 4 ++++ 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/src/main/java/mc/core/network/CSPacket.java b/src/main/java/mc/core/network/CSPacket.java index ef9d3e2..4dd785e 100644 --- a/src/main/java/mc/core/network/CSPacket.java +++ b/src/main/java/mc/core/network/CSPacket.java @@ -4,9 +4,6 @@ */ package mc.core.network; -import mc.core.network.NetStream; - public interface CSPacket { - default void readSelf(NetStream netStream) { - } + void readSelf(NetStream netStream); } diff --git a/src/main/java/mc/core/network/proto_125/packets/KickPacket.java b/src/main/java/mc/core/network/proto_125/packets/KickPacket.java index 38bf3fc..826b9b4 100644 --- a/src/main/java/mc/core/network/proto_125/packets/KickPacket.java +++ b/src/main/java/mc/core/network/proto_125/packets/KickPacket.java @@ -4,18 +4,29 @@ */ package mc.core.network.proto_125.packets; +import lombok.Getter; import lombok.Setter; +import lombok.ToString; +import mc.core.network.CSPacket; +import mc.core.network.NetStream; import mc.core.network.SCPacket; import mc.core.network.proto_125.ByteArrayOutputNetStream; -public class KickPacket implements SCPacket { - @Setter +@Getter +@Setter +@ToString +public class KickPacket implements SCPacket, CSPacket { private String reason; public void setPongMessage(String description, int online, int maxOnline) { reason = String.format("%s§%d§%d", description, online, maxOnline); } + @Override + public void readSelf(NetStream netStream) { + reason = netStream.readString(); + } + @Override public byte[] toByteArray() { ByteArrayOutputNetStream netStream = new ByteArrayOutputNetStream(); diff --git a/src/main/java/mc/core/network/proto_125/packets/PingPacket.java b/src/main/java/mc/core/network/proto_125/packets/PingPacket.java index 953353b..923ec97 100644 --- a/src/main/java/mc/core/network/proto_125/packets/PingPacket.java +++ b/src/main/java/mc/core/network/proto_125/packets/PingPacket.java @@ -5,6 +5,10 @@ package mc.core.network.proto_125.packets; import mc.core.network.CSPacket; +import mc.core.network.NetStream; public class PingPacket implements CSPacket { + @Override + public void readSelf(NetStream netStream) { + } }