Techwizz/Gobligine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[-] Fix crash when resource unit is destroyed

Browse source
This commit is contained in:
cybermind 2013-05-12 18:12:43 +06:00
parent a126ed9962
commit 71f78c119e
1 changed files with 4 additions and 1 deletions

5
src/action/action_resource.cpp
View file

@ -1103,9 +1103,11 @@ bool COrder_Resource::ActionResourceInit(CUnit &unit)
unit.DeAssignWorkerFromMine(*mine);
this->Resource.Mine = NULL;
}
if (goal && goal->CurrentAction() != UnitActionBuilt) {
if (goal && goal->IsAlive() && goal->CurrentAction() != UnitActionBuilt) {
unit.AssignWorkerToMine(*goal);
this->Resource.Mine = goal;
} else {
return false;
}
UnitGotoGoal(unit, goal, SUB_MOVE_TO_RESOURCE);
@ -1133,6 +1135,7 @@ void COrder_Resource::Execute(CUnit &unit)
// Let's start mining.
if (this->State == SUB_START_RESOURCE) {
if (ActionResourceInit(unit) == false) {
ResourceGiveUp(unit);
return;
}
}