summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStreusel <advance_me@hotmail.de>2013-02-18 17:58:43 -0800
committerStreusel <advance_me@hotmail.de>2013-02-18 17:58:43 -0800
commit389695ac4c70f67771a6b58ffd29892639996170 (patch)
tree3a69a958cc2363d4aca7d16bc702e9d99518c0e8
parentc6882c741f314f633e681066adb018738e5bb585 (diff)
parent9c32aa600de9dc10a91d0d96f312a95757998e15 (diff)
downloadhercules-389695ac4c70f67771a6b58ffd29892639996170.tar.gz
hercules-389695ac4c70f67771a6b58ffd29892639996170.tar.bz2
hercules-389695ac4c70f67771a6b58ffd29892639996170.tar.xz
hercules-389695ac4c70f67771a6b58ffd29892639996170.zip
Merge branch 'master' of github.com:HerculesWS/Hercules
-rw-r--r--src/map/atcommand.c5
-rw-r--r--src/map/mob.c6
2 files changed, 5 insertions, 6 deletions
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index ed42fdad4..0d56ce9bf 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -5671,12 +5671,11 @@ ACMD_FUNC(autotrade)
}
sd->state.autotrade = 1;
- if( battle_config.at_timeout )
- {
+ if( battle_config.at_timeout ) {
int timeout = atoi(message);
status_change_start(&sd->bl, SC_AUTOTRADE, 10000, 0, 0, 0, 0, ((timeout > 0) ? min(timeout,battle_config.at_timeout) : battle_config.at_timeout) * 60000, 0);
}
- clif_authfail_fd(fd, 15);
+ clif_authfail_fd(sd->fd, 15);
return 0;
}
diff --git a/src/map/mob.c b/src/map/mob.c
index e7d36d6b9..96c27cf4e 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -113,9 +113,9 @@ int mobdb_searchname(const char *str)
static int mobdb_searchname_array_sub(struct mob_db* mob, const char *str)
{
if (mob == mob_dummy)
- return 1; //Invalid mob.
- if(!mob->base_exp && !mob->job_exp)
- return 1; //Discount slave-mobs (no exp) as requested by Playtester. [Skotlex]
+ return 1;
+ if(!mob->base_exp && !mob->job_exp && mob->spawn[0].qty < 1)
+ return 1; // Monsters with no base/job exp and no spawn point are, by this criteria, considered "slave mobs" and excluded from search results
if(stristr(mob->jname,str))
return 0;
if(stristr(mob->name,str))