Merge branch 'ALTV-610' into dev

altmp · Jan 13, 2025 · 88ddfab · 88ddfab
2 parents 139242e + 7bfb669
commit 88ddfab
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/server/include/CSharpResourceImpl.h b/server/include/CSharpResourceImpl.h
@@ -88,7 +88,8 @@ typedef void (* ColShapeDelegate_t)(void* colShape, void* entity, alt::IBaseObje
 typedef void (* WeaponDamageDelegate_t)(const alt::CEvent* event, alt::IPlayer* source, void* target,
                                         alt::IBaseObject::Type targetBaseObjectType,
                                         uint32_t weaponHash, uint32_t damageValue, position_t shotOffset,
-                                        alt::CWeaponDamageEvent::BodyPart bodyPart);
+                                        alt::CWeaponDamageEvent::BodyPart bodyPart, void* sourceEntity,
+                                        alt::IBaseObject::Type sourceEntityType);
 
 typedef void (* ExplosionDelegate_t)(const alt::CEvent* event, alt::IPlayer* source,
                                      alt::CExplosionEvent::ExplosionType explosionType,

diff --git a/server/src/CSharpResourceImpl.cpp b/server/src/CSharpResourceImpl.cpp
@@ -25,7 +25,7 @@ void CSharpResourceImpl::ResetDelegates()
     OnPlayerDeathDelegate = [](auto var, auto var2, auto var3, auto var4) {};
     OnExplosionDelegate = [](auto var, auto var2, auto var3, auto var4, auto var5, auto var6, auto var7) {};
     OnWeaponDamageDelegate = [](auto var, auto var2, auto var3, auto var4, auto var5, auto var6, auto var7,
-                                auto var8) {};
+                                auto var8, auto var9, auto var10) {};
     OnPlayerDisconnectDelegate = [](auto var, auto var2) {};
     OnServerEventDelegate = [](auto var, auto var2, auto var3) {};
     OnPlayerChangeVehicleSeatDelegate = [](auto var, auto var2, auto var3, auto var4) {};
@@ -332,6 +332,7 @@ case alt::CEvent::Type::SYNCED_META_CHANGE:
         {
             auto weaponDamageEvent = dynamic_cast<const alt::CWeaponDamageEvent*>(ev);
             auto targetEntity = weaponDamageEvent->GetTarget();
+            auto sourceEntity = weaponDamageEvent->GetSourceEntity();
 
             if (targetEntity == nullptr) return;
 
@@ -345,7 +346,9 @@ case alt::CEvent::Type::SYNCED_META_CHANGE:
                                    weaponDamageEvent->GetWeaponHash(),
                                    weaponDamageEvent->GetDamageValue(),
                                    shotOffset,
-                                   weaponDamageEvent->GetBodyPart());
+                                   weaponDamageEvent->GetBodyPart(),
+                                   GetEntityPointer(sourceEntity),
+                                   sourceEntity->GetType());
 
             break;
         }