Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Modified @warp/@rura to prevent causing pc_setpos position error messages.

Browse Source 
- Fixed the mob's last_thinktime not being updated on mob_spawn, causing them to not "think".


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@5971 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
skotlex 2006-04-09 22:13:25 +00:00
parent 3851b1299d
commit 3954b070de
3 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Changelog-Trunk.txt
View File

@ -4,6 +4,10 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/04/09
* Modified @warp/@rura to prevent causing pc_setpos position error
messages. [Skotlex]
* Fixed the mob's last_thinktime not being updated on mob_spawn, causing
them to not "think". [Skotlex]
* Fixed @npcmove not sending the correct packets to make the moving refresh
client-side. [Skotlex]
* Fixed mobs with aggressive + looter mode never looting. [Skotlex]

39
src/map/atcommand.c
View File

@ -1236,11 +1236,6 @@ int atcommand_rura(
return -1;
}
if (x <= 0)
x = rand() % 399 + 1;
if (y <= 0)
y = rand() % 399 + 1;
if (strstr(map_name, ".gat") == NULL && strstr(map_name, ".afm") == NULL && strlen(map_name) < MAP_NAME_LENGTH-4) // 16 - 4 (.gat)
strcat(map_name, ".gat");
@ -1252,24 +1247,22 @@ int atcommand_rura(
clif_displaymessage(fd, msg_table[1]); // Map not found.
return -1;
}
if (x > 0 && x < 400 && y > 0 && y < 400) {
if (map[m].flag.nowarpto && battle_config.any_warp_GM_min_level > pc_isGM(sd)) {
clif_displaymessage(fd, msg_table[247]);
return -1;
}
if (sd->bl.m >= 0 && map[sd->bl.m].flag.nowarp && battle_config.any_warp_GM_min_level > pc_isGM(sd)) {
clif_displaymessage(fd, msg_table[248]);
return -1;
}
if (pc_setpos(sd, mapindex, x, y, 3) == 0)
clif_displaymessage(fd, msg_table[0]); // Warped.
else {
clif_displaymessage(fd, msg_table[1]); // Map not found.
return -1;
}
} else {
clif_displaymessage(fd, msg_table[2]); // Coordinates out of range.
if (map_getcell(m, x, y, CELL_CHKNOPASS))
x = y = 0; //Invalid cell, use random spot.
if (map[m].flag.nowarpto && battle_config.any_warp_GM_min_level > pc_isGM(sd)) {
clif_displaymessage(fd, msg_table[247]);
return -1;
}
if (sd->bl.m >= 0 && map[sd->bl.m].flag.nowarp && battle_config.any_warp_GM_min_level > pc_isGM(sd)) {
clif_displaymessage(fd, msg_table[248]);
return -1;
}
if (pc_setpos(sd, mapindex, x, y, 3) == 0)
clif_displaymessage(fd, msg_table[0]); // Warped.
else {
clif_displaymessage(fd, msg_table[1]); // Map not found.
return -1;
}

1
src/map/mob.c
View File

@ -650,6 +650,7 @@ int mob_spawn (struct mob_data *md)
unsigned int c =0, tick = gettick();
md->last_spawntime = tick;
md->last_thinktime = tick -MIN_MOBTHINKTIME;
if (md->bl.prev != NULL)
unit_remove_map(&md->bl,2);
else if (md->vd->class_ != md->class_) {