|
From: Crossfire C. r. messages.
<cro...@li...> - 2020-11-22 10:44:50
|
Revision: 21559
http://sourceforge.net/p/crossfire/code/21559
Author: akirschbaum
Date: 2020-11-22 10:44:47 +0000 (Sun, 22 Nov 2020)
Log Message:
-----------
Report correct command names in error messages for "issue take" or "issue drop" script commands
Modified Paths:
--------------
jxclient/trunk/ChangeLog
jxclient/trunk/src/gui/src/main/java/com/realtime/crossfire/jxclient/scripts/AbstractScriptProcess.java
Modified: jxclient/trunk/ChangeLog
===================================================================
--- jxclient/trunk/ChangeLog 2020-11-22 10:44:29 UTC (rev 21558)
+++ jxclient/trunk/ChangeLog 2020-11-22 10:44:47 UTC (rev 21559)
@@ -1,3 +1,8 @@
+2020-11-22 Andreas Kirschbaum
+
+ * Report correct command names in error messages for "issue take"
+ or "issue drop" script commands.
+
2020-09-15 Andreas Kirschbaum
* Fix possible NullPointerException with --debug-gui.
Modified: jxclient/trunk/src/gui/src/main/java/com/realtime/crossfire/jxclient/scripts/AbstractScriptProcess.java
===================================================================
--- jxclient/trunk/src/gui/src/main/java/com/realtime/crossfire/jxclient/scripts/AbstractScriptProcess.java 2020-11-22 10:44:29 UTC (rev 21558)
+++ jxclient/trunk/src/gui/src/main/java/com/realtime/crossfire/jxclient/scripts/AbstractScriptProcess.java 2020-11-22 10:44:47 UTC (rev 21559)
@@ -587,14 +587,16 @@
}
/**
- * Processes a "issue move" command from the script process.
+ * Processes an "issue take" or "issue drop" command from the script
+ * process.
* @param params the command arguments
* @param destTag the destination tag to move to
+ * @param commandName the command name for error messages
*/
- private void cmdIssueMove(@NotNull final String params, final int destTag) {
+ private void cmdIssueMove(@NotNull final String params, final int destTag, @NotNull final String commandName) {
final String[] tmp = params.split(" +", 2);
if (tmp.length != 1 && tmp.length != 2) {
- reportError("syntax error: issue move "+params);
+ reportError("syntax error: issue "+commandName+" "+params);
return;
}
final int tag;
@@ -603,7 +605,7 @@
tag = Integer.parseInt(tmp[0]);
count = tmp.length < 2 ? 0 : Integer.parseInt(tmp[1]);
} catch (final NumberFormatException ignored) {
- reportError("syntax error: issue move "+params);
+ reportError("syntax error: issue "+commandName+" "+params);
return;
}
crossfireServerConnection.sendMove(destTag, tag, count);
@@ -730,9 +732,9 @@
} else if (tmp[1].startsWith("lock ")) {
cmdIssueLock(tmp[1].substring(5));
} else if (tmp[1].startsWith("take ")) {
- cmdIssueMove(tmp[1].substring(5), itemSet.getPlayer().getTag());
+ cmdIssueMove(tmp[1].substring(5), itemSet.getPlayer().getTag(), "take");
} else if (tmp[1].startsWith("drop ")) {
- cmdIssueMove(tmp[1].substring(5), 0);
+ cmdIssueMove(tmp[1].substring(5), 0, "drop");
} else if (tmp[1].startsWith("apply ")) {
cmdIssueApply(tmp[1].substring(6));
} else {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|