diff --git a/pom.xml b/pom.xml index daf4e1e7..e5188846 100644 --- a/pom.xml +++ b/pom.xml @@ -8,9 +8,9 @@ jar FastLogin - 0.2 + 0.2.2 2015 - http://dev.bukkit.org/bukkit-plugins/fastlogin + https://github.com/games647/FastLogin Automatically logins premium (paid accounts) player on a offline mode server @@ -43,8 +43,8 @@ maven-compiler-plugin 3.2 - 1.8 - 1.8 + 1.7 + 1.7 true true diff --git a/src/main/java/com/github/games647/fastlogin/hooks/AuthMeHook.java b/src/main/java/com/github/games647/fastlogin/hooks/AuthMeHook.java index 33158df2..93d91686 100644 --- a/src/main/java/com/github/games647/fastlogin/hooks/AuthMeHook.java +++ b/src/main/java/com/github/games647/fastlogin/hooks/AuthMeHook.java @@ -7,7 +7,7 @@ import org.bukkit.entity.Player; /** * Github: https://github.com/Xephi/AuthMeReloaded/ - * Project page: dev.bukkit.org/bukkit-plugins/authme-reloaded/ + * Project page: http://dev.bukkit.org/bukkit-plugins/authme-reloaded/ */ public class AuthMeHook implements AuthPlugin { diff --git a/src/main/java/com/github/games647/fastlogin/hooks/LoginSecurityHook.java b/src/main/java/com/github/games647/fastlogin/hooks/LoginSecurityHook.java index aea19697..cfd93185 100644 --- a/src/main/java/com/github/games647/fastlogin/hooks/LoginSecurityHook.java +++ b/src/main/java/com/github/games647/fastlogin/hooks/LoginSecurityHook.java @@ -8,7 +8,8 @@ import org.bukkit.entity.Player; * Github: http://dev.bukkit.org/bukkit-plugins/loginsecurity/ * Project page: https://github.com/lenis0012/LoginSecurity-2 * - * on join: https://github.com/lenis0012/LoginSecurity-2/blob/master/src/main/java/com/lenis0012/bukkit/ls/LoginSecurity.java#L282 + * on join: + * https://github.com/lenis0012/LoginSecurity-2/blob/master/src/main/java/com/lenis0012/bukkit/ls/LoginSecurity.java#L282 */ public class LoginSecurityHook implements AuthPlugin { diff --git a/src/main/java/com/github/games647/fastlogin/listener/PlayerListener.java b/src/main/java/com/github/games647/fastlogin/listener/PlayerListener.java index c84db062..cae84113 100644 --- a/src/main/java/com/github/games647/fastlogin/listener/PlayerListener.java +++ b/src/main/java/com/github/games647/fastlogin/listener/PlayerListener.java @@ -32,10 +32,19 @@ public class PlayerListener implements Listener { //check if it's the same player as we checked before if (session != null && session.getUsername().equals(player.getName()) && session.isVerified()) { - Bukkit.getScheduler().runTaskLater(plugin, () -> { - if (player.isOnline()) { - plugin.getLogger().log(Level.FINER, "Logging player {0} in", player.getName()); - authPlugin.forceLogin(player); +// Bukkit.getScheduler().runTaskLater(plugin, () -> { +// if (player.isOnline()) { +// plugin.getLogger().log(Level.FINER, "Logging player {0} in", player.getName()); +// authPlugin.forceLogin(player); +// } + Bukkit.getScheduler().runTaskLater(plugin, new Runnable() { + + @Override + public void run() { + if (player.isOnline()) { + plugin.getLogger().log(Level.FINE, "Logging player {0} in", player.getName()); + authPlugin.forceLogin(player); + } } //Wait before auth plugin initializes the player }, 1 * 20L); diff --git a/src/main/java/com/github/games647/fastlogin/listener/StartPacketListener.java b/src/main/java/com/github/games647/fastlogin/listener/StartPacketListener.java index 5c5a03b9..471b0cd2 100644 --- a/src/main/java/com/github/games647/fastlogin/listener/StartPacketListener.java +++ b/src/main/java/com/github/games647/fastlogin/listener/StartPacketListener.java @@ -29,6 +29,7 @@ public class StartPacketListener extends PacketAdapter { //only premium (paid account) users have a uuid from there private static final String UUID_LINK = "https://api.mojang.com/users/profiles/minecraft/"; + //this includes a-zA-Z1-9_ private static final String VALID_PLAYERNAME = "^\\w{2,16}$"; private final ProtocolManager protocolManager; diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 7649c61a..ef05e635 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -23,6 +23,7 @@ commands: description: 'Marks the invoker or the player specified as premium' aliases: [prem, fastlogin, loginfast] usage: / [player] + permission: ${project.artifactId}.command.premium permissions: ${project.artifactId}.command.premium: