Skip to content
This repository was archived by the owner on Jan 5, 2024. It is now read-only.

Commit ef415d7

Browse files
committed
Forgot to put safety check for attachable script running on the actual UpdateScripts function, where it was most needed. Oops.
1 parent fdcc8c9 commit ef415d7

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Entities/Attachable.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -554,7 +554,7 @@ void Attachable::Update()
554554
MOSRotating::Update();
555555

556556
// If we're attached to something, MoveableMan doesn't own us, and therefore isn't calling our ScriptUpdate (and our parent isn't calling it either), so we should here
557-
if (m_pParent) { UpdateScripts(); }
557+
if (m_pParent != NULL && m_pParent->ObjectScriptsInitialized()) { UpdateScripts(); }
558558
}
559559

560560

0 commit comments

Comments
 (0)