AtlasMediaGroup/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/TotalFreedomMod.git synced 2024-11-27 01:05:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/TFM-1.13' into TFM-1.13

Browse Source
This commit is contained in:
Lemon 2018-07-26 15:28:59 +05:00
commit 655766a0c4
2 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/me/totalfreedom/totalfreedommod/command/Command_myadmin.java
View File

@ -143,22 +143,10 @@ public class Command_myadmin extends FreedomCommand
} }
String msg = StringUtils.join(args, " ", 1, args.length); String msg = StringUtils.join(args, " ", 1, args.length);
if (!msg.contains("%name%"))
{
msg("You login message must contain your name. To add it, specify %name% where you want it.", ChatColor.RED);
return true;
}
FUtil.adminAction(sender.getName(), "Setting personal login message" + (init == null ? "" : " for " + targetPlayer.getName()), false); FUtil.adminAction(sender.getName(), "Setting personal login message" + (init == null ? "" : " for " + targetPlayer.getName()), false);
target.setLoginMessage(msg); target.setLoginMessage(msg);
msg((init == null ? "Your" : targetPlayer.getName() + "'s") + " login message is now: "); msg((init == null ? "Your" : targetPlayer.getName() + "'s") + " login message is now: ");
if (msg.contains("%name%")) msg("> " + ChatColor.AQUA + (msg.contains("%name%") ? "" : target.getName() + " is ") + FUtil.colorize(msg).replace("%name%", targetPlayer.getName()));
{
msg("> " + FUtil.colorize(msg).replace("%name%", targetPlayer.getName()));
}
else
{
msg("> " + ChatColor.AQUA + targetPlayer.getName() + " is " + ChatUtils.colorize(target.getLoginMessage()));
}
plugin.al.save(); plugin.al.save();
plugin.al.updateTables(); plugin.al.updateTables();
return true; return true;

9
src/main/java/me/totalfreedom/totalfreedommod/rank/RankManager.java
View File

@ -209,14 +209,7 @@ public class RankManager extends FreedomService
loginMsg = ChatUtils.colorize(admin.getLoginMessage()); loginMsg = ChatUtils.colorize(admin.getLoginMessage());
} }
} }
if (loginMsg.contains("%name%")) FUtil.bcastMsg(ChatColor.AQUA + (loginMsg.contains("%name%") ? "" : player.getName() + " is ") + FUtil.colorize(loginMsg).replace("%name%", player.getName()));
{
FUtil.bcastMsg(loginMsg.replace("%name%", player.getName()));
}
else
{
FUtil.bcastMsg(ChatColor.AQUA + player.getName() + " is " + loginMsg);
}
plugin.pl.getPlayer(player).setTag(display.getColoredTag()); plugin.pl.getPlayer(player).setTag(display.getColoredTag());
if (isAdmin) if (isAdmin)