From 6f9bfc42110bf3b00d68e263727b8655afdbfe3f Mon Sep 17 00:00:00 2001 From: FlightControl Date: Fri, 5 May 2017 12:40:16 +0200 Subject: [PATCH] Abort logic improvements --- Moose Development/Moose/Tasking/Mission.lua | 11 ++++------- Moose Development/Moose/Tasking/Task.lua | 2 +- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/Moose Development/Moose/Tasking/Mission.lua b/Moose Development/Moose/Tasking/Mission.lua index 54032cda1..c19af3f75 100644 --- a/Moose Development/Moose/Tasking/Mission.lua +++ b/Moose Development/Moose/Tasking/Mission.lua @@ -289,20 +289,17 @@ end -- If the Unit is part of a Task in the Mission, true is returned. -- @param #MISSION self -- @param Wrapper.Unit#UNIT PlayerUnit The CLIENT or UNIT of the Player joining the Mission. --- @return #boolean true if Unit is part of a Task in the Mission. +-- @return #MISSION function MISSION:AbortUnit( PlayerUnit ) self:F( { PlayerUnit = PlayerUnit } ) - local PlayerUnitRemoved = false - for TaskID, Task in pairs( self:GetTasks() ) do local Task = Task -- Tasking.Task#TASK - if Task:AbortUnit( PlayerUnit ) then - PlayerUnitRemoved = true - end + local PlayerGroup = PlayerUnit:GetGroup() + Task:AbortGroup( PlayerGroup ) end - return PlayerUnitRemoved + return self end --- Handles a crash of a PlayerUnit from the Mission. diff --git a/Moose Development/Moose/Tasking/Task.lua b/Moose Development/Moose/Tasking/Task.lua index b23cc8cf7..15c88a013 100644 --- a/Moose Development/Moose/Tasking/Task.lua +++ b/Moose Development/Moose/Tasking/Task.lua @@ -754,7 +754,7 @@ function TASK:RefreshMenus( TaskGroup, MenuTime ) local MissionMenu = Mission:GetMenu( TaskGroup ) local TaskText = self:GetName() - local PlannedMenu = MissionMenu:GetMenu( string.format( "Planned Tasks", TaskText ) ) + local PlannedMenu = MissionMenu:GetMenu( "Planned Tasks" ) local AssignedMenu = MissionMenu:GetMenu( string.format( "Assigned Task %s", TaskText ) ) if PlannedMenu then