Clarify message when ignoring exempt players.

khobbits · khobbits · commit 7436009ea4af · 2013-10-27T23:53:24.000Z
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandignore.java b/Essentials/src/com/earth2me/essentials/commands/Commandignore.java
@@ -40,7 +40,10 @@ protected void run(final Server server, final User user, final String commandLab
 			{
 				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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -167,9 +167,9 @@ commands:
     usage: /<command> [player:][name]
     aliases: [ehome,homes,ehomes]
   ignore:
-    description: Ignore other players.
+    description: Ignore or unignore other players.
     usage: /<command> <player>
-    aliases: [eignore]
+    aliases: [eignore,unignore,eunignore,delignore,edelignore,remignore,eremignore,rmignore,ermignore]
   info:
     description: Shows information set by the server owner.
     usage: /<command> [chapter] [page]

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,10 @@ protected void run(final Server server, final User user, final String commandLab`
`40`	`40`	`{`
`41`	`41`	`throw new PlayerNotFoundException();`
`42`	`42`	`}`
`43`		`- if (user.isIgnoredPlayer(player))`
	`43`	`+ if (player.isIgnoreExempt()) {`
	`44`	`+ user.sendMessage(_("ignoreExempt"));`
	`45`	`+ }`
	`46`	`+ else if (user.isIgnoredPlayer(player))`
`44`	`47`	`{`
`45`	`48`	`user.setIgnoredPlayer(player, false);`
`46`	`49`	`user.sendMessage(_("unignorePlayer", player.getName()));`