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

Corrected mob warp check (#4501)

Browse Source 
* Fixes #4499.
* Corrected mob warp check failing to determine validity of target map.
Thanks to @ai4rei!
This commit is contained in:
Aleos
2020-01-01 21:53:02 -05:00
committed by GitHub
parent e1f9483807
commit 50715f92e3
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/map/npc.cpp
View File

@@ -1124,12 +1124,14 @@ int npc_touch_areanpc2(struct mob_data *md)
{ // In the npc touch area
switch( mapdata->npc[i]->subtype )
{
case NPCTYPE_WARP:
xs = map_mapindex2mapid(mapdata->npc[i]->u.warp.mapindex);
if( md->bl.m < 0 )
case NPCTYPE_WARP: {
int16 warp_m = map_mapindex2mapid(mapdata->npc[i]->u.warp.mapindex);
if( warp_m < 0 )
break; // Cannot Warp between map servers
if( unit_warp(&md->bl, xs, mapdata->npc[i]->u.warp.x, mapdata->npc[i]->u.warp.y, CLR_OUTSIGHT) == 0 )
if( unit_warp(&md->bl, warp_m, mapdata->npc[i]->u.warp.x, mapdata->npc[i]->u.warp.y, CLR_OUTSIGHT) == 0 )
return 1; // Warped
}
break;
case NPCTYPE_SCRIPT:
if( mapdata->npc[i]->bl.id == md->areanpc_id )