diff options
| author | shennetsind <ind@henn.et> | 2013-09-28 17:56:13 -0300 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-09-28 17:56:13 -0300 |
| commit | 37d72a1ea19ce6d2789add778c29d33d91342cb2 (patch) | |
| tree | e5a8303958dbbd9a029b996a89a996e0e4b55da6 /src | |
| parent | 62e6b7335c9bf0b30d5ca392c0c5dedbe2768dc9 (diff) | |
| parent | 00c26a4d1bdd19f8f0f2ce3e9d5fbd2a6b5a0ab4 (diff) | |
| download | hercules-37d72a1ea19ce6d2789add778c29d33d91342cb2.tar.gz hercules-37d72a1ea19ce6d2789add778c29d33d91342cb2.tar.bz2 hercules-37d72a1ea19ce6d2789add778c29d33d91342cb2.tar.xz hercules-37d72a1ea19ce6d2789add778c29d33d91342cb2.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src')
| -rw-r--r-- | src/map/map.c | 2 | ||||
| -rw-r--r-- | src/map/mob.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/map/map.c b/src/map/map.c index 0ffd1ee15..899f6b963 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -1597,7 +1597,7 @@ int map_quit(struct map_session_data *sd) { clif->chsys_quit(sd); - unit->remove_map_pc(sd,CLR_TELEPORT); + unit->remove_map_pc(sd,CLR_RESPAWN); if( maplist[sd->bl.m].instance_id >= 0 ) { // Avoid map conflicts and warnings on next login int16 m; diff --git a/src/map/mob.c b/src/map/mob.c index c97cbc5bb..7d04937e7 100644 --- a/src/map/mob.c +++ b/src/map/mob.c @@ -2781,7 +2781,7 @@ int mob_warpslave_sub(struct block_list *bl,va_list ap) { return 0; map->search_freecell(master, 0, &x, &y, range, range, 0); - unit->warp(&md->bl, master->m, x, y,CLR_RESPAWN); + unit->warp(&md->bl, master->m, x, y,CLR_TELEPORT); return 1; } |