Skip to content

Commit 54acfc8

Browse files
authored
Merge pull request #5423 from ab9rf/preserve-tomb-crash
don't crash on a tomb owned by a unit that doesn't exist
2 parents 2310f0d + 8b0a482 commit 54acfc8

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

docs/changelog.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ Template for new versions:
5656
## New Features
5757

5858
## Fixes
59+
- `preserve-tombs`: will no longer crash when a tomb is assigned to a unit that does not exist
5960

6061
## Misc Improvements
6162

plugins/preserve-tombs.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ static void update_tomb_assignments(color_ostream &out) {
200200
if (!tomb || !tomb->flags.bits.exists) continue;
201201
if (tomb->assigned_unit_id == -1) continue;
202202
auto unit = Buildings::getOwner(tomb);
203-
if (Units::isDead(unit)) continue; // we only care about living units
203+
if (!unit || Units::isDead(unit)) continue; // we only care about living units
204204

205205
auto it = tomb_assignments.find(tomb->assigned_unit_id);
206206

0 commit comments

Comments
 (0)