diff --git a/TotalFreedomMod.iml b/TotalFreedomMod.iml
index 44af330b..63af917f 100644
--- a/TotalFreedomMod.iml
+++ b/TotalFreedomMod.iml
@@ -61,5 +61,54 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_myadmin.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_myadmin.java
index 89cf5df3..ec42cbb9 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_myadmin.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_myadmin.java
@@ -1,6 +1,5 @@
package me.totalfreedom.totalfreedommod.command;
-import java.util.Arrays;
import me.totalfreedom.totalfreedommod.admin.Admin;
import me.totalfreedom.totalfreedommod.rank.Rank;
import me.totalfreedom.totalfreedommod.util.FUtil;
@@ -12,6 +11,8 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
+import java.util.Arrays;
+
@CommandPermissions(level = Rank.OP, source = SourceType.BOTH)
@CommandParameters(description = "Manage my admin entry", usage = "/ [-o ] | setlogin | clearlogin | settag | cleartag | setacformat | clearacformat> | oldtags | logstick>")
public class Command_myadmin extends FreedomCommand
@@ -150,7 +151,14 @@ public class Command_myadmin extends FreedomCommand
FUtil.adminAction(sender.getName(), "Setting personal login message" + (init == null ? "" : " for " + targetPlayer.getName()), false);
target.setLoginMessage(msg);
msg((init == null ? "Your" : targetPlayer.getName() + "'s") + " login message is now: ");
- msg("> " + FUtil.colorize(msg).replace("%name%", targetPlayer.getName()));
+ if (msg.contains("%name%"))
+ {
+ msg("> " + FUtil.colorize(msg).replace("%name%", targetPlayer.getName()));
+ }
+ else
+ {
+ msg("> " + ChatColor.AQUA + targetPlayer.getName() + " is " + ChatUtils.colorize(target.getLoginMessage()));
+ }
plugin.al.save();
plugin.al.updateTables();
return true;
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/rank/RankManager.java b/src/main/java/me/totalfreedom/totalfreedommod/rank/RankManager.java
index 243ff570..5e2c8c83 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/rank/RankManager.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/rank/RankManager.java
@@ -209,8 +209,14 @@ public class RankManager extends FreedomService
loginMsg = ChatUtils.colorize(admin.getLoginMessage());
}
}
-
- FUtil.bcastMsg(loginMsg.replace("%name%", player.getName()));
+ if (loginMsg.contains("%name%"))
+ {
+ FUtil.bcastMsg(loginMsg.replace("%name%", player.getName()));
+ }
+ else
+ {
+ FUtil.bcastMsg(ChatColor.AQUA + player.getName() + " is " + loginMsg);
+ }
plugin.pl.getPlayer(player).setTag(display.getColoredTag());
if (isAdmin)
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 87e17ae5..a50c52a0 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -3,6 +3,6 @@ main: me.totalfreedom.totalfreedommod.TotalFreedomMod
version: ${tfm.build.version}
description: Plugin for the Total Freedom server.
depend: [Aero]
-softdepend: [BukkitTelnet, Essentials, LibsDisguises]
+softdepend: [BukkitTelnet, Essentials, LibsDisguises, WorldEdit]
authors: [Madgeek1450, Prozza]
api-version: 1.13