Fixed some attachable script screwup. Third time's the charm!

Author: garethyr

Entities/Attachable.cpp

@@ -274,7 +274,7 @@ void Attachable::Attach(MOSRotating *pParent)
     // Reset the attachables timers so things that have been sitting in inventory don't make backed up emissions
     ResetAllTimers();
 
-    if (m_pParent != NULL && m_pParent->ObjectScriptsInitialized()) {
+    if (m_pParent != NULL && (!m_pParent->HasAnyScripts() || m_pParent->ObjectScriptsInitialized())) {
         RunScriptedFunctionInAppropriateScripts("OnAttach", false, false, {m_pParent});
     }
 }
@@ -306,7 +306,7 @@ void Attachable::Detach()
 
     m_RestTimer.Reset();
 
-    if (temporaryParent != NULL && temporaryParent->ObjectScriptsInitialized()) {
+    if (temporaryParent != NULL && (!temporaryParent->HasAnyScripts() || temporaryParent->ObjectScriptsInitialized())) {
         RunScriptedFunctionInAppropriateScripts("OnDetach", false, false, {temporaryParent});
     }
 }
@@ -554,7 +554,7 @@ void Attachable::Update()
     MOSRotating::Update();
 
     // 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
-    if (m_pParent != NULL && m_pParent->ObjectScriptsInitialized()) { UpdateScripts(); }
+    if (m_pParent != NULL && (!m_pParent->HasAnyScripts() || m_pParent->ObjectScriptsInitialized())) { UpdateScripts(); }
 }
 
 

Entities/MovableObject.h

@@ -220,6 +220,12 @@ ENTITYALLOCATION(MovableObject)
     /// <returns>The iterator pointing to the vector entry for the script or the end of the vector if the script was not found.</returns>
     virtual std::vector<std::pair<std::string, bool>>::const_iterator const FindScript(std::string const &scriptPath) const { return std::find_if(m_LoadedScripts.cbegin(), m_LoadedScripts.cend(), [&scriptPath](auto element) { return element.first == scriptPath; }); }
 
+    /// <summary>
+    /// Checks if this MO has any scripts on it.
+    /// </summary>
+    /// <returns>Whether or not this MO has any scripts on it.</returns>
+    virtual bool const HasAnyScripts() const { return !m_LoadedScripts.empty(); }
+
     /// <summary>
     /// Checks if the script at the given path is one of the scripts on this MO.
     /// </summary>