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

Changed the basecommand to throw a DisguiseParseException instead of IllegalArguementException

Browse Source
This commit is contained in:
libraryaddict
2014-09-17 03:41:04 +12:00
parent 6ebb341788
commit ae221d8f25
5 changed files with 62 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/me/libraryaddict/disguise/commands/DisguiseCommand.java
View File

@@ -27,13 +27,14 @@ public class DisguiseCommand extends BaseDisguiseCommand {
Disguise disguise;
try {
disguise = parseDisguise(sender, args, getPermissions(sender));
} catch (Exception ex) {
if (ex.getMessage() != null && !ChatColor.getLastColors(ex.getMessage()).equals("")) {
} catch (DisguiseParseException ex) {
if (ex.getMessage() != null) {
sender.sendMessage(ex.getMessage());
} else {
ex.printStackTrace();
}
return true;
} catch (Exception ex) {
ex.printStackTrace();
return true;
}
if (DisguiseConfig.isNameOfPlayerShownAboveDisguise()) {
if (disguise.getWatcher() instanceof LivingWatcher) {

10
src/me/libraryaddict/disguise/commands/DisguiseEntityCommand.java
View File

@@ -8,7 +8,6 @@ import me.libraryaddict.disguise.DisguiseListener;
import me.libraryaddict.disguise.disguisetypes.Disguise;
import me.libraryaddict.disguise.disguisetypes.DisguiseType;
import me.libraryaddict.disguise.utilities.BaseDisguiseCommand;
import org.apache.commons.lang.StringUtils;
import org.bukkit.ChatColor;
import org.bukkit.command.Command;
@@ -31,13 +30,14 @@ public class DisguiseEntityCommand extends BaseDisguiseCommand {
Disguise disguise;
try {
disguise = parseDisguise(sender, args, getPermissions(sender));
} catch (Exception ex) {
if (ex.getMessage() != null && !ChatColor.getLastColors(ex.getMessage()).equals("")) {
} catch (DisguiseParseException ex) {
if (ex.getMessage() != null) {
sender.sendMessage(ex.getMessage());
} else {
ex.printStackTrace();
}
return true;
} catch (Exception ex) {
ex.printStackTrace();
return true;
}
listener.setDisguiseEntity(sender.getName(), disguise);
sender.sendMessage(ChatColor.RED + "Right click a entity in the next " + DisguiseConfig.getDisguiseEntityExpire()

10
src/me/libraryaddict/disguise/commands/DisguisePlayerCommand.java
View File

@@ -9,7 +9,6 @@ import me.libraryaddict.disguise.disguisetypes.Disguise;
import me.libraryaddict.disguise.disguisetypes.DisguiseType;
import me.libraryaddict.disguise.disguisetypes.watchers.LivingWatcher;
import me.libraryaddict.disguise.utilities.BaseDisguiseCommand;
import org.apache.commons.lang.StringUtils;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
@@ -44,13 +43,14 @@ public class DisguisePlayerCommand extends BaseDisguiseCommand {
Disguise disguise;
try {
disguise = parseDisguise(sender, newArgs, map);
} catch (Exception ex) {
if (ex.getMessage() != null && !ChatColor.getLastColors(ex.getMessage()).equals("")) {
} catch (DisguiseParseException ex) {
if (ex.getMessage() != null) {
sender.sendMessage(ex.getMessage());
} else {
ex.printStackTrace();
}
return true;
} catch (Exception ex) {
ex.printStackTrace();
return true;
}
if (disguise.isMiscDisguise() && !DisguiseConfig.isMiscDisguisesForLivingEnabled()) {
sender.sendMessage(ChatColor.RED

10
src/me/libraryaddict/disguise/commands/DisguiseRadiusCommand.java
View File

@@ -11,7 +11,6 @@ import me.libraryaddict.disguise.disguisetypes.DisguiseType;
import me.libraryaddict.disguise.disguisetypes.watchers.LivingWatcher;
import me.libraryaddict.disguise.utilities.BaseDisguiseCommand;
import me.libraryaddict.disguise.utilities.ClassGetter;
import org.apache.commons.lang.StringUtils;
import org.bukkit.ChatColor;
import org.bukkit.command.Command;
@@ -100,13 +99,14 @@ public class DisguiseRadiusCommand extends BaseDisguiseCommand {
Disguise disguise;
try {
disguise = parseDisguise(sender, newArgs, map);
} catch (Exception ex) {
if (ex.getMessage() != null && !ChatColor.getLastColors(ex.getMessage()).equals("")) {
} catch (DisguiseParseException ex) {
if (ex.getMessage() != null) {
sender.sendMessage(ex.getMessage());
} else {
ex.printStackTrace();
}
return true;
} catch (Exception ex) {
ex.printStackTrace();
return true;
} // Time to use it!
int disguisedEntitys = 0;
int miscDisguises = 0;