From 167937bb889c1b357a3c5df9149f84d7b8053c51 Mon Sep 17 00:00:00 2001 From: P0nk Date: Sun, 29 Sep 2024 22:22:23 +0200 Subject: [PATCH] Check banned hwid on login --- src/main/java/client/Client.java | 2 ++ .../java/net/server/handlers/login/LoginPasswordHandler.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/client/Client.java b/src/main/java/client/Client.java index 5bc7886abb..020efc290c 100644 --- a/src/main/java/client/Client.java +++ b/src/main/java/client/Client.java @@ -334,6 +334,8 @@ public class Client extends ChannelInboundHandlerAdapter { return ret; } + // TODO: load hwidbans on server start and query it on demand. This query should not be run on every login! + @Deprecated public boolean hasBannedHWID() { if (hwid == null) { return false; diff --git a/src/main/java/net/server/handlers/login/LoginPasswordHandler.java b/src/main/java/net/server/handlers/login/LoginPasswordHandler.java index fe4bfa41dc..81df8a5101 100644 --- a/src/main/java/net/server/handlers/login/LoginPasswordHandler.java +++ b/src/main/java/net/server/handlers/login/LoginPasswordHandler.java @@ -110,7 +110,7 @@ public final class LoginPasswordHandler implements PacketHandler { } boolean banCheckDisabled = false; - if (!banCheckDisabled && (c.hasBannedIP() || c.hasBannedMac())) { + if (!banCheckDisabled && (c.hasBannedIP() || c.hasBannedMac() || c.hasBannedHWID())) { c.sendPacket(PacketCreator.getLoginFailed(3)); return; }