Meishin/LoginSystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Idk why, but it doesn't work!"

Browse Source 
This reverts commit 0c2ee34db3.
This commit is contained in:
Gabriele C
2016-05-20 22:00:52 +02:00
parent 0c2ee34db3
commit 6285a2137f
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
+4 -6
View File
@@ -17,7 +17,6 @@ import fr.xephi.authme.permission.PermissionsManager;
import fr.xephi.authme.permission.PlayerStatePermission; import fr.xephi.authme.permission.PlayerStatePermission;
import fr.xephi.authme.process.Management; import fr.xephi.authme.process.Management;
import fr.xephi.authme.settings.NewSetting; import fr.xephi.authme.settings.NewSetting;
import fr.xephi.authme.settings.Settings;
import fr.xephi.authme.settings.SpawnLoader; import fr.xephi.authme.settings.SpawnLoader;
import fr.xephi.authme.settings.properties.HooksSettings; import fr.xephi.authme.settings.properties.HooksSettings;
import fr.xephi.authme.settings.properties.ProtectionSettings; import fr.xephi.authme.settings.properties.ProtectionSettings;
@@ -361,11 +360,10 @@ public class AuthMePlayerListener implements Listener {
return; return;
} }
// TODO: fixme! (the regex doesn't work if compiled from the new settings provider) String nickRegEx = settings.getProperty(RestrictionSettings.ALLOWED_NICKNAME_CHARACTERS);
//String nickRegEx = settings.getProperty(RestrictionSettings.ALLOWED_NICKNAME_CHARACTERS); Pattern nickPattern = Pattern.compile(nickRegEx);
//Pattern nickPattern = Pattern.compile(nickRegEx); if (nickPattern.matcher(player.getName()).matches() || name.equalsIgnoreCase("Player")) {
if (Settings.nickPattern.matcher(player.getName()).matches() || name.equalsIgnoreCase("Player")) { event.setKickMessage(m.retrieveSingle(MessageKey.INVALID_NAME_CHARACTERS).replace("REG_EX", nickRegEx));
event.setKickMessage(m.retrieveSingle(MessageKey.INVALID_NAME_CHARACTERS).replace("REG_EX", Settings.getNickRegex));
event.setResult(PlayerLoginEvent.Result.KICK_OTHER); event.setResult(PlayerLoginEvent.Result.KICK_OTHER);
return; return;
} }