From 03aa915a05f9fe0876ead8f3c5d976445a06c5e9 Mon Sep 17 00:00:00 2001
From: Kelsi <kelsihates2fa@gmail.com>
Date: Wed, 25 Mar 2026 13:02:49 -0700
Subject: [PATCH] refactor: move packetHasRemaining into Packet::hasRemaining
 method

Add Packet::hasRemaining(size_t) and remove free function from
game_handler.cpp. Replaces 8 call sites with method calls.
---
 include/network/packet.hpp |  1 +
 src/game/game_handler.cpp  | 22 ++++++++--------------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/include/network/packet.hpp b/include/network/packet.hpp
index c53ad671..90899769 100644
--- a/include/network/packet.hpp
+++ b/include/network/packet.hpp
@@ -34,6 +34,7 @@ public:
     size_t getReadPos() const { return readPos; }
     size_t getSize() const { return data.size(); }
     size_t getRemainingSize() const { return data.size() - readPos; }
+    bool hasRemaining(size_t need) const { return readPos <= data.size() && need <= (data.size() - readPos); }
     bool hasFullPackedGuid() const {
         if (readPos >= data.size()) return false;
         uint8_t mask = data[readPos];
diff --git a/src/game/game_handler.cpp b/src/game/game_handler.cpp
index a85f3131..7d4109ce 100644
--- a/src/game/game_handler.cpp
+++ b/src/game/game_handler.cpp
@@ -169,12 +169,6 @@ float slowUpdateObjectBlockLogThresholdMs() {
 
 constexpr size_t kMaxQueuedInboundPackets = 4096;
 
-bool packetHasRemaining(const network::Packet& packet, size_t need) {
-    const size_t size = packet.getSize();
-    const size_t pos = packet.getReadPos();
-    return pos <= size && need <= (size - pos);
-}
-
 CombatTextEntry::Type combatTextTypeFromSpellMissInfo(uint8_t missInfo) {
     switch (missInfo) {
         case 0: return CombatTextEntry::MISS;
@@ -7587,7 +7581,7 @@ void GameHandler::registerOpcodeHandlers() {
     dispatchTable_[Opcode::SMSG_KICK_REASON] = [this](network::Packet& packet) {
         // uint64 kickerGuid + uint32 kickReasonType + null-terminated reason string
         // kickReasonType: 0=other, 1=afk, 2=vote kick
-        if (!packetHasRemaining(packet, 12)) {
+        if (!packet.hasRemaining(12)) {
             packet.setReadPos(packet.getSize());
             return;
         }
@@ -7613,7 +7607,7 @@ void GameHandler::registerOpcodeHandlers() {
     // uint32 throttleMs — rate-limited group action; notify the player
     dispatchTable_[Opcode::SMSG_GROUPACTION_THROTTLED] = [this](network::Packet& packet) {
         // uint32 throttleMs — rate-limited group action; notify the player
-        if (packetHasRemaining(packet, 4)) {
+        if (packet.hasRemaining(4)) {
             uint32_t throttleMs = packet.readUInt32();
             char buf[128];
             if (throttleMs > 0) {
@@ -7632,7 +7626,7 @@ void GameHandler::registerOpcodeHandlers() {
     dispatchTable_[Opcode::SMSG_GMRESPONSE_RECEIVED] = [this](network::Packet& packet) {
         // WotLK 3.3.5a: uint32 ticketId + string subject + string body + uint32 count
         //   per count: string responseText
-        if (!packetHasRemaining(packet, 4)) {
+        if (!packet.hasRemaining(4)) {
             packet.setReadPos(packet.getSize());
             return;
         }
@@ -7642,7 +7636,7 @@ void GameHandler::registerOpcodeHandlers() {
         if (packet.getReadPos() < packet.getSize()) subject = packet.readString();
         if (packet.getReadPos() < packet.getSize()) body    = packet.readString();
         uint32_t responseCount = 0;
-        if (packetHasRemaining(packet, 4))
+        if (packet.hasRemaining(4))
             responseCount = packet.readUInt32();
         std::string responseText;
         for (uint32_t i = 0; i < responseCount && i < 10; ++i) {
@@ -16562,7 +16556,7 @@ void GameHandler::handleLfgUpdatePlayer(network::Packet& packet) {
 }
 
 void GameHandler::handleLfgPlayerReward(network::Packet& packet) {
-    if (!packetHasRemaining(packet, 4 + 4 + 1 + 4 + 4 + 4)) return;
+    if (!packet.hasRemaining(4 + 4 + 1 + 4 + 4 + 4)) return;
 
     /*uint32_t randomDungeonEntry =*/ packet.readUInt32();
     /*uint32_t dungeonEntry       =*/ packet.readUInt32();
@@ -16585,9 +16579,9 @@ void GameHandler::handleLfgPlayerReward(network::Packet& packet) {
     std::string rewardMsg = std::string("Dungeon Finder reward: ") + moneyBuf +
                             ", " + std::to_string(xp) + " XP";
 
-    if (packetHasRemaining(packet, 4)) {
+    if (packet.hasRemaining(4)) {
         uint32_t rewardCount = packet.readUInt32();
-        for (uint32_t i = 0; i < rewardCount && packetHasRemaining(packet, 9); ++i) {
+        for (uint32_t i = 0; i < rewardCount && packet.hasRemaining(9); ++i) {
             uint32_t itemId    = packet.readUInt32();
             uint32_t itemCount = packet.readUInt32();
             packet.readUInt8();  // unk
@@ -16610,7 +16604,7 @@ void GameHandler::handleLfgPlayerReward(network::Packet& packet) {
 }
 
 void GameHandler::handleLfgBootProposalUpdate(network::Packet& packet) {
-    if (!packetHasRemaining(packet, 7 + 4 + 4 + 4 + 4)) return;
+    if (!packet.hasRemaining(7 + 4 + 4 + 4 + 4)) return;
 
     bool inProgress = packet.readUInt8() != 0;
     /*bool myVote   =*/ packet.readUInt8();   // whether local player has voted