From a548f20c940036a7c05c561c1363cb51a5849922 Mon Sep 17 00:00:00 2001 From: Aleos Date: Tue, 4 Jun 2019 09:34:30 -0400 Subject: [PATCH] Corrected PK Mapflag assignment (#4165) * Fixes an issue with different player versus player mapflags not being checked before applying the PK mapflag. Thanks to @LiamKarlMitchell! --- src/map/map.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/map/map.cpp b/src/map/map.cpp index 93829aeb16..447d2686bf 100644 --- a/src/map/map.cpp +++ b/src/map/map.cpp @@ -3660,7 +3660,7 @@ void map_flags_init(void){ continue; // adjustments - if( battle_config.pk_mode && !mapdata->flag[MF_PVP] ) + if( battle_config.pk_mode && !mapdata_flag_vs2(mapdata) ) mapdata->flag[MF_PVP] = true; // make all maps pvp for pk_mode [Valaris] } }