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

Fix Verygames Ipclean issue

Browse Source
This commit is contained in:
Xephi 2015-12-21 13:06:25 +01:00
parent 00bf25794a
commit 705cc7ba8d
2 changed files with 46 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
src/main/java/fr/xephi/authme/AuthMe.java
View File

@ -851,16 +851,50 @@ public class AuthMe extends JavaPlugin {
return message; return message;
} }
public String getIP(Player player) { /**
String name = player.getName().toLowerCase(); * Gets a player's real IP through VeryGames method.
*
* @param player The player to process.
*
*/
public void getVerygamesIp(final Player player)
{
final String name = player.getName().toLowerCase();
Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable(){
@Override
public void run() {
String realIP = player.getAddress().getAddress().getHostAddress();
String sUrl = "http://monitor-1.verygames.net/api/?action=ipclean-real-ip&out=raw&ip=%IP%&port=%PORT%";
sUrl = sUrl.replace("%IP%", realIP)
.replace("%PORT%", "" + player.getAddress().getPort());
try {
URL url = new URL(sUrl);
URLConnection urlCon = url.openConnection();
try (BufferedReader in = new BufferedReader(new InputStreamReader(urlCon.getInputStream()))) {
String inputLine = in.readLine();
if (!StringUtils.isEmpty(inputLine) && !inputLine.equalsIgnoreCase("error")
&& !inputLine.contains("error")) {
realIP = inputLine;
}
} catch (IOException e) {
ConsoleLogger.showError("Could not read from Very Games API - " + StringUtils.formatException(e));
}
} catch (IOException e) {
ConsoleLogger.showError("Could not fetch Very Games API with URL '" + sUrl + "' - "
+ StringUtils.formatException(e));
}
if (realIp.containsKey(name))
realIp.remove(name);
realIp.putIfAbsent(name, realIP);
}
});
}
public String getIP(final Player player) {
final String name = player.getName().toLowerCase();
String ip = player.getAddress().getAddress().getHostAddress(); String ip = player.getAddress().getAddress().getHostAddress();
if (Settings.bungee) { if (realIp.containsKey(name))
if (realIp.containsKey(name)) ip = realIp.get(name);
ip = realIp.get(name);
}
if (Settings.checkVeryGames)
if (getVeryGamesIp(player) != null)
ip = getVeryGamesIp(player);
return ip; return ip;
} }
@ -886,39 +920,6 @@ public class AuthMe extends JavaPlugin {
return moduleManager; return moduleManager;
} }
/**
* Gets a player's real IP through VeryGames method.
*
* @param player The player to process.
*
* @return The real IP of the player.
*/
// TODO: Cache the result or run it async, it can cause trouble if verygames server isn't responding.
@Deprecated
public String getVeryGamesIp(Player player) {
String realIP = player.getAddress().getAddress().getHostAddress();
String sUrl = "http://monitor-1.verygames.net/api/?action=ipclean-real-ip&out=raw&ip=%IP%&port=%PORT%";
sUrl = sUrl.replace("%IP%", player.getAddress().getAddress().getHostAddress())
.replace("%PORT%", "" + player.getAddress().getPort());
try {
URL url = new URL(sUrl);
URLConnection urlCon = url.openConnection();
try (BufferedReader in = new BufferedReader(new InputStreamReader(urlCon.getInputStream()))) {
String inputLine = in.readLine();
if (!StringUtils.isEmpty(inputLine) && !inputLine.equalsIgnoreCase("error")
&& !inputLine.contains("error")) {
realIP = inputLine;
}
} catch (IOException e) {
ConsoleLogger.showError("Could not read from Very Games API - " + StringUtils.formatException(e));
}
} catch (IOException e) {
ConsoleLogger.showError("Could not fetch Very Games API with URL '" + sUrl + "' - "
+ StringUtils.formatException(e));
}
return realIP;
}
public CommandHandler getCommandHandler() { public CommandHandler getCommandHandler() {
return this.commandHandler; return this.commandHandler;
} }

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

@ -210,6 +210,9 @@ public class AuthMePlayerListener implements Listener {
joinMessage.put(name, joinMsg); joinMessage.put(name, joinMsg);
} }
if (Settings.checkVeryGames)
plugin.getVerygamesIp(player);
// Shedule login task so works after the prelogin // Shedule login task so works after the prelogin
// (Fix found by Koolaid5000) // (Fix found by Koolaid5000)
Bukkit.getScheduler().runTask(plugin, new Runnable() { Bukkit.getScheduler().runTask(plugin, new Runnable() {