Upstream/AuthMeReloaded
1
0
Fork 0
mirror of https://github.com/AuthMe/AuthMeReloaded.git synced 2024-11-27 20:57:35 +01:00
Code Issues Projects Releases Wiki Activity

Add Hostname to restricted ip method

Browse Source
This commit is contained in:
Xephi 2015-12-28 11:59:30 +01:00
parent c94b6223a1
commit 806201e1cc
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/fr/xephi/authme/process/join/AsynchronousJoin.java
View File

@ -58,7 +58,7 @@ public class AsynchronousJoin {
} }
final String ip = plugin.getIP(player); final String ip = plugin.getIP(player);
if (Settings.isAllowRestrictedIp && !Settings.getRestrictedIp(name, ip)) { if (Settings.isAllowRestrictedIp && !Settings.getRestrictedIp(name, ip, player.getAddress().getHostName())) {
sched.scheduleSyncDelayedTask(plugin, new Runnable() { sched.scheduleSyncDelayedTask(plugin, new Runnable() {
@Override @Override

17
src/main/java/fr/xephi/authme/settings/Settings.java
View File

@ -385,7 +385,7 @@ public final class Settings {
* *
* @return boolean * @return boolean
*/ */
public static boolean getRestrictedIp(String name, String ip) { public static boolean getRestrictedIp(String name, String ip, String domain) {
Iterator<String> iterator = getRestrictedIp.iterator(); Iterator<String> iterator = getRestrictedIp.iterator();
boolean trueOnce = false; boolean trueOnce = false;
@ -396,8 +396,17 @@ public final class Settings {
String testIp = args[1]; String testIp = args[1];
if (testName.equalsIgnoreCase(name)) { if (testName.equalsIgnoreCase(name)) {
nameFound = true; nameFound = true;
if (testIp.equalsIgnoreCase(ip)) { if (ip != null)
trueOnce = true; {
if (testIp.equalsIgnoreCase(ip)) {
trueOnce = true;
}
}
if (domain != null)
{
if (testIp.equalsIgnoreCase(domain)) {
trueOnce = true;
}
} }
} }
} }
@ -746,7 +755,7 @@ public final class Settings {
if (!contains("Email.emailOauth2Token")) if (!contains("Email.emailOauth2Token"))
set("Email.emailOauth2Token", ""); set("Email.emailOauth2Token", "");
if (!contains("Hook.sendPlayerTo")) if (!contains("Hook.sendPlayerTo"))
{ {
set("Hooks.sendPlayerTo", ""); set("Hooks.sendPlayerTo", "");