diff options
24 files changed, 58 insertions, 8 deletions
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandmail.java b/Essentials/src/com/earth2me/essentials/commands/Commandmail.java index 70ea2f5d9..d6b44f33a 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandmail.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandmail.java @@ -1,6 +1,7 @@ package com.earth2me.essentials.commands; import com.earth2me.essentials.CommandSource; +import static com.earth2me.essentials.I18n.tl; import com.earth2me.essentials.User; import com.earth2me.essentials.utils.FormatUtil; import com.earth2me.essentials.utils.StringUtil; @@ -8,7 +9,6 @@ import org.bukkit.Server; import java.util.List; -import static com.earth2me.essentials.I18n.tl; import java.util.UUID; @@ -58,13 +58,15 @@ public class Commandmail extends EssentialsCommand { throw new Exception(tl("playerNeverOnServer", args[1])); } + + final String mail = user.getName() + ": " + StringUtil.sanitizeString(FormatUtil.stripFormat(getFinalArg(args, 2))); + if (mail.length() > 1000) + { + throw new Exception(tl("mailTooLong")); + } + if (!u.isIgnoredPlayer(user)) { - final String mail = user.getName() + ": " + StringUtil.sanitizeString(FormatUtil.stripFormat(getFinalArg(args, 2))); - if (mail.length() > 1000) - { - throw new Exception(tl("mailTooLong")); - } if (Math.abs(System.currentTimeMillis() - timestamp) > 60000) { timestamp = System.currentTimeMillis(); @@ -75,9 +77,11 @@ public class Commandmail extends EssentialsCommand { throw new Exception(tl("mailDelay", ess.getSettings().getMailsPerMinute())); } - u.addMail(mail); + u.addMail(tl("mailMessage", mail)); } - user.sendMessage(tl("mailSent")); + + user.sendMessage(tl("mailSentTo", u.getDisplayName(), u.getName())); + user.sendMessage(mail); return; } if (args.length > 1 && "sendall".equalsIgnoreCase(args[0])) diff --git a/Essentials/src/messages.properties b/Essentials/src/messages.properties index 74f51eb40..c2a8abb9a 100644 --- a/Essentials/src/messages.properties +++ b/Essentials/src/messages.properties @@ -551,3 +551,5 @@ unableToSpawnItem=\u00a74Cannot spawn \u00a7c{0}\u00a74, this is not a spawnable itemsConverted=\u00a76Converted all items into blocks. itemsNotConverted=\u00a74You have no items that can be converted into blocks. +mailSentTo=\u00a7c{0}\u00a76 has been sent the following mail: +mailMessage={0} diff --git a/Essentials/src/messages_cs.properties b/Essentials/src/messages_cs.properties index 9fd74f853..4841ab5ec 100644 --- a/Essentials/src/messages_cs.properties +++ b/Essentials/src/messages_cs.properties @@ -551,3 +551,5 @@ unableToSpawnItem=\u00a74Cannot spawn \u00a7c{0}\u00a74, this is not a spawnable itemsConverted=\u00a76Converted all items into blocks. itemsNotConverted=\u00a74You have no items that can be converted into blocks. +mailSentTo=\u00a7c{0}\u00a76 has been sent the following mail: +mailMessage={0} diff --git a/Essentials/src/messages_da.properties b/Essentials/src/messages_da.properties index ab1124973..fab41526e 100644 --- a/Essentials/src/messages_da.properties +++ b/Essentials/src/messages_da.properties @@ -551,3 +551,5 @@ unableToSpawnItem=\u00a74Cannot spawn \u00a7c{0}\u00a74, this is not a spawnable itemsConverted=\u00a76Converted all items into blocks. itemsNotConverted=\u00a74You have no items that can be converted into blocks. +mailSentTo=\u00a7c{0}\u00a76 has been sent the following mail: +mailMessage={0} diff --git a/Essentials/src/messages_de.properties b/Essentials/src/messages_de.properties index 83debd182..d73f8922f 100644 --- a/Essentials/src/messages_de.properties +++ b/Essentials/src/messages_de.properties @@ -551,3 +551,5 @@ unableToSpawnItem=\u00a74Cannot spawn \u00a7c{0}\u00a74, this is not a spawnable itemsConverted=\u00a76Converted all items into blocks. itemsNotConverted=\u00a74You have no items that can be converted into blocks. +mailSentTo=\u00a7c{0}\u00a76 has been sent the following mail: +mailMessage={0} diff --git a/Essentials/src/messages_en.properties b/Essentials/src/messages_en.properties index 74f51eb40..c2a8abb9a 100644 --- a/Essentials/src/messages_en.properties +++ b/Essentials/src/messages_en.properties @@ -551,3 +551,5 @@ unableToSpawnItem=\u00a74Cannot spawn \u00a7c{0}\u00a74, this is not a spawnable itemsConverted=\u00a76Converted all items into blocks. itemsNotConverted=\u00a74You have no items that can be converted into blocks. +mailSentTo=\u00a7c{0}\u00a76 has been sent the following mail: +mailMessage={0} diff --git a/Essentials/src/messages_es.properties b/Essentials/src/messages_es.properties index c7e1fea53..fc35f34a9 100644 --- a/Essentials/src/messages_es.properties +++ b/Essentials/src/messages_es.properties @@ -551,3 +551,5 @@ unableToSpawnItem=\u00a74Cannot spawn \u00a7c{0}\u00a74, this is not a spawnable itemsConverted=\u00a76Converted all items into blocks. itemsNotConverted=\u00a74You have no items that can be converted into blocks. +mailSentTo=\u00a7c{0}\u00a76 has been sent the following mail: +mailMessage={0} diff --git a/Essentials/src/messages_et.properties b/Essentials/src/messages_et.properties index c66777174..c382a11a1 100644 --- a/Essentials/src/messages_et.properties +++ b/Essentials/src/messages_et.properties @@ -551,3 +551,5 @@ unableToSpawnItem=\u00a74Cannot spawn \u00a7c{0}\u00a74, this is not a spawnable itemsConverted=\u00a76Converted all items into blocks. itemsNotConverted=\u00a74You have no items that can be converted into blocks. +mailSentTo=\u00a7c{0}\u00a76 has been sent the following mail: +mailMessage={0} diff --git a/Essentials/src/messages_fi.properties b/Essentials/src/messages_fi.properties index 9340e0616..4d5b4e6f9 100644 --- a/Essentials/src/messages_fi.properties +++ b/Essentials/src/messages_fi.properties @@ -551,3 +551,5 @@ unableToSpawnItem=\u00a74Cannot spawn \u00a7c{0}\u00a74, this is not a spawnable itemsConverted=\u00a76Converted all items into blocks. itemsNotConverted=\u00a74You have no items that can be converted into blocks. +mailSentTo=\u00a7c{0}\u00a76 has been sent the following mail: +mailMessage={0} diff --git a/Essentials/src/messages_fr.properties b/Essentials/src/messages_fr.properties index 898736402..c09859933 100644 --- a/Essentials/src/messages_fr.properties +++ b/Essentials/src/messages_fr.properties @@ -551,3 +551,5 @@ unableToSpawnItem=\u00a74Cannot spawn \u00a7c{0}\u00a74, this is not a spawnable itemsConverted=\u00a76Converted all items into blocks. itemsNotConverted=\u00a74You have no items that can be converted into blocks. +mailSentTo=\u00a7c{0}\u00a76 has been sent the following mail: +mailMessage={0} diff --git a/Essentials/src/messages_hu.properties b/Essentials/src/messages_hu.properties index f8c834175..d53541355 100644 --- a/Essentials/src/messages_hu.properties +++ b/Essentials/src/messages_hu.properties @@ -551,3 +551,5 @@ unableToSpawnItem=\u00a74Cannot spawn \u00a7c{0}\u00a74, this is not a spawnable itemsConverted=\u00a76Converted all items into blocks. itemsNotConverted=\u00a74You have no items that can be converted into blocks. +mailSentTo=\u00a7c{0}\u00a76 has been sent the following mail: +mailMessage={0} diff --git a/Essentials/src/messages_it.properties b/Essentials/src/messages_it.properties index 93bf04fbc..29588fa9c 100644 --- a/Essentials/src/messages_it.properties +++ b/Essentials/src/messages_it.properties @@ -551,3 +551,5 @@ unableToSpawnItem=\u00a74Cannot spawn \u00a7c{0}\u00a74, this is not a spawnable itemsConverted=\u00a76Converted all items into blocks. itemsNotConverted=\u00a74You have no items that can be converted into blocks. +mailSentTo=\u00a7c{0}\u00a76 has been sent the following mail: +mailMessage={0} diff --git a/Essentials/src/messages_ko.properties b/Essentials/src/messages_ko.properties index 1b4a8546e..fd9589f3a 100644 --- a/Essentials/src/messages_ko.properties +++ b/Essentials/src/messages_ko.properties @@ -551,3 +551,5 @@ unableToSpawnItem=\u00a74Cannot spawn \u00a7c{0}\u00a74, this is not a spawnable itemsConverted=\u00a76Converted all items into blocks. itemsNotConverted=\u00a74You have no items that can be converted into blocks. +mailSentTo=\u00a7c{0}\u00a76 has been sent the following mail: +mailMessage={0} diff --git a/Essentials/src/messages_lt.properties b/Essentials/src/messages_lt.properties index 8e5736dcd..b7e48a557 100644 --- a/Essentials/src/messages_lt.properties +++ b/Essentials/src/messages_lt.properties @@ -551,3 +551,5 @@ unableToSpawnItem=\u00a74Cannot spawn \u00a7c{0}\u00a74, this is not a spawnable itemsConverted=\u00a76Converted all items into blocks. itemsNotConverted=\u00a74You have no items that can be converted into blocks. +mailSentTo=\u00a7c{0}\u00a76 has been sent the following mail: +mailMessage={0} diff --git a/Essentials/src/messages_nl.properties b/Essentials/src/messages_nl.properties index 078ddd139..50ec57ee9 100644 --- a/Essentials/src/messages_nl.properties +++ b/Essentials/src/messages_nl.properties @@ -551,3 +551,5 @@ unableToSpawnItem=\u00a74Cannot spawn \u00a7c{0}\u00a74, this is not a spawnable itemsConverted=\u00a76Converted all items into blocks. itemsNotConverted=\u00a74You have no items that can be converted into blocks. +mailSentTo=\u00a7c{0}\u00a76 has been sent the following mail: +mailMessage={0} diff --git a/Essentials/src/messages_pl.properties b/Essentials/src/messages_pl.properties index 396be310b..1a2a94621 100644 --- a/Essentials/src/messages_pl.properties +++ b/Essentials/src/messages_pl.properties @@ -551,3 +551,5 @@ unableToSpawnItem=\u00a74Cannot spawn \u00a7c{0}\u00a74, this is not a spawnable itemsConverted=\u00a76Converted all items into blocks. itemsNotConverted=\u00a74You have no items that can be converted into blocks. +mailSentTo=\u00a7c{0}\u00a76 has been sent the following mail: +mailMessage={0} diff --git a/Essentials/src/messages_pt.properties b/Essentials/src/messages_pt.properties index 1ededc935..aa3dd2672 100644 --- a/Essentials/src/messages_pt.properties +++ b/Essentials/src/messages_pt.properties @@ -551,3 +551,5 @@ unableToSpawnItem=\u00a74Cannot spawn \u00a7c{0}\u00a74, this is not a spawnable itemsConverted=\u00a76Converted all items into blocks. itemsNotConverted=\u00a74You have no items that can be converted into blocks. +mailSentTo=\u00a7c{0}\u00a76 has been sent the following mail: +mailMessage={0} diff --git a/Essentials/src/messages_ro.properties b/Essentials/src/messages_ro.properties index 5f43b85bc..90d8209de 100644 --- a/Essentials/src/messages_ro.properties +++ b/Essentials/src/messages_ro.properties @@ -551,3 +551,5 @@ unableToSpawnItem=\u00a74Cannot spawn \u00a7c{0}\u00a74, this is not a spawnable itemsConverted=\u00a76Converted all items into blocks. itemsNotConverted=\u00a74You have no items that can be converted into blocks. +mailSentTo=\u00a7c{0}\u00a76 has been sent the following mail: +mailMessage={0} diff --git a/Essentials/src/messages_ru.properties b/Essentials/src/messages_ru.properties index 12f457a52..44b0d6836 100644 --- a/Essentials/src/messages_ru.properties +++ b/Essentials/src/messages_ru.properties @@ -551,3 +551,5 @@ unableToSpawnItem=\u00a74Cannot spawn \u00a7c{0}\u00a74, this is not a spawnable itemsConverted=\u00a76Converted all items into blocks. itemsNotConverted=\u00a74You have no items that can be converted into blocks. +mailSentTo=\u00a7c{0}\u00a76 has been sent the following mail: +mailMessage={0} diff --git a/Essentials/src/messages_sv.properties b/Essentials/src/messages_sv.properties index 9b5ffef96..de1ba4b48 100644 --- a/Essentials/src/messages_sv.properties +++ b/Essentials/src/messages_sv.properties @@ -551,3 +551,5 @@ unableToSpawnItem=\u00a74Cannot spawn \u00a7c{0}\u00a74, this is not a spawnable itemsConverted=\u00a76Converted all items into blocks. itemsNotConverted=\u00a74You have no items that can be converted into blocks. +mailSentTo=\u00a7c{0}\u00a76 has been sent the following mail: +mailMessage={0} diff --git a/Essentials/src/messages_tr.properties b/Essentials/src/messages_tr.properties index 04965cf56..79ecb04af 100644 --- a/Essentials/src/messages_tr.properties +++ b/Essentials/src/messages_tr.properties @@ -551,3 +551,5 @@ unableToSpawnItem=\u00a74Cannot spawn \u00a7c{0}\u00a74, this is not a spawnable itemsConverted=\u00a76Converted all items into blocks. itemsNotConverted=\u00a74You have no items that can be converted into blocks. +mailSentTo=\u00a7c{0}\u00a76 has been sent the following mail: +mailMessage={0} diff --git a/Essentials/src/messages_zh.properties b/Essentials/src/messages_zh.properties index 7ba3d9a29..cee887218 100644 --- a/Essentials/src/messages_zh.properties +++ b/Essentials/src/messages_zh.properties @@ -551,3 +551,5 @@ unableToSpawnItem=\u00a74Cannot spawn \u00a7c{0}\u00a74, this is not a spawnable itemsConverted=\u00a76Converted all items into blocks. itemsNotConverted=\u00a74You have no items that can be converted into blocks. +mailSentTo=\u00a7c{0}\u00a76 has been sent the following mail: +mailMessage={0} diff --git a/Essentials/src/messages_zh_HK.properties b/Essentials/src/messages_zh_HK.properties index 7e1db0418..5e7208c98 100644 --- a/Essentials/src/messages_zh_HK.properties +++ b/Essentials/src/messages_zh_HK.properties @@ -551,3 +551,5 @@ unableToSpawnItem=\u00a74Cannot spawn \u00a7c{0}\u00a74, this is not a spawnable itemsConverted=\u00a76Converted all items into blocks. itemsNotConverted=\u00a74You have no items that can be converted into blocks. +mailSentTo=\u00a7c{0}\u00a76 has been sent the following mail: +mailMessage={0} diff --git a/Essentials/src/messages_zh_TW.properties b/Essentials/src/messages_zh_TW.properties index 165d94f97..f50a83247 100644 --- a/Essentials/src/messages_zh_TW.properties +++ b/Essentials/src/messages_zh_TW.properties @@ -551,3 +551,5 @@ unableToSpawnItem=\u00a74Cannot spawn \u00a7c{0}\u00a74, this is not a spawnable itemsConverted=\u00a76Converted all items into blocks. itemsNotConverted=\u00a74You have no items that can be converted into blocks. +mailSentTo=\u00a7c{0}\u00a76 has been sent the following mail: +mailMessage={0} |