From 022ec237baaf88e957a4f02b1156794b159953c4 Mon Sep 17 00:00:00 2001 From: TheMode Date: Sun, 10 Oct 2021 03:29:51 +0200 Subject: [PATCH] KeepAliveListener cleanup Signed-off-by: TheMode --- .../minestom/server/listener/KeepAliveListener.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/main/java/net/minestom/server/listener/KeepAliveListener.java b/src/main/java/net/minestom/server/listener/KeepAliveListener.java index f280ff9a1..5fe4bb8da 100644 --- a/src/main/java/net/minestom/server/listener/KeepAliveListener.java +++ b/src/main/java/net/minestom/server/listener/KeepAliveListener.java @@ -5,21 +5,18 @@ import net.kyori.adventure.text.format.NamedTextColor; import net.minestom.server.entity.Player; import net.minestom.server.network.packet.client.play.ClientKeepAlivePacket; -public class KeepAliveListener { +public final class KeepAliveListener { + private static final Component KICK_MESSAGE = Component.text("Bad Keep Alive packet", NamedTextColor.RED); public static void listener(ClientKeepAlivePacket packet, Player player) { final long packetId = packet.id; - final long playerId = player.getLastKeepAlive(); - final boolean equals = packetId == playerId; - if (!equals) { - player.kick(Component.text("Bad Keep Alive packet", NamedTextColor.RED)); + if (packetId != player.getLastKeepAlive()) { + player.kick(KICK_MESSAGE); return; } - player.refreshAnswerKeepAlive(true); - // Update latency - final int latency = (int) (System.currentTimeMillis() - packet.id); + final int latency = (int) (System.currentTimeMillis() - packetId); player.refreshLatency(latency); } }