summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/map/atcommand.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 5a8122825..f98b04347 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -3,6 +3,7 @@ Date Added
AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/04/27
+ * Small change in @commands, may fix the null-pointer error. [Skotlex]
* Changebase script command will also refresh the weapon sprites (in case
you changed into Wedding/Xmas class) [Skotlex]
* Small change in the pet_ai that should stop the "strange" catch-up
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 804193130..6a2bccf3b 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -1173,7 +1173,7 @@ int atcommand_commands(const int fd, struct map_session_data* sd,
clif_displaymessage(fd, msg_txt(273));
memset(atcmd_output, 0, sizeof atcmd_output);
for (i = 0; atcommand_info[i].type != AtCommand_None; i++)
- if (atcommand_info[i].level <= level) {
+ if (atcommand_info[i].level <= level && atcommand_info[i].command) {
count++;
strcat(atcmd_output, atcommand_info[i].command);
strcat(atcmd_output, " ");