fix(CBaseModelEntity): SetSolidType crash

Author: skuzzis

plugin_files/gamedata/offsets.json

@@ -24,8 +24,8 @@
         "linux": 80
     },
     "CollisionRulesChanged": {
-        "windows": 174,
-        "linux": 173
+        "windows": 178,
+        "linux": 177
     },
     "CCSPlayer_ItemServices_GiveNamedItem": {
         "windows": 17,

src/sdk/entity/CBaseEntity.h

@@ -182,5 +182,11 @@ class CBaseEntity : public CEntityInstance
         g_Signatures->FetchSignature<CBaseEntity_EmitSoundFilter>("CBaseEntity_EmitSoundFilter")(filter, m_pEntity->m_EHandle.GetEntryIndex(), params);
     }
 
+    void CollisionRulesChanged()
+    {
+        static int offset = g_Offsets->GetOffset("CollisionRulesChanged");
+        CALL_VIRTUAL(void, offset, this);
+    }
+
     CEntitySubclassVDataBase* GetVData() { return *(CEntitySubclassVDataBase**)((uint8*)(m_nSubclassID()) + 4); }
 };

src/sdk/entity/CBaseModelEntity.h

@@ -34,5 +34,6 @@ class CBaseModelEntity : public CBaseEntity
     void SetSolidType(SolidType_t type)
     {
         this->m_Collision->m_nSolidType = type;
+        CollisionRulesChanged();
     }
 };

src/sdk/entity/CCollisionProperty.h

@@ -6,19 +6,22 @@ struct VPhysicsCollisionAttribute_t
 {
     DECLARE_SCHEMA_CLASS_BASE(VPhysicsCollisionAttribute_t, true)
 
-    SCHEMA_FIELD_OFFSET(uint8, m_nCollisionGroup, 0)
-    SCHEMA_FIELD_OFFSET(uint64_t, m_nInteractsAs, 0)
-    SCHEMA_FIELD_OFFSET(uint64_t, m_nInteractsWith, 0)
-    SCHEMA_FIELD_OFFSET(uint64_t, m_nInteractsExclude, 0)
+    SCHEMA_FIELD_OFFSET(uint8, m_nCollisionGroup, 0);
+    SCHEMA_FIELD_OFFSET(uint64_t, m_nInteractsAs, 0);
+    SCHEMA_FIELD_OFFSET(uint64_t, m_nInteractsWith, 0);
+    SCHEMA_FIELD_OFFSET(uint64_t, m_nInteractsExclude, 0);
 };
 
+/*
+keep this always on struct, no matter what
+*/
 class CCollisionProperty
 {
 public:
-    DECLARE_SCHEMA_CLASS_BASE(CCollisionProperty, false)
+    DECLARE_SCHEMA_CLASS_BASE(CCollisionProperty, true)
 
-    SCHEMA_FIELD_OFFSET(VPhysicsCollisionAttribute_t, m_collisionAttribute, 0)
-    SCHEMA_FIELD_OFFSET(SolidType_t, m_nSolidType, 0)
-    SCHEMA_FIELD_OFFSET(uint8, m_usSolidFlags, 0)
-    SCHEMA_FIELD_OFFSET(uint8, m_CollisionGroup, 0)
+    SCHEMA_FIELD_OFFSET(VPhysicsCollisionAttribute_t, m_collisionAttribute, 0);
+    SCHEMA_FIELD_OFFSET(SolidType_t, m_nSolidType, 0);
+    SCHEMA_FIELD_OFFSET(uint8, m_usSolidFlags, 0);
+    SCHEMA_FIELD_OFFSET(uint8, m_CollisionGroup, 0);
 };