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

Don't check the country if nothing defined on configuration.

Browse Source 
- no need to enable protection to use country blacklist. #507
This commit is contained in:
DNx5 2016-02-18 09:34:04 +07:00
parent fbdd56d9de
commit 481cbaec2f
2 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
View File

@ -12,7 +12,6 @@ import fr.xephi.authme.cache.limbo.LimboPlayer;
import fr.xephi.authme.output.MessageKey; import fr.xephi.authme.output.MessageKey;
import fr.xephi.authme.output.Messages; import fr.xephi.authme.output.Messages;
import fr.xephi.authme.permission.PermissionsManager; import fr.xephi.authme.permission.PermissionsManager;
import fr.xephi.authme.permission.PlayerPermission;
import fr.xephi.authme.permission.PlayerStatePermission; import fr.xephi.authme.permission.PlayerStatePermission;
import fr.xephi.authme.settings.Settings; import fr.xephi.authme.settings.Settings;
import fr.xephi.authme.util.GeoLiteAPI; import fr.xephi.authme.util.GeoLiteAPI;
@ -109,7 +108,7 @@ public class AuthMePlayerListener implements Listener {
if (Settings.useEssentialsMotd && cmd.equals("/motd")) { if (Settings.useEssentialsMotd && cmd.equals("/motd")) {
return; return;
} }
if(!Settings.isForcedRegistrationEnabled && Settings.allowAllCommandsIfRegIsOptional) { if (!Settings.isForcedRegistrationEnabled && Settings.allowAllCommandsIfRegIsOptional) {
return; return;
} }
if (Settings.allowCommands.contains(cmd)) { if (Settings.allowCommands.contains(cmd)) {
@ -255,18 +254,20 @@ public class AuthMePlayerListener implements Listener {
} }
} }
String playerIP = event.getAddress().getHostAddress(); if (auth == null) {
if (auth == null && Settings.enableProtection) { if (!Settings.countriesBlacklist.isEmpty() || !Settings.countries.isEmpty()) {
String countryCode = GeoLiteAPI.getCountryCode(playerIP); String playerIP = event.getAddress().getHostAddress();
if (!Settings.countriesBlacklist.isEmpty() && Settings.countriesBlacklist.contains(countryCode)) { String countryCode = GeoLiteAPI.getCountryCode(playerIP);
event.setLoginResult(AsyncPlayerPreLoginEvent.Result.KICK_OTHER); if (Settings.countriesBlacklist.contains(countryCode)) {
event.setKickMessage(m.retrieveSingle(MessageKey.COUNTRY_BANNED_ERROR)); event.setLoginResult(AsyncPlayerPreLoginEvent.Result.KICK_OTHER);
return; event.setKickMessage(m.retrieveSingle(MessageKey.COUNTRY_BANNED_ERROR));
} return;
if (!Settings.countries.isEmpty() && !Settings.countries.contains(countryCode)) { }
event.setLoginResult(AsyncPlayerPreLoginEvent.Result.KICK_OTHER); if (Settings.enableProtection && !Settings.countries.contains(countryCode)) {
event.setKickMessage(m.retrieveSingle(MessageKey.COUNTRY_BANNED_ERROR)); event.setLoginResult(AsyncPlayerPreLoginEvent.Result.KICK_OTHER);
return; event.setKickMessage(m.retrieveSingle(MessageKey.COUNTRY_BANNED_ERROR));
return;
}
} }
} }

17
src/main/java/fr/xephi/authme/listener/AuthMeServerListener.java
View File

@ -32,14 +32,15 @@ public class AuthMeServerListener implements Listener {
return; return;
} }
String countryCode = GeoLiteAPI.getCountryCode(event.getAddress().getHostAddress()); if (!Settings.countriesBlacklist.isEmpty() || !Settings.countries.isEmpty()){
if (!Settings.countriesBlacklist.isEmpty() && Settings.countriesBlacklist.contains(countryCode)) { String countryCode = GeoLiteAPI.getCountryCode(event.getAddress().getHostAddress());
event.setMotd(m.retrieveSingle(MessageKey.COUNTRY_BANNED_ERROR)); if( Settings.countriesBlacklist.contains(countryCode)) {
return; event.setMotd(m.retrieveSingle(MessageKey.COUNTRY_BANNED_ERROR));
} return;
}
if (!Settings.countries.isEmpty() && !Settings.countries.contains(countryCode)) { if (!Settings.countries.contains(countryCode)) {
event.setMotd(m.retrieveSingle(MessageKey.COUNTRY_BANNED_ERROR)); event.setMotd(m.retrieveSingle(MessageKey.COUNTRY_BANNED_ERROR));
}
} }
} }