From bf279a0b590a762c3a7e28067c7dac0bb5f8d66e Mon Sep 17 00:00:00 2001 From: rtm516 Date: Tue, 26 May 2020 10:56:04 +0100 Subject: [PATCH 1/3] Add ingore for ServerKeepAlivePacket This adds ServerKeepAlivePacket as a packet to ignore as its likely not to be implemented soon and this will prevent it from spamming console with `Could not find packet for ServerKeepAlivePacket` --- .../translators/PacketTranslatorRegistry.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/PacketTranslatorRegistry.java b/connector/src/main/java/org/geysermc/connector/network/translators/PacketTranslatorRegistry.java index 13136331717..afe7e2b58f9 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/PacketTranslatorRegistry.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/PacketTranslatorRegistry.java @@ -25,18 +25,18 @@ package org.geysermc.connector.network.translators; -import java.util.HashMap; -import java.util.Map; - +import com.github.steveice10.mc.protocol.packet.ingame.server.ServerKeepAlivePacket; import com.github.steveice10.mc.protocol.packet.ingame.server.world.ServerUpdateLightPacket; +import com.github.steveice10.packetlib.packet.Packet; +import com.nukkitx.protocol.bedrock.BedrockPacket; import it.unimi.dsi.fastutil.objects.ObjectArrayList; import org.geysermc.connector.GeyserConnector; import org.geysermc.connector.network.session.GeyserSession; - -import com.github.steveice10.packetlib.packet.Packet; -import com.nukkitx.protocol.bedrock.BedrockPacket; import org.reflections.Reflections; +import java.util.HashMap; +import java.util.Map; + public class PacketTranslatorRegistry { private final Map, PacketTranslator> translators = new HashMap<>(); @@ -73,6 +73,7 @@ public class PacketTranslatorRegistry { } IGNORED_PACKETS.add(ServerUpdateLightPacket.class); + IGNORED_PACKETS.add(ServerKeepAlivePacket.class); } private PacketTranslatorRegistry() { From cbe80937ab8b2428f3b509b9f1d1de2eb693cfe7 Mon Sep 17 00:00:00 2001 From: rtm516 Date: Thu, 28 May 2020 16:38:55 +0100 Subject: [PATCH 2/3] Update PacketTranslatorRegistry.java --- .../connector/network/translators/PacketTranslatorRegistry.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/PacketTranslatorRegistry.java b/connector/src/main/java/org/geysermc/connector/network/translators/PacketTranslatorRegistry.java index afe7e2b58f9..7d438fe5935 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/PacketTranslatorRegistry.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/PacketTranslatorRegistry.java @@ -72,8 +72,8 @@ public class PacketTranslatorRegistry { } } - IGNORED_PACKETS.add(ServerUpdateLightPacket.class); IGNORED_PACKETS.add(ServerKeepAlivePacket.class); + IGNORED_PACKETS.add(ServerUpdateLightPacket.class); } private PacketTranslatorRegistry() { From 3398937b0b1303dd8947501f7c3c4e1d99ebb977 Mon Sep 17 00:00:00 2001 From: Camotoy <20743703+DoctorMacc@users.noreply.github.com> Date: Thu, 28 May 2020 11:40:33 -0400 Subject: [PATCH 3/3] Add comments explaining why we ignore packets --- .../network/translators/PacketTranslatorRegistry.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/PacketTranslatorRegistry.java b/connector/src/main/java/org/geysermc/connector/network/translators/PacketTranslatorRegistry.java index 7d438fe5935..c3ec8ff2d7b 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/PacketTranslatorRegistry.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/PacketTranslatorRegistry.java @@ -72,8 +72,8 @@ public class PacketTranslatorRegistry { } } - IGNORED_PACKETS.add(ServerKeepAlivePacket.class); - IGNORED_PACKETS.add(ServerUpdateLightPacket.class); + IGNORED_PACKETS.add(ServerKeepAlivePacket.class); // Handled by MCProtocolLib + IGNORED_PACKETS.add(ServerUpdateLightPacket.class); // Light is handled on Bedrock for us } private PacketTranslatorRegistry() {