Skip to content

Commit 23b230d

Browse files
committed
Merge branch 'develop' into testing
2 parents c115420 + 8133bdb commit 23b230d

3 files changed

Lines changed: 3 additions & 2 deletions

File tree

docs/changelog.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ Template for new versions:
7070
- `gui/pathable`: fix hang when showing trade depot wagon access and a trade depot is submerged under water
7171
- `gui/pathable`: fix representation of wagon paths over stairs and through doors
7272
- DFHack state for a site is now properly saved when retiring a fort
73+
- `gui/teleport`: fix issue when teleporting units that are not prone, resulting in later issues with phantom "cannot build here: unit blocking tile" messages
7374

7475
## Misc Improvements
7576
- `sort`: can now search for stockpiles on the Places>Stockpile tab by name, number, or enabled item categories

library/modules/Units.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -762,7 +762,7 @@ bool Units::teleport(df::unit *unit, df::coord target_pos)
762762
// This is potentially wrong, but the game will recompute this as needed
763763
old_occ->bits.unit_grounded = false;
764764
else
765-
old_occ->bits.unit = true;
765+
old_occ->bits.unit = false;
766766

767767
// If there's already somebody standing at the destination, then force the unit to lay down
768768
if (new_occ->bits.unit)

0 commit comments

Comments
 (0)