diff --git a/TheButtonAutoFlair.jar b/TheButtonAutoFlair.jar index a20f0c5..6d06995 100644 Binary files a/TheButtonAutoFlair.jar and b/TheButtonAutoFlair.jar differ diff --git a/TheButtonAutoFlair/.classpath b/TheButtonAutoFlair/.classpath index b7d5a31..906769f 100644 --- a/TheButtonAutoFlair/.classpath +++ b/TheButtonAutoFlair/.classpath @@ -34,5 +34,6 @@ + diff --git a/TheButtonAutoFlair/plugin.yml b/TheButtonAutoFlair/plugin.yml index 8e8ce62..9135fe2 100644 --- a/TheButtonAutoFlair/plugin.yml +++ b/TheButtonAutoFlair/plugin.yml @@ -22,7 +22,7 @@ commands: warmode: description: Toggles war mode author: NorbiPeti -depend: [Essentials, Towny, Minigames, Votifier, Factions, WorldGuard, WorldEdit, ProtocolLib, FastLogin, Vault] +depend: [Essentials, Towny, Minigames, Votifier, Factions, WorldGuard, WorldEdit, ProtocolLib, FastLogin, Vault, AuthMe] permissions: tbmc.admin: description: Gives access to /un- commands and /u admin commands diff --git a/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PlayerListener.java b/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PlayerListener.java index 35ee8ec..325b6a9 100644 --- a/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PlayerListener.java +++ b/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PlayerListener.java @@ -52,6 +52,8 @@ import com.palmergames.bukkit.towny.object.WorldCoord; import com.vexsoftware.votifier.model.Vote; import com.vexsoftware.votifier.model.VotifierEvent; +import fr.xephi.authme.AuthMe; + public class PlayerListener implements Listener { public static HashMap nicknames = new HashMap<>(); @@ -135,15 +137,27 @@ public class PlayerListener implements Listener { mp.SetFlairColor(mp.GetFlairColor()); // Update display + boolean ispremium = ((FastLoginBukkit) FastLoginBukkit + .getPlugin(FastLoginBukkit.class)).getEnabledPremium() + .contains(event.getPlayer().getName()); + if (!PluginMain.permission.has(event.getPlayer(), "authme.player.*") - && (((FastLoginBukkit) FastLoginBukkit - .getPlugin(FastLoginBukkit.class)).getEnabledPremium() - .contains(event.getPlayer().getName()) - || mp.FlairState.equals(FlairStates.Accepted) || mp.FlairState - .equals(FlairStates.Commented))) { + && (ispremium || mp.FlairState.equals(FlairStates.Accepted) || mp.FlairState + .equals(FlairStates.Commented))) { PluginMain.permission.playerAdd(event.getPlayer(), "authme.player.*"); } + + if(ispremium) + { + Bukkit.getScheduler().runTaskLater(PluginMain.Instance, new Runnable(){ + public void run() + { + AuthMe.getInstance().api.forceLogout(p); + AuthMe.getInstance().api.forceLogin(p); + } + }, 100); + } } @EventHandler diff --git a/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener$1.class b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener$1.class index 8d8046f..4c3bcbb 100644 Binary files a/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener$1.class and b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener$1.class differ diff --git a/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener$2.class b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener$2.class index 50b308b..f06161f 100644 Binary files a/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener$2.class and b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener$2.class differ diff --git a/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener$3.class b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener$3.class index 621f084..bad0889 100644 Binary files a/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener$3.class and b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener$3.class differ diff --git a/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener$4.class b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener$4.class index c61e2ce..ad9cf91 100644 Binary files a/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener$4.class and b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener$4.class differ diff --git a/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener$5.class b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener$5.class new file mode 100644 index 0000000..ab76661 Binary files /dev/null and b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener$5.class differ diff --git a/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener.class b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener.class index 3bae50f..eea2559 100644 Binary files a/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener.class and b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener.class differ