more fixes

Monkestation · Sep 23, 2023 · 24a944a · 24a944a
1 parent 9e9e919
commit 24a944a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm
@@ -484,7 +484,7 @@ Used by the AI doomsday and the self-destruct nuke.
 
 /datum/controller/subsystem/mapping/proc/load_random_arena()
 	var/start_time = REALTIMEOFDAY
-	for(var/obj/effect/spawner/random_arena/arena_spawner as() in random_bar_spawners)
+	for(var/obj/effect/spawner/random_arena_spawner/arena_spawner as() in random_arena_spawners)
 		var/list/possible_arena_templates = list()
 		var/datum/map_template/random_room/random_arena/arena_candidate
 		shuffle_inplace(random_arena_templates)

diff --git a/monkestation/code/modules/ghost_players/ghost_player.dm b/monkestation/code/modules/ghost_players/ghost_player.dm
@@ -23,8 +23,9 @@
 
 /mob/living/carbon/human/ghost/Destroy()
 	. = ..()
-	if(dueling)
-		linked_button?.end_duel(src)
+	if(dueling && linked_button)
+		addtimer(CALLBACK(linked_button, PROC_REF(end_duel), src), 3 SECONDS)
+
 	if(linked_button)
 		linked_button.remove_user(src)
 		linked_button = null