From 529a2aba97f4467fba0f6fa7367c2bd1be96db3e Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 7 Oct 2025 19:27:15 +0000
Subject: [PATCH 1/2] Initial plan


From e63d424404bff0379dfa0fd755376700c7ddd94a Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 7 Oct 2025 19:34:48 +0000
Subject: [PATCH 2/2] Fix ObjectGuid constructor calls for automerge
 compatibility

Co-authored-by: Rochet2 <468816+Rochet2@users.noreply.github.com>
---
 src/server/game/Entities/Item/Reforging.cpp      | 2 +-
 src/server/game/Entities/Player/Player.cpp       | 2 +-
 src/server/scripts/Commands/cs_debug.cpp         | 4 ++--
 src/server/scripts/Custom/Reforging/Reforger.cpp | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/server/game/Entities/Item/Reforging.cpp b/src/server/game/Entities/Item/Reforging.cpp
index 2b05cb07a06ae..166cdd99c91ef 100644
--- a/src/server/game/Entities/Item/Reforging.cpp
+++ b/src/server/game/Entities/Item/Reforging.cpp
@@ -56,7 +56,7 @@ void RemoveReforge(Player* player, uint32 itemguid, bool update)
         player->reforgeMap.find(itemguid) == player->reforgeMap.end())
         return;
 
-    Item* invItem = update ? player->GetItemByGuid(ObjectGuid(HighGuid::Item, 0, itemguid)) : NULL;
+    Item* invItem = update ? player->GetItemByGuid(ObjectGuid(HighGuid::Item, itemguid)) : NULL;
     if (invItem && invItem->IsEquipped())
         player->_ApplyItemMods(invItem, invItem->GetSlot(), false);
     player->reforgeMap.erase(itemguid);
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 8fd45bed0e135..6b38a1b665ccf 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -4098,7 +4098,7 @@ void Player::DeleteFromDB(ObjectGuid playerguid, uint32 accountId, bool updateRe
             {
                 do
                 {
-                    if (Player* playerFriend = ObjectAccessor::FindPlayer(ObjectGuid(HighGuid::Player, 0, (*resultFriends)[0].GetUInt32())))
+                    if (Player* playerFriend = ObjectAccessor::FindPlayer(ObjectGuid(HighGuid::Player, (*resultFriends)[0].GetUInt32())))
                     {
                         playerFriend->GetSocial()->RemoveFromSocialList(playerguid, SOCIAL_FLAG_ALL);
                         sSocialMgr->SendFriendStatus(playerFriend, FRIEND_REMOVED, playerguid);
diff --git a/src/server/scripts/Commands/cs_debug.cpp b/src/server/scripts/Commands/cs_debug.cpp
index a99ad2e87524f..4e3d9d9a704ec 100644
--- a/src/server/scripts/Commands/cs_debug.cpp
+++ b/src/server/scripts/Commands/cs_debug.cpp
@@ -1055,7 +1055,7 @@ class debug_commandscript : public CommandScript
 
     static bool HandleDebugGetItemValueCommand(ChatHandler* handler, ObjectGuid::LowType guid, uint32 index)
     {
-        Item* i = handler->GetPlayer()->GetItemByGuid(ObjectGuid(HighGuid::Item, 0, guid));
+        Item* i = handler->GetPlayer()->GetItemByGuid(ObjectGuid(HighGuid::Item, guid));
 
         if (!i)
             return false;
@@ -1072,7 +1072,7 @@ class debug_commandscript : public CommandScript
 
     static bool HandleDebugSetItemValueCommand(ChatHandler* handler, ObjectGuid::LowType guid, uint32 index, uint32 value)
     {
-        Item* i = handler->GetPlayer()->GetItemByGuid(ObjectGuid(HighGuid::Item, 0, guid));
+        Item* i = handler->GetPlayer()->GetItemByGuid(ObjectGuid(HighGuid::Item, guid));
 
         if (!i)
             return false;
diff --git a/src/server/scripts/Custom/Reforging/Reforger.cpp b/src/server/scripts/Custom/Reforging/Reforger.cpp
index f934c5a0170d8..4a5ba8bd40c25 100644
--- a/src/server/scripts/Custom/Reforging/Reforger.cpp
+++ b/src/server/scripts/Custom/Reforging/Reforger.cpp
@@ -195,7 +195,7 @@ class REFORGE_PLAYER : public PlayerScript
             do
             {
                 uint32 lowGUID = (*result)[0].GetUInt32();
-                Item* invItem = player->GetItemByGuid(ObjectGuid(HighGuid::Item, 0, lowGUID));
+                Item* invItem = player->GetItemByGuid(ObjectGuid(HighGuid::Item, lowGUID));
                 if (invItem && invItem->IsEquipped())
                     player->_ApplyItemMods(invItem, invItem->GetSlot(), false);
                 ReforgeData& data = player->reforgeMap[lowGUID];
@@ -423,7 +423,7 @@ class REFORGER_NPC : public CreatureScript
                 case RESTORE:
                     // sender = item guidlow
                     {
-                        if (player->GetItemByGuid(ObjectGuid(HighGuid::Item, 0, sender)))
+                        if (player->GetItemByGuid(ObjectGuid(HighGuid::Item, sender)))
                         {
                             if (!player->reforgeMap.empty() && player->reforgeMap.find(sender) != player->reforgeMap.end())
                                 RemoveReforge(player, sender, true);