From 7436009ea4afd1f04588fb88a1a60279fd132973 Mon Sep 17 00:00:00 2001 From: KHobbits Date: Sun, 27 Oct 2013 23:53:24 +0000 Subject: [PATCH] Clarify message when ignoring exempt players. --- .../src/com/earth2me/essentials/commands/Commandignore.java | 5 ++++- Essentials/src/messages.properties | 1 + Essentials/src/messages_cs.properties | 1 + Essentials/src/messages_da.properties | 1 + Essentials/src/messages_de.properties | 1 + Essentials/src/messages_en.properties | 1 + Essentials/src/messages_es.properties | 1 + Essentials/src/messages_fi.properties | 1 + Essentials/src/messages_fr.properties | 1 + Essentials/src/messages_it.properties | 1 + Essentials/src/messages_nl.properties | 1 + Essentials/src/messages_pl.properties | 1 + Essentials/src/messages_pt.properties | 1 + Essentials/src/messages_ro.properties | 1 + Essentials/src/messages_ru.properties | 1 + Essentials/src/messages_sv.properties | 1 + Essentials/src/messages_zh.properties | 1 + Essentials/src/messages_zh_HK.properties | 1 + Essentials/src/messages_zh_TW.properties | 1 + Essentials/src/plugin.yml | 4 ++-- 20 files changed, 24 insertions(+), 3 deletions(-) diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandignore.java b/Essentials/src/com/earth2me/essentials/commands/Commandignore.java index e64c53606..940429165 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandignore.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandignore.java @@ -40,7 +40,10 @@ public class Commandignore extends EssentialsCommand { throw new PlayerNotFoundException(); } - if (user.isIgnoredPlayer(player)) + if (player.isIgnoreExempt()) { + user.sendMessage(_("ignoreExempt")); + } + else if (user.isIgnoredPlayer(player)) { user.setIgnoredPlayer(player, false); user.sendMessage(_("unignorePlayer", player.getName())); diff --git a/Essentials/src/messages.properties b/Essentials/src/messages.properties index 47bb95b7f..4dece7404 100644 --- a/Essentials/src/messages.properties +++ b/Essentials/src/messages.properties @@ -527,3 +527,4 @@ mobDataList=\u00a76Valid mob data\:\u00a7r {0} vanish=\u00a76Vanish for {0}\u00a76\: {1} noLocationFound=\u00a74No valid location found. coordsKeyword={0}, {1}, {2} +ignoreExempt=\u00a74You can not ignore that player. diff --git a/Essentials/src/messages_cs.properties b/Essentials/src/messages_cs.properties index a483eed28..5287c5b75 100644 --- a/Essentials/src/messages_cs.properties +++ b/Essentials/src/messages_cs.properties @@ -532,3 +532,4 @@ mobDataList=\u00a76Valid mob data\:\u00a7r {0} vanish=\u00a76Vanish for {0}\u00a76\: {1} noLocationFound=\u00a74No valid location found. coordsKeyword={0}, {1}, {2} +ignoreExempt=\u00a74You can not ignore that player. diff --git a/Essentials/src/messages_da.properties b/Essentials/src/messages_da.properties index 91dcbdcc1..f1ddc2cd8 100644 --- a/Essentials/src/messages_da.properties +++ b/Essentials/src/messages_da.properties @@ -527,3 +527,4 @@ mobDataList=\u00a76Valid mob data\:\u00a7r {0} vanish=\u00a76Vanish for {0}\u00a76\: {1} noLocationFound=\u00a74No valid location found. coordsKeyword={0}, {1}, {2} +ignoreExempt=\u00a74You can not ignore that player. diff --git a/Essentials/src/messages_de.properties b/Essentials/src/messages_de.properties index 5e4833677..abd5ec750 100644 --- a/Essentials/src/messages_de.properties +++ b/Essentials/src/messages_de.properties @@ -527,3 +527,4 @@ mobDataList=\u00a76Valid mob data\:\u00a7r {0} vanish=\u00a76Vanish for {0}\u00a76\: {1} noLocationFound=\u00a74No valid location found. coordsKeyword={0}, {1}, {2} +ignoreExempt=\u00a74You can not ignore that player. diff --git a/Essentials/src/messages_en.properties b/Essentials/src/messages_en.properties index 47bb95b7f..4dece7404 100644 --- a/Essentials/src/messages_en.properties +++ b/Essentials/src/messages_en.properties @@ -527,3 +527,4 @@ mobDataList=\u00a76Valid mob data\:\u00a7r {0} vanish=\u00a76Vanish for {0}\u00a76\: {1} noLocationFound=\u00a74No valid location found. coordsKeyword={0}, {1}, {2} +ignoreExempt=\u00a74You can not ignore that player. diff --git a/Essentials/src/messages_es.properties b/Essentials/src/messages_es.properties index 69869710d..b4ab85a7e 100644 --- a/Essentials/src/messages_es.properties +++ b/Essentials/src/messages_es.properties @@ -527,3 +527,4 @@ mobDataList=\u00a76Valid mob data\:\u00a7r {0} vanish=\u00a76Vanish for {0}\u00a76\: {1} noLocationFound=\u00a74No valid location found. coordsKeyword={0}, {1}, {2} +ignoreExempt=\u00a74You can not ignore that player. diff --git a/Essentials/src/messages_fi.properties b/Essentials/src/messages_fi.properties index 99d0eed9a..c106dad10 100644 --- a/Essentials/src/messages_fi.properties +++ b/Essentials/src/messages_fi.properties @@ -527,3 +527,4 @@ mobDataList=\u00a76Valid mob data\:\u00a7r {0} vanish=\u00a76Vanish for {0}\u00a76\: {1} noLocationFound=\u00a74No valid location found. coordsKeyword={0}, {1}, {2} +ignoreExempt=\u00a74You can not ignore that player. diff --git a/Essentials/src/messages_fr.properties b/Essentials/src/messages_fr.properties index 6bcf37492..f99b87c5d 100644 --- a/Essentials/src/messages_fr.properties +++ b/Essentials/src/messages_fr.properties @@ -527,3 +527,4 @@ mobDataList=\u00a76Valid mob data\:\u00a7r {0} vanish=\u00a76Vanish for {0}\u00a76\: {1} noLocationFound=\u00a74No valid location found. coordsKeyword={0}, {1}, {2} +ignoreExempt=\u00a74You can not ignore that player. diff --git a/Essentials/src/messages_it.properties b/Essentials/src/messages_it.properties index a0b7c0b6c..d9d7fa2eb 100644 --- a/Essentials/src/messages_it.properties +++ b/Essentials/src/messages_it.properties @@ -527,3 +527,4 @@ mobDataList=\u00a76Valid mob data\:\u00a7r {0} vanish=\u00a76Vanish for {0}\u00a76\: {1} noLocationFound=\u00a74No valid location found. coordsKeyword={0}, {1}, {2} +ignoreExempt=\u00a74You can not ignore that player. diff --git a/Essentials/src/messages_nl.properties b/Essentials/src/messages_nl.properties index 8ae792b04..7c4f53beb 100644 --- a/Essentials/src/messages_nl.properties +++ b/Essentials/src/messages_nl.properties @@ -527,3 +527,4 @@ mobDataList=\u00a76Valid mob data\:\u00a7r {0} vanish=\u00a76Vanish for {0}\u00a76\: {1} noLocationFound=\u00a74No valid location found. coordsKeyword={0}, {1}, {2} +ignoreExempt=\u00a74You can not ignore that player. diff --git a/Essentials/src/messages_pl.properties b/Essentials/src/messages_pl.properties index 1d57800f0..094e57f80 100644 --- a/Essentials/src/messages_pl.properties +++ b/Essentials/src/messages_pl.properties @@ -527,3 +527,4 @@ mobDataList=\u00a76Valid mob data\:\u00a7r {0} vanish=\u00a76Vanish for {0}\u00a76\: {1} noLocationFound=\u00a74No valid location found. coordsKeyword={0}, {1}, {2} +ignoreExempt=\u00a74You can not ignore that player. diff --git a/Essentials/src/messages_pt.properties b/Essentials/src/messages_pt.properties index 78cf6fff7..96e296d57 100644 --- a/Essentials/src/messages_pt.properties +++ b/Essentials/src/messages_pt.properties @@ -527,3 +527,4 @@ mobDataList=\u00a76Valid mob data\:\u00a7r {0} vanish=\u00a76Vanish for {0}\u00a76\: {1} noLocationFound=\u00a74No valid location found. coordsKeyword={0}, {1}, {2} +ignoreExempt=\u00a74You can not ignore that player. diff --git a/Essentials/src/messages_ro.properties b/Essentials/src/messages_ro.properties index 5483cd581..0ada0380f 100644 --- a/Essentials/src/messages_ro.properties +++ b/Essentials/src/messages_ro.properties @@ -527,3 +527,4 @@ mobDataList=\u00a76Valid mob data\:\u00a7r {0} vanish=\u00a76Vanish for {0}\u00a76\: {1} noLocationFound=\u00a74No valid location found. coordsKeyword={0}, {1}, {2} +ignoreExempt=\u00a74You can not ignore that player. diff --git a/Essentials/src/messages_ru.properties b/Essentials/src/messages_ru.properties index 684b5f4fb..e0ae77f42 100644 --- a/Essentials/src/messages_ru.properties +++ b/Essentials/src/messages_ru.properties @@ -527,3 +527,4 @@ mobDataList=\u00a76Valid mob data\:\u00a7r {0} vanish=\u00a76Vanish for {0}\u00a76\: {1} noLocationFound=\u00a74No valid location found. coordsKeyword={0}, {1}, {2} +ignoreExempt=\u00a74You can not ignore that player. diff --git a/Essentials/src/messages_sv.properties b/Essentials/src/messages_sv.properties index 9b69cece5..4ab070c54 100644 --- a/Essentials/src/messages_sv.properties +++ b/Essentials/src/messages_sv.properties @@ -527,3 +527,4 @@ mobDataList=\u00a76Valid mob data\:\u00a7r {0} vanish=\u00a76Vanish for {0}\u00a76\: {1} noLocationFound=\u00a74No valid location found. coordsKeyword={0}, {1}, {2} +ignoreExempt=\u00a74You can not ignore that player. diff --git a/Essentials/src/messages_zh.properties b/Essentials/src/messages_zh.properties index 59ecca848..633ef22a7 100644 --- a/Essentials/src/messages_zh.properties +++ b/Essentials/src/messages_zh.properties @@ -527,3 +527,4 @@ mobDataList=\u00a76Valid mob data\:\u00a7r {0} vanish=\u00a76Vanish for {0}\u00a76\: {1} noLocationFound=\u00a74No valid location found. coordsKeyword={0}, {1}, {2} +ignoreExempt=\u00a74You can not ignore that player. diff --git a/Essentials/src/messages_zh_HK.properties b/Essentials/src/messages_zh_HK.properties index d5b7800fc..9843c7cd5 100644 --- a/Essentials/src/messages_zh_HK.properties +++ b/Essentials/src/messages_zh_HK.properties @@ -527,3 +527,4 @@ mobDataList=\u00a76Valid mob data\:\u00a7r {0} vanish=\u00a76Vanish for {0}\u00a76\: {1} noLocationFound=\u00a74No valid location found. coordsKeyword={0}, {1}, {2} +ignoreExempt=\u00a74You can not ignore that player. diff --git a/Essentials/src/messages_zh_TW.properties b/Essentials/src/messages_zh_TW.properties index de9a9de31..c1caffc08 100644 --- a/Essentials/src/messages_zh_TW.properties +++ b/Essentials/src/messages_zh_TW.properties @@ -527,3 +527,4 @@ mobDataList=\u00a76Valid mob data\:\u00a7r {0} vanish=\u00a76Vanish for {0}\u00a76\: {1} noLocationFound=\u00a74No valid location found. coordsKeyword={0}, {1}, {2} +ignoreExempt=\u00a74You can not ignore that player. diff --git a/Essentials/src/plugin.yml b/Essentials/src/plugin.yml index e6494ab1d..e647542ba 100644 --- a/Essentials/src/plugin.yml +++ b/Essentials/src/plugin.yml @@ -167,9 +167,9 @@ commands: usage: / [player:][name] aliases: [ehome,homes,ehomes] ignore: - description: Ignore other players. + description: Ignore or unignore other players. usage: / - aliases: [eignore] + aliases: [eignore,unignore,eunignore,delignore,edelignore,remignore,eremignore,rmignore,ermignore] info: description: Shows information set by the server owner. usage: / [chapter] [page]