Browse Source

Moving Fname regex to config

master
MagicBot 3 years ago
parent
commit
24d96f24b2
  1. 1
      src/engine/Enum.java
  2. 9
      src/engine/gameManager/ConfigManager.java
  3. 3
      src/engine/util/MiscUtils.java

1
src/engine/Enum.java

@ -24,6 +24,7 @@ import java.util.Collections;
import java.util.EnumSet; import java.util.EnumSet;
import java.util.HashMap; import java.util.HashMap;
import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.ThreadLocalRandom;
import java.util.regex.Pattern;
/* /*
* MagicBane engine enumeration class. * MagicBane engine enumeration class.

9
src/engine/gameManager/ConfigManager.java

@ -16,10 +16,12 @@ import engine.Enum;
import engine.net.NetMsgHandler; import engine.net.NetMsgHandler;
import engine.server.login.LoginServer; import engine.server.login.LoginServer;
import engine.server.world.WorldServer; import engine.server.world.WorldServer;
import jdk.nashorn.internal.runtime.regexp.joni.ast.StringNode;
import org.pmw.tinylog.Logger; import org.pmw.tinylog.Logger;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.regex.Pattern;
public enum ConfigManager { public enum ConfigManager {
@ -47,6 +49,8 @@ public enum ConfigManager {
MB_LOGIN_PORT, MB_LOGIN_PORT,
MB_LOGIN_AUTOREG, MB_LOGIN_AUTOREG,
MB_LOGIN_FNAME_REGEX,
MB_MAJOR_VER, MB_MAJOR_VER,
MB_MINOR_VER, MB_MINOR_VER,
@ -87,6 +91,7 @@ public enum ConfigManager {
public static NetMsgHandler handler; public static NetMsgHandler handler;
public static WorldServer worldServer; public static WorldServer worldServer;
public static LoginServer loginServer; public static LoginServer loginServer;
public static Map<ConfigManager, Pattern> regex = new HashMap<>();
// Called at bootstrap: ensures that all config values are loaded. // Called at bootstrap: ensures that all config values are loaded.
@ -103,6 +108,10 @@ public enum ConfigManager {
return false; return false;
} }
// compile regex here
regex.put(MB_LOGIN_FNAME_REGEX, Pattern.compile(MB_LOGIN_FNAME_REGEX.getValue()));
return true; return true;
} }

3
src/engine/util/MiscUtils.java

@ -9,6 +9,7 @@
package engine.util; package engine.util;
import engine.gameManager.ConfigManager;
import engine.server.MBServerStatics; import engine.server.MBServerStatics;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@ -29,7 +30,7 @@ public class MiscUtils {
|| (firstName.length() < MBServerStatics.MIN_NAME_LENGTH)) { || (firstName.length() < MBServerStatics.MIN_NAME_LENGTH)) {
return true; return true;
} }
return (!firstNameRegex.matcher(firstName).matches()); return (!ConfigManager.regex.get(ConfigManager.MB_LOGIN_FNAME_REGEX).matcher(firstName).matches());
} }
public static boolean checkIfLastNameInvalid(String lastName) { public static boolean checkIfLastNameInvalid(String lastName) {

Loading…
Cancel
Save