summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2014-09-20 19:03:30 -0300
committershennetsind <ind@henn.et>2014-09-20 19:03:30 -0300
commit4ad076670ed93d1f2b12ac25ce5586b4975f6e37 (patch)
tree512a21c527e7c93749c416a3faa03ff6d3f69d8d /src
parent34624b97980e256256897832eda4c7a8c00ca725 (diff)
downloadhercules-4ad076670ed93d1f2b12ac25ce5586b4975f6e37.tar.gz
hercules-4ad076670ed93d1f2b12ac25ce5586b4975f6e37.tar.bz2
hercules-4ad076670ed93d1f2b12ac25ce5586b4975f6e37.tar.xz
hercules-4ad076670ed93d1f2b12ac25ce5586b4975f6e37.zip
Fixed Bug 8272
Fixed issue where 'pvp off' mapflag would assign the map the pk zone (this would not affect the pvp status of the map, only the disabled_ settings). Special Thanks to kyeme http://hercules.ws/board/tracker/issue-8272-map-zone-db-mapflags/ Signed-off-by: shennetsind <ind@henn.et>
Diffstat (limited to 'src')
-rw-r--r--src/map/npc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/npc.c b/src/map/npc.c
index ac4d4555d..a33db6b99 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -3693,7 +3693,7 @@ const char* npc_parse_mapflag(char* w1, char* w2, char* w3, char* w4, const char
if( state && (zone = strdb_get(map->zone_db, MAP_ZONE_PVP_NAME)) && map->list[m].zone != zone ) {
map->zone_change(m,zone,start,buffer,filepath);
} else if ( !state ) {
- map->list[m].zone = &map->zone_pk;
+ map->list[m].zone = &map->zone_all;
}
}
else if (!strcmpi(w3,"pvp_noparty"))