Fixes

Author: omar-o22

Server/mods/deathmatch/logic/CGame.cpp

@@ -1654,7 +1654,7 @@ void CGame::AddBuiltInEvents()
     m_Events.AddEvent("onPlayerChangesProtectedData", "element, key, value", nullptr, false);
     m_Events.AddEvent("onPlayerChangesWorldSpecialProperty", "property, enabled", nullptr, false);
     m_Events.AddEvent("onPlayerTeleport", "previousX, previousY, previousZ, currentX, currentY, currentZ", nullptr, false);
-    m_Events.AddEvent("onPlayerWeaponGiven", "weaponID", nullptr, false);
+    m_Events.AddEvent("onPlayerWeaponGiven", "weaponID, weaponAmmo, weaponSlot", nullptr, false);
     m_Events.AddEvent("onPlayerWeaponTaken", "weaponID, weaponAmmo, weaponSlot", nullptr, false);
 
     // Ped events
@@ -1664,7 +1664,7 @@ void CGame::AddBuiltInEvents()
     m_Events.AddEvent("onPedWeaponSwitch", "previous, current", NULL, false);
     m_Events.AddEvent("onPedWeaponReload", "weapon, clip, ammo", nullptr, false);
     m_Events.AddEvent("onPedDamage", "loss", NULL, false);
-    m_Events.AddEvent("onPedWeaponGiven", "weaponID", nullptr, false);
+    m_Events.AddEvent("onPedWeaponGiven", "weaponID, weaponAmmo, weaponSlot", nullptr, false);
     m_Events.AddEvent("onPedWeaponTaken", "weaponID, weaponAmmo, weaponSlot", nullptr, false);
 
     // Element events

Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp

@@ -4828,12 +4828,8 @@ bool CStaticFunctionDefinitions::GiveWeapon(CElement* pElement, unsigned char uc
                 arguments.PushNumber(ucWeaponID);
                 arguments.PushNumber(usAmmo);
                 arguments.PushNumber(ucWeaponSlot);
-                if (IS_PLAYER(pElement))
-                    if (!pPed->CallEvent("onPlayerWeaponGiven", arguments))
-                        return false;
-                else
-                    if (!pPed->CallEvent("onPedWeaponGiven", arguments))
-                        return false;
+                if (!pPed->CallEvent(IS_PLAYER(pElement) ? "onPlayerWeaponGiven" : "onPedWeaponGiven", arguments))
+                    return false;
 
                 pPed->SetWeaponType(ucWeaponID, ucWeaponSlot);
                 if (bSetAsCurrent)
@@ -4963,19 +4959,11 @@ bool CStaticFunctionDefinitions::TakeAllWeapons(CElement* pElement)
                     arguments.PushNumber(ucAmmo);
                     arguments.PushNumber(ucWeaponSlot);
 
-                    bool bTake = true;
-                    if (IS_PLAYER(pElement))
-                    {
-                        if (!pPed->CallEvent("onPlayerWeaponTaken", arguments))
-                            bTake = false;
-                    }
-                    else
-                    {
-                        if (!pPed->CallEvent("onPedWeaponTaken", arguments))
-                            bTake = false;
-                    }
+                    bool shouldTake = true;
+                    if (!pPed->CallEvent(IS_PLAYER(pElement) ? "onPlayerWeaponTaken" : "onPedWeaponTaken", arguments))
+                        shouldTake = false;
 
-                    if (bTake)
+                    if (shouldTake)
                     {
                         CBitStream      BitStream;
                         SWeaponTypeSync weaponType;