Fix #1659: attached markers having 2 ids causes server crash (#1668)

* Fix #1659: attached markers having 2 ids causes server crash

* don't return marker's colshape in getAttachedElements

* Make pickup and marker colshapes indestructible

destroyElement function will have no effect on pickup and marker colshapes

* Make colshapes visible to getAttachedElements

* make marker colshapes indestructible (typo fix)

* Move indestructible check to DestroyElement funciton

Co-authored-by: saml1er <[email protected]>

Author: saml1er

Client/mods/deathmatch/logic/CClientEntity.h

@@ -322,6 +322,9 @@ class CClientEntity : public CClientEntityBase
     bool         IsCallPropagationEnabled() { return m_bCallPropagationEnabled; }
     virtual void SetCallPropagationEnabled(bool bEnabled) { m_bCallPropagationEnabled = bEnabled; }
 
+    bool CanBeDestroyedByScript() { return m_canBeDestroyedByScript; }
+    void SetCanBeDestroyedByScript(bool canBeDestroyedByScript) { m_canBeDestroyedByScript = canBeDestroyedByScript; }
+
 protected:
     CClientManager*       m_pManager;
     CClientEntity*        m_pParent;
@@ -368,7 +371,8 @@ class CClientEntity : public CClientEntityBase
     bool                              m_bWorldIgnored;
     bool                              m_bCallPropagationEnabled;
     bool                              m_bDisallowCollisions;
-
+    bool                              m_canBeDestroyedByScript = true;            // If true, destroyElement function will
+                                                                                  // have no effect on this element
 public:
     // Optimization for getElementsByType starting at root
     static void StartupEntitiesFromRoot();

Client/mods/deathmatch/logic/CClientMarker.cpp

@@ -92,9 +92,8 @@ void CClientMarker::SetPosition(const CVector& vecPosition)
 void CClientMarker::AttachTo(CClientEntity* pEntity)
 {
     CClientEntity::AttachTo(pEntity);
-    if (m_pCollision){
-        m_pCollision->AttachTo(pEntity);
-    }
+    if (m_pCollision)
+        m_pCollision->AttachTo(this);
 }
 
 void CClientMarker::SetAttachedOffsets(CVector& vecPosition, CVector& vecRotation)
@@ -485,6 +484,8 @@ void CClientMarker::CreateOfType(int iType)
         default:
             break;
     }
+    if (m_pCollision)
+        m_pCollision->SetCanBeDestroyedByScript(false);
 }
 
 CSphere CClientMarker::GetWorldBoundingSphere()

Client/mods/deathmatch/logic/CClientPickup.cpp

@@ -157,6 +157,7 @@ void CClientPickup::Create()
             m_pCollision = new CClientColSphere(g_pClientGame->GetManager(), NULL, m_vecPosition, 1.0f);
             m_pCollision->m_pOwningPickup = this;
             m_pCollision->SetHitCallback(this);
+            m_pCollision->SetCanBeDestroyedByScript(false);
 
             // Increment pickup counter
             ++m_pPickupManager->m_uiPickupCount;

Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp

@@ -928,6 +928,9 @@ CClientDummy* CStaticFunctionDefinitions::CreateElement(CResource& Resource, con
 
 bool CStaticFunctionDefinitions::DestroyElement(CClientEntity& Entity)
 {
+    if (!Entity.CanBeDestroyedByScript())
+        return false;
+
     // Run us on all its children
     CChildListType ::const_iterator iter = Entity.IterBegin();
     while (iter != Entity.IterEnd())

Server/mods/deathmatch/logic/CElement.h

@@ -229,6 +229,9 @@ class CElement
     bool IsCallPropagationEnabled() { return m_bCallPropagationEnabled; }
     void SetCallPropagationEnabled(bool bEnabled) { m_bCallPropagationEnabled = bEnabled; }
 
+    bool CanBeDestroyedByScript() { return m_canBeDestroyedByScript; }
+    void SetCanBeDestroyedByScript(bool canBeDestroyedByScript) { m_canBeDestroyedByScript = canBeDestroyedByScript; }
+
 protected:
     CElement*    GetRootElement();
     virtual bool ReadSpecialData(const int iLine) = 0;
@@ -277,7 +280,8 @@ class CElement
     bool                   m_bDoubleSided;
     bool                   m_bUpdatingSpatialData;
     bool                   m_bCallPropagationEnabled;
-
+    bool                   m_canBeDestroyedByScript = true;            // If true, destroyElement function will
+                                                                       // have no effect on this element
     // Optimization for getElementsByType starting at root
 public:
     static void StartupEntitiesFromRoot();

Server/mods/deathmatch/logic/CMarker.cpp

@@ -28,6 +28,7 @@ CMarker::CMarker(CMarkerManager* pMarkerManager, CColManager* pColManager, CElem
     m_pCollision = new CColCircle(pColManager, nullptr, m_vecPosition, m_fSize, true);
     m_pCollision->SetCallback(this);
     m_pCollision->SetAutoCallEvent(false);
+    m_pCollision->SetCanBeDestroyedByScript(false);
 
     // Add us to the marker manager
     pMarkerManager->AddToList(this);
@@ -173,7 +174,8 @@ void CMarker::SetPosition(const CVector& vecPosition)
 void CMarker::AttachTo(CElement* pElement)
 {
     CElement::AttachTo(pElement);
-    m_pCollision->AttachTo(pElement);
+    if (m_pCollision)
+        m_pCollision->AttachTo(this);
 }
 
 void CMarker::SetAttachedOffsets(CVector& vecPosition, CVector& vecRotation)
@@ -382,6 +384,7 @@ void CMarker::UpdateCollisionObject(unsigned char ucOldType)
 
         m_pCollision->SetCallback(this);
         m_pCollision->SetAutoCallEvent(false);
+        m_pCollision->SetCanBeDestroyedByScript(false);
     }
 
     // Set the radius after the size

Server/mods/deathmatch/logic/CPickup.cpp

@@ -21,6 +21,7 @@ CPickup::CPickup(CElement* pParent, CPickupManager* pPickupManager, CColManager*
     m_pCollision->SetEnabled(false);
     m_pCollision->SetCallback(this);
     m_pCollision->SetAutoCallEvent(false);
+    m_pCollision->SetCanBeDestroyedByScript(false);
 
     // Add us to the pickup manager's list and grab an unique id
     pPickupManager->AddToList(this);

Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp

@@ -246,6 +246,9 @@ CDummy* CStaticFunctionDefinitions::CreateElement(CResource* pResource, const ch
 
 bool CStaticFunctionDefinitions::DestroyElement(CElement* pElement)
 {
+    if (!pElement->CanBeDestroyedByScript())
+        return false;
+
     // Run us on all its children
     CChildListType ::const_iterator iter = pElement->IterBegin();
     while (iter != pElement->IterEnd())