From 3e4592d4b446d11ebbc65304e1c208443f68dcc1 Mon Sep 17 00:00:00 2001 From: DragonTrance Date: Wed, 5 May 2021 20:39:05 -0700 Subject: [PATCH] fixed events gosh --- code/game/gamemodes/dynamic/dynamic_rulesets_events.dm | 4 ++-- code/modules/events/_event.dm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_events.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_events.dm index f44991cd..d4ba88e5 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_events.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_events.dm @@ -19,9 +19,9 @@ /datum/dynamic_ruleset/event/ready(forced = 0) if (!forced) var/job_check = 0 - if (map_blacklist.len && (SSmapping.config.map_file in map_blacklist)) + if (map_blacklist.len && (map_blacklist.Find(SSmapping.config.map_file))) return FALSE - if (map_whitelist.len && !(SSmapping.config.map_file in map_whitelist)) + if (map_whitelist.len && !(map_whitelist.Find(SSmapping.config.map_file))) return FALSE if (enemy_roles.len > 0) for (var/mob/M in mode.current_players[CURRENT_LIVING_PLAYERS]) diff --git a/code/modules/events/_event.dm b/code/modules/events/_event.dm index 50a3a38b..b48c78d8 100644 --- a/code/modules/events/_event.dm +++ b/code/modules/events/_event.dm @@ -48,9 +48,9 @@ return FALSE if(players_amt < min_players) return FALSE - if(gamemode_blacklist.len && (gamemode in gamemode_blacklist)) + if(gamemode_blacklist.len && (gamemode_blacklist.Find(gamemode))) return FALSE - if(gamemode_whitelist.len && !(gamemode in gamemode_whitelist)) + if(gamemode_whitelist.len && !(gamemode_whitelist.Find(gamemode))) return FALSE if(map_blacklist.len && (SSmapping.config.map_file in map_blacklist)) //HYPER EDIT: certain maps will get special events return FALSE