diff options
| author | panikon <panikon@zoho.com> | 2014-04-19 00:21:33 -0300 |
|---|---|---|
| committer | panikon <panikon@zoho.com> | 2014-04-19 00:21:33 -0300 |
| commit | 446ce4a3179163fbdef68b39c69db3943222698c (patch) | |
| tree | 93b3400af1a1b0946f9be07e62b60a82e68b6dc0 /src/map/map.c | |
| parent | 69ca0aaecc5823dfe273810077c185dff7f20611 (diff) | |
| download | hercules-446ce4a3179163fbdef68b39c69db3943222698c.tar.gz hercules-446ce4a3179163fbdef68b39c69db3943222698c.tar.bz2 hercules-446ce4a3179163fbdef68b39c69db3943222698c.tar.xz hercules-446ce4a3179163fbdef68b39c69db3943222698c.zip | |
#Fixed issue: 8147
* http://hercules.ws/board/tracker/issue-8147-map-zone-dbconf-pvpon-crash/
#Added check to prevent issue where player would start autotrading from savepoint if killed in a
map where pvp/gvg was active
Diffstat (limited to 'src/map/map.c')
| -rw-r--r-- | src/map/map.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/map/map.c b/src/map/map.c index 7adeee3d5..04ac8a239 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -3765,10 +3765,9 @@ struct map_zone_data *map_merge_zone(struct map_zone_data *main, struct map_zone CREATE(zone->capped_skills, struct map_zone_skill_damage_cap_entry *, zone->capped_skills_count); - for(i = 0, cursor = 0; i < main->capped_skills_count; i++, cursor++ ) { CREATE(zone->capped_skills[cursor], struct map_zone_skill_damage_cap_entry, 1); - memcpy(zone->capped_skills[cursor], main->disabled_commands[i], sizeof(struct map_zone_skill_damage_cap_entry)); + memcpy(zone->capped_skills[cursor], main->capped_skills[i], sizeof(struct map_zone_skill_damage_cap_entry)); } for(i = 0; i < other->capped_skills_count; i++, cursor++ ) { |