Skip to content

Fix ObjectGuid constructor calls for TrinityCore automerge compatibility #163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Copilot wants to merge 2 commits into
base: reforging_3.3.5
Choose a base branch
from
Draft

Fix ObjectGuid constructor calls for TrinityCore automerge compatibility #163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
529a2ab
Initial plan
Copilot Oct 7, 2025
e63d424
Fix ObjectGuid constructor calls for automerge compatibility
Copilot Oct 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/server/game/Entities/Item/Reforging.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/server/game/Entities/Player/Player.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions src/server/scripts/Commands/cs_debug.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/server/scripts/Custom/Reforging/Reforger.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand Down Expand Up @@ -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);
Expand Down