From 1191de2c86a8770988d61ad821b78a9642c3b9e2 Mon Sep 17 00:00:00 2001 From: Truman Kilen Date: Thu, 10 May 2018 12:48:23 -0500 Subject: [PATCH 1/3] Fix body marker not appearing when bonus respawn is applied --- Addons/Commands/bonus.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Addons/Commands/bonus.lua b/Addons/Commands/bonus.lua index 20f13703..dbc650d1 100644 --- a/Addons/Commands/bonus.lua +++ b/Addons/Commands/bonus.lua @@ -55,5 +55,7 @@ Event.register(defines.events.on_pre_player_died,function(event) local player = Game.get_player(event) if Ranking.get_rank(player):allowed('bonus-respawn') then player.ticks_to_respawn = 120 + -- manually dispatch death event because it is not fired when ticks_to_respawn is set pre death + Event.dispatch({name = defines.events.on_player_died, tick = event.tick, player_index = event.player_index}) end end) \ No newline at end of file From 987760a776f62c045181495b28afa8f73f0e79ff Mon Sep 17 00:00:00 2001 From: Truman Kilen Date: Thu, 10 May 2018 13:20:07 -0500 Subject: [PATCH 2/3] Add cause missing cause property to death event --- Addons/Commands/bonus.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Addons/Commands/bonus.lua b/Addons/Commands/bonus.lua index dbc650d1..bc129d8b 100644 --- a/Addons/Commands/bonus.lua +++ b/Addons/Commands/bonus.lua @@ -56,6 +56,6 @@ Event.register(defines.events.on_pre_player_died,function(event) if Ranking.get_rank(player):allowed('bonus-respawn') then player.ticks_to_respawn = 120 -- manually dispatch death event because it is not fired when ticks_to_respawn is set pre death - Event.dispatch({name = defines.events.on_player_died, tick = event.tick, player_index = event.player_index}) + Event.dispatch({name = defines.events.on_player_died, tick = event.tick, player_index = event.player_index, cause = event.cause}) end end) \ No newline at end of file From 67c7832207b83f390832f11d0a24a893e11c70d2 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Thu, 10 May 2018 21:16:33 +0100 Subject: [PATCH 3/3] Better layout of code for Event.dispatch --- Addons/Commands/bonus.lua | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Addons/Commands/bonus.lua b/Addons/Commands/bonus.lua index bc129d8b..d38af150 100644 --- a/Addons/Commands/bonus.lua +++ b/Addons/Commands/bonus.lua @@ -56,6 +56,11 @@ Event.register(defines.events.on_pre_player_died,function(event) if Ranking.get_rank(player):allowed('bonus-respawn') then player.ticks_to_respawn = 120 -- manually dispatch death event because it is not fired when ticks_to_respawn is set pre death - Event.dispatch({name = defines.events.on_player_died, tick = event.tick, player_index = event.player_index, cause = event.cause}) + Event.dispatch{ + name=defines.events.on_player_died, + tick=event.tick, + player_index=event.player_index, + cause = event.cause + } end -end) \ No newline at end of file +end)