From 024cf0cac86a305dee6a220bae33c3e48e899497 Mon Sep 17 00:00:00 2001 From: P0nk Date: Thu, 9 Sep 2021 21:28:27 +0200 Subject: [PATCH] Rename MapleLoginBypassCoordinator --- src/main/java/client/Client.java | 10 +++++----- .../client/command/commands/gm0/EnableAuthCommand.java | 4 ++-- ...assCoordinator.java => LoginBypassCoordinator.java} | 6 +++--- src/main/java/net/server/task/LoginStorageTask.java | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) rename src/main/java/net/server/coordinator/login/{MapleLoginBypassCoordinator.java => LoginBypassCoordinator.java} (95%) diff --git a/src/main/java/client/Client.java b/src/main/java/client/Client.java index b70b2fc1fe..6a234adbb0 100644 --- a/src/main/java/client/Client.java +++ b/src/main/java/client/Client.java @@ -38,7 +38,7 @@ import net.server.Server; import net.server.audit.locks.MonitoredLockType; import net.server.audit.locks.factory.MonitoredReentrantLockFactory; import net.server.channel.Channel; -import net.server.coordinator.login.MapleLoginBypassCoordinator; +import net.server.coordinator.login.LoginBypassCoordinator; import net.server.coordinator.session.Hwid; import net.server.coordinator.session.IpAddresses; import net.server.coordinator.session.SessionCoordinator; @@ -578,7 +578,7 @@ public class Client extends ChannelInboundHandlerAdapter { } if (pin.equals(other)) { pinattempt = 0; - MapleLoginBypassCoordinator.getInstance().registerLoginBypassEntry(hwid, accId, false); + LoginBypassCoordinator.getInstance().registerLoginBypassEntry(hwid, accId, false); return true; } return false; @@ -611,7 +611,7 @@ public class Client extends ChannelInboundHandlerAdapter { } if (pic.equals(other)) { // thanks ryantpayton (HeavenClient) for noticing null pics being checked here picattempt = 0; - MapleLoginBypassCoordinator.getInstance().registerLoginBypassEntry(hwid, accId, true); + LoginBypassCoordinator.getInstance().registerLoginBypassEntry(hwid, accId, true); return true; } return false; @@ -1560,11 +1560,11 @@ public class Client extends ChannelInboundHandlerAdapter { } public boolean canBypassPin() { - return MapleLoginBypassCoordinator.getInstance().canLoginBypass(hwid, accId, false); + return LoginBypassCoordinator.getInstance().canLoginBypass(hwid, accId, false); } public boolean canBypassPic() { - return MapleLoginBypassCoordinator.getInstance().canLoginBypass(hwid, accId, true); + return LoginBypassCoordinator.getInstance().canLoginBypass(hwid, accId, true); } public int getLanguage() { diff --git a/src/main/java/client/command/commands/gm0/EnableAuthCommand.java b/src/main/java/client/command/commands/gm0/EnableAuthCommand.java index 203da7945c..5ce7e71692 100644 --- a/src/main/java/client/command/commands/gm0/EnableAuthCommand.java +++ b/src/main/java/client/command/commands/gm0/EnableAuthCommand.java @@ -25,7 +25,7 @@ package client.command.commands.gm0; import client.Client; import client.command.Command; -import net.server.coordinator.login.MapleLoginBypassCoordinator; +import net.server.coordinator.login.LoginBypassCoordinator; public class EnableAuthCommand extends Command { { @@ -36,7 +36,7 @@ public class EnableAuthCommand extends Command { public void execute(Client c, String[] params) { if (c.tryacquireClient()) { try { - MapleLoginBypassCoordinator.getInstance().unregisterLoginBypassEntry(c.getHwid(), c.getAccID()); + LoginBypassCoordinator.getInstance().unregisterLoginBypassEntry(c.getHwid(), c.getAccID()); } finally { c.releaseClient(); } diff --git a/src/main/java/net/server/coordinator/login/MapleLoginBypassCoordinator.java b/src/main/java/net/server/coordinator/login/LoginBypassCoordinator.java similarity index 95% rename from src/main/java/net/server/coordinator/login/MapleLoginBypassCoordinator.java rename to src/main/java/net/server/coordinator/login/LoginBypassCoordinator.java index 08e17aa216..f346dcda5a 100644 --- a/src/main/java/net/server/coordinator/login/MapleLoginBypassCoordinator.java +++ b/src/main/java/net/server/coordinator/login/LoginBypassCoordinator.java @@ -37,10 +37,10 @@ import java.util.concurrent.ConcurrentHashMap; /** * @author Ronan */ -public class MapleLoginBypassCoordinator { - private final static MapleLoginBypassCoordinator instance = new MapleLoginBypassCoordinator(); +public class LoginBypassCoordinator { + private final static LoginBypassCoordinator instance = new LoginBypassCoordinator(); - public static MapleLoginBypassCoordinator getInstance() { + public static LoginBypassCoordinator getInstance() { return instance; } diff --git a/src/main/java/net/server/task/LoginStorageTask.java b/src/main/java/net/server/task/LoginStorageTask.java index fdf60eeb82..28c061d341 100644 --- a/src/main/java/net/server/task/LoginStorageTask.java +++ b/src/main/java/net/server/task/LoginStorageTask.java @@ -19,8 +19,8 @@ */ package net.server.task; +import net.server.coordinator.login.LoginBypassCoordinator; import net.server.coordinator.session.SessionCoordinator; -import net.server.coordinator.login.MapleLoginBypassCoordinator; /** * @@ -31,6 +31,6 @@ public class LoginStorageTask implements Runnable { @Override public void run() { SessionCoordinator.getInstance().runUpdateLoginHistory(); - MapleLoginBypassCoordinator.getInstance().runUpdateLoginBypass(); + LoginBypassCoordinator.getInstance().runUpdateLoginBypass(); } }