diff options
| author | shennetsind <ind@henn.et> | 2013-06-24 13:13:27 -0300 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-06-24 13:13:27 -0300 |
| commit | 4ff67a9c9977e216c5b63bf5c80480dba1e2fcab (patch) | |
| tree | 8e59ec1c7f180bce2f1ec32be0c5de55a77f5e8f /src/map/pc.c | |
| parent | 15cf156a3229532ffb2db0f78b29da228e0b2cc7 (diff) | |
| download | hercules-4ff67a9c9977e216c5b63bf5c80480dba1e2fcab.tar.gz hercules-4ff67a9c9977e216c5b63bf5c80480dba1e2fcab.tar.bz2 hercules-4ff67a9c9977e216c5b63bf5c80480dba1e2fcab.tar.xz hercules-4ff67a9c9977e216c5b63bf5c80480dba1e2fcab.zip | |
Fixed Bug #7412
Special Thanks to shenhuyong
http://hercules.ws/board/tracker/issue-7412-create-instancereloadscript-causes-map-server-crash/
Signed-off-by: shennetsind <ind@henn.et>
Diffstat (limited to 'src/map/pc.c')
| -rw-r--r-- | src/map/pc.c | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/src/map/pc.c b/src/map/pc.c index 61655afc3..1a5822f81 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -4722,9 +4722,11 @@ int pc_setpos(struct map_session_data* sd, unsigned short mapindex, int x, int y if( sd->instances ) { for( i = 0; i < sd->instances; i++ ) { - ARR_FIND(0, instances[sd->instance[i]].num_map, j, map[instances[sd->instance[i]].map[j]].instance_src_map == m && !map[instances[sd->instance[i]].map[j]].cName); - if( j != instances[sd->instance[i]].num_map ) - break; + if( sd->instance[i] >= 0 ) { + ARR_FIND(0, instances[sd->instance[i]].num_map, j, map[instances[sd->instance[i]].map[j]].instance_src_map == m && !map[instances[sd->instance[i]].map[j]].cName); + if( j != instances[sd->instance[i]].num_map ) + break; + } } if( i != sd->instances ) { m = instances[sd->instance[i]].map[j]; @@ -4734,9 +4736,11 @@ int pc_setpos(struct map_session_data* sd, unsigned short mapindex, int x, int y } if ( !stop && sd->status.party_id && (p = party->search(sd->status.party_id)) && p->instances ) { for( i = 0; i < p->instances; i++ ) { - ARR_FIND(0, instances[p->instance[i]].num_map, j, map[instances[p->instance[i]].map[j]].instance_src_map == m && !map[instances[p->instance[i]].map[j]].cName); - if( j != instances[p->instance[i]].num_map ) - break; + if( p->instance[i] >= 0 ) { + ARR_FIND(0, instances[p->instance[i]].num_map, j, map[instances[p->instance[i]].map[j]].instance_src_map == m && !map[instances[p->instance[i]].map[j]].cName); + if( j != instances[p->instance[i]].num_map ) + break; + } } if( i != p->instances ) { m = instances[p->instance[i]].map[j]; @@ -4746,9 +4750,11 @@ int pc_setpos(struct map_session_data* sd, unsigned short mapindex, int x, int y } if ( !stop && sd->status.guild_id && sd->guild && sd->guild->instances ) { for( i = 0; i < sd->guild->instances; i++ ) { - ARR_FIND(0, instances[sd->guild->instance[i]].num_map, j, map[instances[sd->guild->instance[i]].map[j]].instance_src_map == m && !map[instances[sd->guild->instance[i]].map[j]].cName); - if( j != instances[sd->guild->instance[i]].num_map ) - break; + if( sd->guild->instance[i] >= 0 ) { + ARR_FIND(0, instances[sd->guild->instance[i]].num_map, j, map[instances[sd->guild->instance[i]].map[j]].instance_src_map == m && !map[instances[sd->guild->instance[i]].map[j]].cName); + if( j != instances[sd->guild->instance[i]].num_map ) + break; + } } if( i != sd->guild->instances ) { m = instances[sd->guild->instance[i]].map[j]; |