Skip to content

Commit 0251b7c

Browse files
committed
Merge branch 'uneventful' into 'master'
Don't trigger cell change logic when the player isn't changing cells Closes #8469 See merge request OpenMW/openmw!4657
2 parents 9ea1afe + 57c40bc commit 0251b7c

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

apps/openmw/mwlua/objectbindings.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,8 @@ namespace MWLua
100100
stats.land(true);
101101
stats.setTeleported(true);
102102
world->getPlayer().setTeleported(true);
103-
world->changeToCell(destCell->getCell()->getId(), toPos(pos, rot), false);
103+
bool differentCell = ptr.getCell() != destCell;
104+
world->changeToCell(destCell->getCell()->getId(), toPos(pos, rot), false, differentCell);
104105
MWWorld::Ptr newPtr = world->getPlayerPtr();
105106
world->moveObject(newPtr, pos);
106107
world->rotateObject(newPtr, rot);

0 commit comments

Comments
 (0)