EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-22 13:16:45 +01:00
Code Issues Projects Releases Wiki Activity

small changes to flags

Browse Source 
- flag key should be only alphabetic characters
- flags should be case insensitive
This commit is contained in:
boy0001 2014-09-24 10:56:03 +10:00
parent 29d77320c3
commit f8e096a02b
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
PlotSquared/src/com/intellectualcrafters/plot/AbstractFlag.java
View File

@ -1,5 +1,7 @@
package com.intellectualcrafters.plot; package com.intellectualcrafters.plot;
import org.apache.commons.lang.StringUtils;
/** /**
* Created by Citymonstret on 2014-09-23. * Created by Citymonstret on 2014-09-23.
*/ */
@ -8,7 +10,11 @@ public class AbstractFlag {
private final String key; private final String key;
public AbstractFlag(String key) { public AbstractFlag(String key) {
this.key = key; if (!StringUtils.isAlpha(key))
throw new IllegalArgumentException("Flag must be alphabetic characters");
if (key.length()>16)
throw new IllegalArgumentException("Key must be <= 16 characters");
this.key = key.toLowerCase();
} }
public String getKey() { public String getKey() {

6
PlotSquared/src/com/intellectualcrafters/plot/Flag.java
View File

@ -7,10 +7,8 @@ public class Flag {
private AbstractFlag key; private AbstractFlag key;
private String value; private String value;
public Flag(AbstractFlag key, String value) { public Flag(AbstractFlag key, String value) {
if (!StringUtils.isAlphanumeric(ChatColor.stripColor(value).replace(" ", ""))) if (!StringUtils.isAlphanumericSpace(ChatColor.stripColor(value)))
throw new IllegalArgumentException("Flag must be alphanumerical"); throw new IllegalArgumentException("Flag must be alphanumerical");
/*if (key.length()>16)
throw new IllegalArgumentException("Key must be <= 16 characters");*/
if (value.length()>48) if (value.length()>48)
throw new IllegalArgumentException("Value must be <= 48 characters"); throw new IllegalArgumentException("Value must be <= 48 characters");
this.key = key; this.key = key;
@ -39,7 +37,7 @@ public class Flag {
if (getClass() != obj.getClass()) if (getClass() != obj.getClass())
return false; return false;
Flag other = (Flag) obj; Flag other = (Flag) obj;
return (this.key==other.key && this.value == other.value); return (this.key.getKey().equals(other.key.getKey()) && this.value.equals(other.value));
} }
@Override @Override
public int hashCode() { public int hashCode() {

2
PlotSquared/src/com/intellectualcrafters/plot/commands/Set.java
View File

@ -119,7 +119,7 @@ public class Set extends SubCommand{
} }
try { try {
String value = StringUtils.join(Arrays.copyOfRange(args, 2, args.length)," "); String value = StringUtils.join(Arrays.copyOfRange(args, 2, args.length)," ");
Flag flag = new Flag(args[1], value); Flag flag = new Flag(new AbstractFlag(args[1]), value);
PlotFlagAddEvent event = new PlotFlagAddEvent(flag,plot); PlotFlagAddEvent event = new PlotFlagAddEvent(flag,plot);
Bukkit.getServer().getPluginManager().callEvent(event); Bukkit.getServer().getPluginManager().callEvent(event);
if(event.isCancelled()) { if(event.isCancelled()) {