SpigotMC/LibsDisguises
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

If null is unexpected, throw error to more accurately inform player of malformed parameters

Browse Source
This commit is contained in:
libraryaddict
2018-10-24 10:10:35 +13:00
parent 4467075a35
commit 815b6f4c2f
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/me/libraryaddict/disguise/utilities/parser/params/ParamInfo.java
View File

@@ -47,12 +47,12 @@ public abstract class ParamInfo {
} }
} }
public ParamInfo(Class paramClass, String name, String description, Map<String,Object> possibleValues) { public ParamInfo(Class paramClass, String name, String description, Map<String, Object> possibleValues) {
this(paramClass, name, name, description, possibleValues); this(paramClass, name, name, description, possibleValues);
} }
public ParamInfo(Class paramClass, String name, String descriptiveName, String description, public ParamInfo(Class paramClass, String name, String descriptiveName, String description,
Map<String,Object> possibleValues) { Map<String, Object> possibleValues) {
this(paramClass, name, descriptiveName, description); this(paramClass, name, descriptiveName, description);
this.possibleValues = new HashMap<>(); this.possibleValues = new HashMap<>();
@@ -83,6 +83,11 @@ public abstract class ParamInfo {
Object value = fromString(string); Object value = fromString(string);
// Throw error if null wasn't expected
if (value == null && !canReturnNull()) {
throw new IllegalArgumentException();
}
arguments.remove(0); arguments.remove(0);
return value; return value;