Merge branch 'master' into translate

This commit is contained in:
libraryaddict 2017-06-13 14:20:46 +12:00
commit f4bc7ef3a4

@ -194,6 +194,9 @@ public class DisguiseParser {
return perm; return perm;
} }
if (name.equalsIgnoreCase("p"))
return getDisguisePerm("player");
return null; return null;
} }
@ -500,8 +503,6 @@ public class DisguiseParser {
if (customDisguise != null) { if (customDisguise != null) {
disguise = customDisguise.getValue().clone(); disguise = customDisguise.getValue().clone();
} else if (args[0].equalsIgnoreCase("p")) {
disguisePerm = new DisguisePerm(DisguiseType.PLAYER);
} }
if (disguisePerm == null) { if (disguisePerm == null) {