diff options
| author | Paul A. <ementalodev@gmx.co.uk> | 2013-04-04 13:52:12 -0700 |
|---|---|---|
| committer | Paul A. <ementalodev@gmx.co.uk> | 2013-04-04 13:52:12 -0700 |
| commit | 39652d9985ab57ac91f7c8254eafa1e62364d358 (patch) | |
| tree | 5e26066d49225efc085f8fc443a415f5b53789f8 | |
| parent | d377c5cae7f3dd2187f8cd88b3c61c5f176e0ed2 (diff) | |
| parent | d64621161369d7755d830dccb3872180e9f43caf (diff) | |
| download | Essentials-39652d9985ab57ac91f7c8254eafa1e62364d358.tar Essentials-39652d9985ab57ac91f7c8254eafa1e62364d358.tar.gz Essentials-39652d9985ab57ac91f7c8254eafa1e62364d358.tar.lz Essentials-39652d9985ab57ac91f7c8254eafa1e62364d358.tar.xz Essentials-39652d9985ab57ac91f7c8254eafa1e62364d358.zip | |
Merge pull request #437 from Riaku/master
regex Check on banip
essentials.repair.all permission node
| -rw-r--r-- | Essentials/src/messages.properties | 1 | ||||
| -rw-r--r-- | Essentials/src/net/ess3/commands/Commandbanip.java | 11 | ||||
| -rw-r--r-- | Essentials/src/net/ess3/commands/Commandrepair.java | 2 | ||||
| -rw-r--r-- | Essentials/src/net/ess3/permissions/Permissions.java | 1 |
4 files changed, 12 insertions, 3 deletions
diff --git a/Essentials/src/messages.properties b/Essentials/src/messages.properties index ea55baaf7..45c6a2e41 100644 --- a/Essentials/src/messages.properties +++ b/Essentials/src/messages.properties @@ -505,5 +505,6 @@ recipeGrid=\u00a7{0}X \u00a76| \u00a7{1}X \u00a76| \u00a7{2}X recipeGridItem=\ \u00a7{0}X \u00a76is \u00a7c{1} recipeMore=\u00a76Type /{0} \u00a7c{1}\u00a76 <number> to see other recipes for \u00a7c{2} recipeWhere=\u00a76Where: {0} +invalidIpAddress=\u00a74Invalid IP address #, java-format Hello\ {0},\ how\ are\ you?=\u00a7fHello \u00a74{0}\u00a7f, how are you? diff --git a/Essentials/src/net/ess3/commands/Commandbanip.java b/Essentials/src/net/ess3/commands/Commandbanip.java index a7f66016b..f08d08843 100644 --- a/Essentials/src/net/ess3/commands/Commandbanip.java +++ b/Essentials/src/net/ess3/commands/Commandbanip.java @@ -19,8 +19,15 @@ public class Commandbanip extends EssentialsCommand if (player == null) { - ess.getServer().banIP(args[0]); - sender.sendMessage(_("banIpAddress")); + if(args[0].matches("\\b(?:\\d{1,3}\\.){3}\\d{1,3}\\b")) + { + ess.getServer().banIP(args[0]); + sender.sendMessage(_("banIpAddress")); + } + else + { + sender.sendMessage(_("invalidIpAddress")); + } } else { diff --git a/Essentials/src/net/ess3/commands/Commandrepair.java b/Essentials/src/net/ess3/commands/Commandrepair.java index 54293aef4..a5fc2f04a 100644 --- a/Essentials/src/net/ess3/commands/Commandrepair.java +++ b/Essentials/src/net/ess3/commands/Commandrepair.java @@ -47,7 +47,7 @@ public class Commandrepair extends EssentialsCommand user.sendMessage(_("repair", itemName.replace('_', ' '))); } - else if (args[0].equalsIgnoreCase("all")) + else if (args[0].equalsIgnoreCase("all") && Permissions.REPAIR_ALL.isAuthorized(user)) { final Trade charge = new Trade("repair-all", ess); charge.isAffordableFor(user); diff --git a/Essentials/src/net/ess3/permissions/Permissions.java b/Essentials/src/net/ess3/permissions/Permissions.java index aeea976ae..2ae61391f 100644 --- a/Essentials/src/net/ess3/permissions/Permissions.java +++ b/Essentials/src/net/ess3/permissions/Permissions.java @@ -84,6 +84,7 @@ public enum Permissions implements IPermission POWERTOOL_APPEND, PTIME_OTHERS, PVPDELAY_EXEMPT, + REPAIR_ALL, REPAIR_ARMOR, REPAIR_ENCHANTED, SEEN_BANREASON, |