Upstream/AuthMeReloaded
1
0
Fork 0
mirror of https://github.com/AuthMe/AuthMeReloaded.git synced 2025-02-21 14:21:28 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into enums

Browse Source
This commit is contained in:
Lucas Jacques 2015-11-25 19:52:15 +01:00
commit 5f9ba208de
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -900,6 +900,7 @@ public class AuthMe extends JavaPlugin {
* *
* @return The real IP of the player. * @return The real IP of the player.
*/ */
// TODO: Cache the result
@Deprecated @Deprecated
public String getVeryGamesIp(Player player) { public String getVeryGamesIp(Player player) {
String realIP = player.getAddress().getAddress().getHostAddress(); String realIP = player.getAddress().getAddress().getHostAddress();

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

@ -48,9 +48,7 @@ public final class Settings extends YamlConfiguration {
public static Pattern nickPattern; public static Pattern nickPattern;
public static boolean useLogging = false; public static boolean useLogging = false;
public static int purgeDelay = 60; public static int purgeDelay = 60;
// Due to compatibility issues with plugins like FactionsChat public static boolean isChatAllowed, isPermissionCheckEnabled, isRegistrationEnabled,
public static Boolean isChatAllowed;
public static boolean isPermissionCheckEnabled, isRegistrationEnabled,
isForcedRegistrationEnabled, isTeleportToSpawnEnabled, isForcedRegistrationEnabled, isTeleportToSpawnEnabled,
isSessionsEnabled, isAllowRestrictedIp, isSessionsEnabled, isAllowRestrictedIp,
isMovementAllowed, isKickNonRegisteredEnabled, isMovementAllowed, isKickNonRegisteredEnabled,