ChromaGaming/Chroma-Chat
1
0
Fork 0
Code Issues 15 Pull requests 1 Projects Releases 8 Packages Wiki Activity

Possible fix for #30, still needs testing

Browse source
This commit is contained in:
Norbi Peti 2016-06-22 13:03:38 +02:00
parent 2d46c3bc20
commit da87a1293e
1 changed files with 844 additions and 871 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
src/io/github/norbipeti/thebuttonmc/PlayerListener.java
View file

@ -105,19 +105,20 @@ public class PlayerListener implements Listener {
if (ispremium if (ispremium
&& mp.FlairState.equals(FlairStates.NoComment)) { && mp.FlairState.equals(FlairStates.NoComment)) {
String json = String String json = String
.format("[\"\",{\"text\":\"If you'd like your /r/TheButton flair displayed ingame, write your Minecraft name to \",\"color\":\"aqua\"},{\"text\":\"[this thread].\",\"color\":\"aqua\",\"clickEvent\":{\"action\":\"open_url\",\"value\":\"%s\"},\"hoverEvent\":{\"action\":\"show_text\",\"value\":{\"text\":\"\",\"extra\":[{\"text\":\"Click here to go to the Reddit thread\",\"color\":\"aqua\"}]}}}]", .format("[\"\",{\"text\":\"If you're from Reddit and you'd like your /r/TheButton flair displayed ingame, write your Minecraft name to \",\"color\":\"aqua\"},{\"text\":\"[this thread].\",\"color\":\"aqua\",\"clickEvent\":{\"action\":\"open_url\",\"value\":\"%s\"},\"hoverEvent\":{\"action\":\"show_text\",\"value\":{\"text\":\"\",\"extra\":[{\"text\":\"Click here to go to the Reddit thread\",\"color\":\"aqua\"}]}}}]",
PluginMain.FlairThreadURL); PluginMain.FlairThreadURL);
PluginMain.Instance.getServer().dispatchCommand( PluginMain.Instance.getServer().dispatchCommand(
PluginMain.Console, PluginMain.Console,
"tellraw " + mp.PlayerName + " " + json); "tellraw " + mp.PlayerName + " " + json);
json = "[\"\",{\"text\":\"If you don't want the flair, type /u ignore to prevent this message after next login.\",\"color\":\"aqua\"}]"; json = "[\"\",{\"text\":\"If you aren't from Reddit or don't want the flair, type /u ignore to prevent this message after next login.\",\"color\":\"aqua\"}]";
PluginMain.Instance.getServer().dispatchCommand( PluginMain.Instance.getServer().dispatchCommand(
PluginMain.Console, PluginMain.Console,
"tellraw " + mp.PlayerName + " " + json); "tellraw " + mp.PlayerName + " " + json);
} }
} }
}; };
tt.mp = mp;; tt.mp = mp;
;
timer.schedule(tt, 15 * 1000); timer.schedule(tt, 15 * 1000);
} }
@ -136,48 +137,20 @@ public class PlayerListener implements Listener {
boolean ispremium = pp != null && pp.isPremium(); boolean ispremium = pp != null && pp.isPremium();
final MaybeOfflinePlayer mplayer = mp; final MaybeOfflinePlayer mplayer = mp;
if (mp.LoginWarningCount < LoginWarningCountTotal - 1) { if (mp.LoginWarningCount < LoginWarningCountTotal) {
if (AuthMe.getInstance().api.isAuthenticated(player)) // The if (AuthMe.getInstance().api.isAuthenticated(player)) {
// player // The player logged in in any way
// logged
// in
// in
// any
// way
{
{
if (!ispremium if (!ispremium
&& !mp.FlairState && !mp.FlairState.equals(FlairStates.Accepted)
.equals(FlairStates.Accepted) && !mp.FlairState.equals(FlairStates.Commented)) {
&& !mp.FlairState // The player isn't premium, and doesn't have a
.equals(FlairStates.Commented)) { // The
// player
// isn't
// premium,
// and
// doesn't
// have
// a
// flair
// //
// The
// player
// isn't
// premium,
// and
// doesn't
// have
// a
// flair // flair
String json = String String json = String
.format("[\"\",{\"text\":\"Welcome! If you are a premium Minecraft user, please do /premium and relog, otherwise please verify your /r/thebutton flair to play, \",\"color\":\"gold\"},{\"text\":\"[here].\",\"color\":\"gold\",\"clickEvent\":{\"action\":\"open_url\",\"value\":\"%s\"},\"hoverEvent\":{\"action\":\"show_text\",\"value\":{\"text\":\"\",\"extra\":[{\"text\":\"Click here to go to the Reddit thread\",\"color\":\"aqua\"}]}}}]", .format("[\"\",{\"text\":\"Welcome! If you are a premium Minecraft user, please do /premium and relog, otherwise please verify your /r/thebutton flair to play, \",\"color\":\"gold\"},{\"text\":\"[here].\",\"color\":\"gold\",\"clickEvent\":{\"action\":\"open_url\",\"value\":\"%s\"},\"hoverEvent\":{\"action\":\"show_text\",\"value\":{\"text\":\"\",\"extra\":[{\"text\":\"Click here to go to the Reddit thread\",\"color\":\"aqua\"}]}}}]",
PluginMain.FlairThreadURL); PluginMain.FlairThreadURL);
PluginMain.Instance.getServer() PluginMain.Instance.getServer().dispatchCommand(
.dispatchCommand(
PluginMain.Console, PluginMain.Console,
"tellraw " + mp.PlayerName "tellraw " + mp.PlayerName + " " + json);
+ " " + json);
}
} }
} }
} else { } else {