refactor: Move fix to the task resumption method

Author: Stubbjax

Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp

@@ -2000,13 +2000,7 @@ void DozerAIUpdate::newTask( DozerTask task, Object *target )
 		// multiple dozers/workers to double up on construction efforts
 		//
 		if( task == DOZER_TASK_BUILD )
-		{
-			// TheSuperHackers @bugfix Stubbjax 15/06/2026 Ignore the build task if the building is already complete.
-			if (target->getConstructionPercent() == CONSTRUCTION_COMPLETE)
-				return;
-
 			target->setBuilder( me );
-		}
 
 		m_dockPoint[ task ][ DOZER_DOCK_POINT_START ].valid			= TRUE;
 		m_dockPoint[ task ][ DOZER_DOCK_POINT_START ].location	= position;
@@ -2072,8 +2066,16 @@ void DozerAIUpdate::setPreviousTask(DozerTask task)
 //-------------------------------------------------------------------------------------------------
 void DozerAIUpdate::resumePreviousTask()
 {
-	if (m_previousTask != DOZER_TASK_INVALID)
+	if (m_previousTask == DOZER_TASK_INVALID)
+		return;
+
+	// TheSuperHackers @bugfix Stubbjax 15/06/2026 Ignore the build task if the building is already complete.
+	if (m_previousTask == DOZER_TASK_BUILD)
 	{
+		Object* target = TheGameLogic->findObjectByID(m_previousTaskInfo.m_targetObjectID);
+		if (target && target->getConstructionPercent() == CONSTRUCTION_COMPLETE)
+			return;
+
 		newTask(m_previousTask, TheGameLogic->findObjectByID(m_previousTaskInfo.m_targetObjectID));
 		m_previousTask = DOZER_TASK_INVALID;
 		m_previousTaskInfo = DozerTaskInfo();

Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/WorkerAIUpdate.cpp

@@ -644,13 +644,7 @@ void WorkerAIUpdate::newTask( DozerTask task, Object* target )
 		// multiple dozers/workers to double up on construction efforts
 		//
 		if( task == DOZER_TASK_BUILD )
-		{
-			// TheSuperHackers @bugfix Stubbjax 15/06/2026 Ignore the build task if the building is already complete.
-			if (target->getConstructionPercent() == CONSTRUCTION_COMPLETE)
-				return;
-
 			target->setBuilder( me );
-		}
 
 		m_dockPoint[ task ][ DOZER_DOCK_POINT_START ].valid			= TRUE;
 		m_dockPoint[ task ][ DOZER_DOCK_POINT_START ].location	= position;
@@ -727,8 +721,16 @@ void WorkerAIUpdate::setPreviousTask(DozerTask task)
 //-------------------------------------------------------------------------------------------------
 void WorkerAIUpdate::resumePreviousTask()
 {
-	if (m_previousTask != DOZER_TASK_INVALID)
+	if (m_previousTask == DOZER_TASK_INVALID)
+		return;
+
+	// TheSuperHackers @bugfix Stubbjax 15/06/2026 Ignore the build task if the building is already complete.
+	if (m_previousTask == DOZER_TASK_BUILD)
 	{
+		Object* target = TheGameLogic->findObjectByID(m_previousTaskInfo.m_targetObjectID);
+		if (target && target->getConstructionPercent() == CONSTRUCTION_COMPLETE)
+			return;
+
 		newTask(m_previousTask, TheGameLogic->findObjectByID(m_previousTaskInfo.m_targetObjectID));
 		m_previousTask = DOZER_TASK_INVALID;
 		m_previousTaskInfo = DozerTaskInfo();

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp

@@ -2005,13 +2005,7 @@ void DozerAIUpdate::newTask( DozerTask task, Object *target )
 		// multiple dozers/workers to double up on construction efforts
 		//
 		if( task == DOZER_TASK_BUILD )
-		{
-			// TheSuperHackers @bugfix Stubbjax 15/06/2026 Ignore the build task if the building is already complete.
-			if (target->getConstructionPercent() == CONSTRUCTION_COMPLETE)
-				return;
-
 			target->setBuilder( me );
-		}
 
 		m_dockPoint[ task ][ DOZER_DOCK_POINT_START ].valid			= TRUE;
 		m_dockPoint[ task ][ DOZER_DOCK_POINT_START ].location	= position;
@@ -2077,8 +2071,16 @@ void DozerAIUpdate::setPreviousTask(DozerTask task)
 //-------------------------------------------------------------------------------------------------
 void DozerAIUpdate::resumePreviousTask()
 {
-	if (m_previousTask != DOZER_TASK_INVALID)
+	if (m_previousTask == DOZER_TASK_INVALID)
+		return;
+
+	// TheSuperHackers @bugfix Stubbjax 15/06/2026 Ignore the build task if the building is already complete.
+	if (m_previousTask == DOZER_TASK_BUILD)
 	{
+		Object* target = TheGameLogic->findObjectByID(m_previousTaskInfo.m_targetObjectID);
+		if (target && target->getConstructionPercent() == CONSTRUCTION_COMPLETE)
+			return;
+
 		newTask(m_previousTask, TheGameLogic->findObjectByID(m_previousTaskInfo.m_targetObjectID));
 		m_previousTask = DOZER_TASK_INVALID;
 		m_previousTaskInfo = DozerTaskInfo();

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/WorkerAIUpdate.cpp

@@ -644,13 +644,7 @@ void WorkerAIUpdate::newTask( DozerTask task, Object* target )
 		// multiple dozers/workers to double up on construction efforts
 		//
 		if( task == DOZER_TASK_BUILD )
-		{
-			// TheSuperHackers @bugfix Stubbjax 15/06/2026 Ignore the build task if the building is already complete.
-			if (target->getConstructionPercent() == CONSTRUCTION_COMPLETE)
-				return;
-
 			target->setBuilder( me );
-		}
 
 		m_dockPoint[ task ][ DOZER_DOCK_POINT_START ].valid			= TRUE;
 		m_dockPoint[ task ][ DOZER_DOCK_POINT_START ].location	= position;
@@ -727,8 +721,16 @@ void WorkerAIUpdate::setPreviousTask(DozerTask task)
 //-------------------------------------------------------------------------------------------------
 void WorkerAIUpdate::resumePreviousTask()
 {
-	if (m_previousTask != DOZER_TASK_INVALID)
+	if (m_previousTask == DOZER_TASK_INVALID)
+		return;
+
+	// TheSuperHackers @bugfix Stubbjax 15/06/2026 Ignore the build task if the building is already complete.
+	if (m_previousTask == DOZER_TASK_BUILD)
 	{
+		Object* target = TheGameLogic->findObjectByID(m_previousTaskInfo.m_targetObjectID);
+		if (target && target->getConstructionPercent() == CONSTRUCTION_COMPLETE)
+			return;
+
 		newTask(m_previousTask, TheGameLogic->findObjectByID(m_previousTaskInfo.m_targetObjectID));
 		m_previousTask = DOZER_TASK_INVALID;
 		m_previousTaskInfo = DozerTaskInfo();