From c43622dfc90f44836b6111a7e4be43955d1581f8 Mon Sep 17 00:00:00 2001 From: DragonTrance Date: Fri, 30 Apr 2021 17:38:12 -0700 Subject: [PATCH] Update dynamic_rulesets_events.dm --- code/game/gamemodes/dynamic/dynamic_rulesets_events.dm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_events.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_events.dm index 9b489fab..3fb8ac55 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_events.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_events.dm @@ -15,6 +15,12 @@ var/list/list_observers = list() /datum/dynamic_ruleset/event/acceptable(population=0, threat=0) + if(istype(controller, /datum/round_event_control)) + var/datum/round_event_control/R = controller + if(R.map_blacklist.len && (SSmapping.config.map_file in R.map_blacklist)) //Apparently dynamic doesn't call a controller's canSpawnEvent :> + return FALSE + if(R.map_whitelist.len && !(SSmapping.config.map_file in R.map_whitelist)) + return FALSE return ..() /datum/dynamic_ruleset/event/ready(forced = 0)