Make suggested changes

Author: Nico8340

Client/mods/deathmatch/logic/CClientGame.cpp

@@ -4415,13 +4415,9 @@ bool CClientGame::ApplyPedDamageFromGame(eWeaponType weaponUsed, float fDamage,
 
             if (IS_PLAYER(pDamagedPed) && pDamagedPed->IsLocalPlayer() && g_pNet->CanServerBitStream(eBitStreamVersion::PlayerDamageCancelled))
             {
-                if (auto stream = g_pNet->AllocateNetBitStream())
+                if (auto* stream = g_pNet->AllocateNetBitStream())
                 {
-                    if (pInflictingEntity)
-                        stream->Write(pInflictingEntity->GetID());
-                    else
-                        stream->Write(0);
-
+                    stream->Write(pInflictingEntity ? pInflictingEntity->GetID() : 0);
                     stream->Write(static_cast<std::uint8_t>(weaponUsed));
                     stream->Write(static_cast<std::uint8_t>(hitZone));
                     stream->Write(fDamage);

Server/mods/deathmatch/logic/CGame.cpp

@@ -4315,7 +4315,7 @@ void CGame::Packet_PlayerWorldSpecialProperty(CPlayerWorldSpecialPropertyPacket&
     player->CallEvent("onPlayerChangesWorldSpecialProperty", arguments, nullptr);
 }
 
-void CGame::Packet_PlayerDamageCancelled(CPlayerDamageCancelledPacket& packet) noexcept
+void CGame::Packet_PlayerDamageCancelled(CPlayerDamageCancelledPacket& packet)
 {
     CPlayer* player = packet.GetSourcePlayer();
 

Server/mods/deathmatch/logic/CGame.h

@@ -519,7 +519,7 @@ class CGame
     void Packet_PlayerNetworkStatus(class CPlayerNetworkStatusPacket& Packet);
     void Packet_PlayerResourceStart(class CPlayerResourceStartPacket& Packet);
     void Packet_PlayerWorldSpecialProperty(class CPlayerWorldSpecialPropertyPacket& packet) noexcept;
-    void Packet_PlayerDamageCancelled(class CPlayerDamageCancelledPacket& packet) noexcept;
+    void Packet_PlayerDamageCancelled(class CPlayerDamageCancelledPacket& packet);
 
     static void PlayerCompleteConnect(CPlayer* pPlayer);
 

Server/mods/deathmatch/logic/packets/CPlayerDamageCancelledPacket.cpp

@@ -11,7 +11,7 @@
 #include "StdInc.h"
 #include "CPlayerDamageCancelledPacket.h"
 
-bool CPlayerDamageCancelledPacket::Read(NetBitStreamInterface& stream) noexcept
+bool CPlayerDamageCancelledPacket::Read(NetBitStreamInterface& stream)
 {
     stream.Read(m_attacker);
     stream.Read(m_cause);

Server/mods/deathmatch/logic/packets/CPlayerDamageCancelledPacket.h

@@ -23,7 +23,7 @@ class CPlayerDamageCancelledPacket final : public CPacket
     unsigned long           GetFlags() const noexcept { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }
     virtual ePacketOrdering GetPacketOrdering() const noexcept { return PACKET_ORDERING_DEFAULT; }
 
-    bool Read(NetBitStreamInterface& stream) noexcept;
+    bool Read(NetBitStreamInterface& stream);
 
     std::uint32_t GetAttacker() const noexcept { return m_attacker; }
     std::uint8_t GetCause() const noexcept { return m_cause; }