From c1e39c7007923b6ad8da1edd473cdd4811a15160 Mon Sep 17 00:00:00 2001 From: KHobbits Date: Fri, 19 Jul 2013 02:25:50 +0100 Subject: [PATCH] Show if a IP is ip-banned on /seen --- .../com/earth2me/essentials/commands/Commandseen.java | 10 ++++++++++ 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_sv.properties | 1 + Essentials/src/messages_zh.properties | 1 + Essentials/src/messages_zh_HK.properties | 1 + Essentials/src/messages_zh_TW.properties | 1 + 18 files changed, 27 insertions(+) diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandseen.java b/Essentials/src/com/earth2me/essentials/commands/Commandseen.java index 2bf8c4081..da041d844 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandseen.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandseen.java @@ -54,6 +54,10 @@ public class Commandseen extends EssentialsCommand seenIP(server, sender, args[0]); return; } + else if (FormatUtil.validIP(args[0]) && (server.getIPBans().contains(args[0]))) { + sender.sendMessage(_("isIpBanned", args[0])); + return; + } else { throw new PlayerNotFoundException(); @@ -132,6 +136,12 @@ public class Commandseen extends EssentialsCommand private void seenIP(final Server server, final CommandSender sender, final String ipAddress) throws Exception { final UserMap userMap = ess.getUserMap(); + + if (server.getIPBans().contains(ipAddress)) + { + sender.sendMessage(_("isIpBanned", ipAddress)); + } + sender.sendMessage(_("runningPlayerMatch", ipAddress)); ess.runTaskAsynchronously(new Runnable() diff --git a/Essentials/src/messages.properties b/Essentials/src/messages.properties index 94a87b453..335d096bb 100644 --- a/Essentials/src/messages.properties +++ b/Essentials/src/messages.properties @@ -522,3 +522,4 @@ localNoOne= totalSellableAll=\u00a7aThe total worth of all sellable items and blocks is \u00a7c{1}\u00a7a. totalSellableBlocks=\u00a7aThe total worth of all sellable blocks is \u00a7c{1}\u00a7a. radiusTooBig=\u00a74Radius is too big! Maximum radius is {0}. +isIpBanned=\u00a76IP \u00a7c{0} \u00a76is banned. diff --git a/Essentials/src/messages_cs.properties b/Essentials/src/messages_cs.properties index 6c5d8d56c..37b046381 100644 --- a/Essentials/src/messages_cs.properties +++ b/Essentials/src/messages_cs.properties @@ -527,3 +527,4 @@ localNoOne= totalSellableAll=\u00a7aThe total worth of all sellable items and blocks is \u00a7c{1}\u00a7a. totalSellableBlocks=\u00a7aThe total worth of all sellable blocks is \u00a7c{1}\u00a7a. radiusTooBig=\u00a74Radius is too big! Maximum radius is {0}. +isIpBanned=\u00a76IP \u00a7c{0} \u00a76is banned. diff --git a/Essentials/src/messages_da.properties b/Essentials/src/messages_da.properties index 3eb0eab75..037f1e77e 100644 --- a/Essentials/src/messages_da.properties +++ b/Essentials/src/messages_da.properties @@ -522,3 +522,4 @@ localNoOne= totalSellableAll=\u00a7aThe total worth of all sellable items and blocks is \u00a7c{1}\u00a7a. totalSellableBlocks=\u00a7aThe total worth of all sellable blocks is \u00a7c{1}\u00a7a. radiusTooBig=\u00a74Radius is too big! Maximum radius is {0}. +isIpBanned=\u00a76IP \u00a7c{0} \u00a76is banned. diff --git a/Essentials/src/messages_de.properties b/Essentials/src/messages_de.properties index eb1a8ac03..6422d9b62 100644 --- a/Essentials/src/messages_de.properties +++ b/Essentials/src/messages_de.properties @@ -522,3 +522,4 @@ localNoOne= totalSellableAll=\u00a7aThe total worth of all sellable items and blocks is \u00a7c{1}\u00a7a. totalSellableBlocks=\u00a7aThe total worth of all sellable blocks is \u00a7c{1}\u00a7a. radiusTooBig=\u00a74Radius is too big! Maximum radius is {0}. +isIpBanned=\u00a76IP \u00a7c{0} \u00a76is banned. diff --git a/Essentials/src/messages_en.properties b/Essentials/src/messages_en.properties index 94a87b453..335d096bb 100644 --- a/Essentials/src/messages_en.properties +++ b/Essentials/src/messages_en.properties @@ -522,3 +522,4 @@ localNoOne= totalSellableAll=\u00a7aThe total worth of all sellable items and blocks is \u00a7c{1}\u00a7a. totalSellableBlocks=\u00a7aThe total worth of all sellable blocks is \u00a7c{1}\u00a7a. radiusTooBig=\u00a74Radius is too big! Maximum radius is {0}. +isIpBanned=\u00a76IP \u00a7c{0} \u00a76is banned. diff --git a/Essentials/src/messages_es.properties b/Essentials/src/messages_es.properties index 500b955a2..ccd303a6d 100644 --- a/Essentials/src/messages_es.properties +++ b/Essentials/src/messages_es.properties @@ -522,3 +522,4 @@ localNoOne= totalSellableAll=\u00a7aThe total worth of all sellable items and blocks is \u00a7c{1}\u00a7a. totalSellableBlocks=\u00a7aThe total worth of all sellable blocks is \u00a7c{1}\u00a7a. radiusTooBig=\u00a74Radius is too big! Maximum radius is {0}. +isIpBanned=\u00a76IP \u00a7c{0} \u00a76is banned. diff --git a/Essentials/src/messages_fi.properties b/Essentials/src/messages_fi.properties index fb71a715b..6a58c97cf 100644 --- a/Essentials/src/messages_fi.properties +++ b/Essentials/src/messages_fi.properties @@ -522,3 +522,4 @@ localNoOne= totalSellableAll=\u00a7aThe total worth of all sellable items and blocks is \u00a7c{1}\u00a7a. totalSellableBlocks=\u00a7aThe total worth of all sellable blocks is \u00a7c{1}\u00a7a. radiusTooBig=\u00a74Radius is too big! Maximum radius is {0}. +isIpBanned=\u00a76IP \u00a7c{0} \u00a76is banned. diff --git a/Essentials/src/messages_fr.properties b/Essentials/src/messages_fr.properties index 2e5a98c37..10c957b99 100644 --- a/Essentials/src/messages_fr.properties +++ b/Essentials/src/messages_fr.properties @@ -522,3 +522,4 @@ localNoOne= totalSellableAll=\u00a7aThe total worth of all sellable items and blocks is \u00a7c{1}\u00a7a. totalSellableBlocks=\u00a7aThe total worth of all sellable blocks is \u00a7c{1}\u00a7a. radiusTooBig=\u00a74Radius is too big! Maximum radius is {0}. +isIpBanned=\u00a76IP \u00a7c{0} \u00a76is banned. diff --git a/Essentials/src/messages_it.properties b/Essentials/src/messages_it.properties index 6f76ba3b7..63304925c 100644 --- a/Essentials/src/messages_it.properties +++ b/Essentials/src/messages_it.properties @@ -522,3 +522,4 @@ localNoOne= totalSellableAll=\u00a7aThe total worth of all sellable items and blocks is \u00a7c{1}\u00a7a. totalSellableBlocks=\u00a7aThe total worth of all sellable blocks is \u00a7c{1}\u00a7a. radiusTooBig=\u00a74Radius is too big! Maximum radius is {0}. +isIpBanned=\u00a76IP \u00a7c{0} \u00a76is banned. diff --git a/Essentials/src/messages_nl.properties b/Essentials/src/messages_nl.properties index 8287f826c..4832bb886 100644 --- a/Essentials/src/messages_nl.properties +++ b/Essentials/src/messages_nl.properties @@ -522,3 +522,4 @@ localNoOne= totalSellableAll=\u00a7aThe total worth of all sellable items and blocks is \u00a7c{1}\u00a7a. totalSellableBlocks=\u00a7aThe total worth of all sellable blocks is \u00a7c{1}\u00a7a. radiusTooBig=\u00a74Radius is too big! Maximum radius is {0}. +isIpBanned=\u00a76IP \u00a7c{0} \u00a76is banned. diff --git a/Essentials/src/messages_pl.properties b/Essentials/src/messages_pl.properties index ea64d414e..f966e5392 100644 --- a/Essentials/src/messages_pl.properties +++ b/Essentials/src/messages_pl.properties @@ -522,3 +522,4 @@ localNoOne= totalSellableAll=\u00a7aThe total worth of all sellable items and blocks is \u00a7c{1}\u00a7a. totalSellableBlocks=\u00a7aThe total worth of all sellable blocks is \u00a7c{1}\u00a7a. radiusTooBig=\u00a74Radius is too big! Maximum radius is {0}. +isIpBanned=\u00a76IP \u00a7c{0} \u00a76is banned. diff --git a/Essentials/src/messages_pt.properties b/Essentials/src/messages_pt.properties index 24b8edcb6..640e54777 100644 --- a/Essentials/src/messages_pt.properties +++ b/Essentials/src/messages_pt.properties @@ -522,3 +522,4 @@ localNoOne= totalSellableAll=\u00a7aThe total worth of all sellable items and blocks is \u00a7c{1}\u00a7a. totalSellableBlocks=\u00a7aThe total worth of all sellable blocks is \u00a7c{1}\u00a7a. radiusTooBig=\u00a74Radius is too big! Maximum radius is {0}. +isIpBanned=\u00a76IP \u00a7c{0} \u00a76is banned. diff --git a/Essentials/src/messages_ro.properties b/Essentials/src/messages_ro.properties index 229bfcacf..c1798a532 100644 --- a/Essentials/src/messages_ro.properties +++ b/Essentials/src/messages_ro.properties @@ -522,3 +522,4 @@ localNoOne= totalSellableAll=\u00a7aThe total worth of all sellable items and blocks is \u00a7c{1}\u00a7a. totalSellableBlocks=\u00a7aThe total worth of all sellable blocks is \u00a7c{1}\u00a7a. radiusTooBig=\u00a74Radius is too big! Maximum radius is {0}. +isIpBanned=\u00a76IP \u00a7c{0} \u00a76is banned. diff --git a/Essentials/src/messages_sv.properties b/Essentials/src/messages_sv.properties index 2cee31e95..ea8cf27d9 100644 --- a/Essentials/src/messages_sv.properties +++ b/Essentials/src/messages_sv.properties @@ -522,3 +522,4 @@ localNoOne= totalSellableAll=\u00a7aThe total worth of all sellable items and blocks is \u00a7c{1}\u00a7a. totalSellableBlocks=\u00a7aThe total worth of all sellable blocks is \u00a7c{1}\u00a7a. radiusTooBig=\u00a74Radius is too big! Maximum radius is {0}. +isIpBanned=\u00a76IP \u00a7c{0} \u00a76is banned. diff --git a/Essentials/src/messages_zh.properties b/Essentials/src/messages_zh.properties index eb0e7950f..c3046efd0 100644 --- a/Essentials/src/messages_zh.properties +++ b/Essentials/src/messages_zh.properties @@ -522,3 +522,4 @@ localNoOne= totalSellableAll=\u00a7aThe total worth of all sellable items and blocks is \u00a7c{1}\u00a7a. totalSellableBlocks=\u00a7aThe total worth of all sellable blocks is \u00a7c{1}\u00a7a. radiusTooBig=\u00a74Radius is too big! Maximum radius is {0}. +isIpBanned=\u00a76IP \u00a7c{0} \u00a76is banned. diff --git a/Essentials/src/messages_zh_HK.properties b/Essentials/src/messages_zh_HK.properties index 68aef0be5..b2bbfaf57 100644 --- a/Essentials/src/messages_zh_HK.properties +++ b/Essentials/src/messages_zh_HK.properties @@ -522,3 +522,4 @@ localNoOne= totalSellableAll=\u00a7aThe total worth of all sellable items and blocks is \u00a7c{1}\u00a7a. totalSellableBlocks=\u00a7aThe total worth of all sellable blocks is \u00a7c{1}\u00a7a. radiusTooBig=\u00a74Radius is too big! Maximum radius is {0}. +isIpBanned=\u00a76IP \u00a7c{0} \u00a76is banned. diff --git a/Essentials/src/messages_zh_TW.properties b/Essentials/src/messages_zh_TW.properties index f3a9cbce7..396a17999 100644 --- a/Essentials/src/messages_zh_TW.properties +++ b/Essentials/src/messages_zh_TW.properties @@ -522,3 +522,4 @@ localNoOne= totalSellableAll=\u00a7aThe total worth of all sellable items and blocks is \u00a7c{1}\u00a7a. totalSellableBlocks=\u00a7aThe total worth of all sellable blocks is \u00a7c{1}\u00a7a. radiusTooBig=\u00a74Radius is too big! Maximum radius is {0}. +isIpBanned=\u00a76IP \u00a7c{0} \u00a76is banned.