Skip to content

Update #60

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

Open
nl-saw wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update #60

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
79958ea
Merge pull request #1 from nl-saw/hooks-patch-1
nl-saw Feb 24, 2025
f46f7be
Fix item loss message in challenge modes (proper item name display) (#2)
Raz0r1337 Jun 3, 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
Empty file removed data/sql/db-auth/updates/.gitkeep
View file
Open in desktop
Empty file.
Empty file removed data/sql/db-characters/updates/.gitkeep
View file
Open in desktop
Empty file.
24 changes: 18 additions & 6 deletions src/ChallengeModes.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,20 +476,32 @@ class ChallengeMode_SemiHardcore : public ChallengeMode
void OnPlayerKilledByCreature(Creature* /*killer*/, Player* player) override
{
if (!sChallengeModes->challengeEnabledForPlayer(SETTING_SEMI_HARDCORE, player))
{
return;
}

for (uint8 i = 0; i < EQUIPMENT_SLOT_END; ++i)
{
if (Item* pItem = player->GetItemByPos(INVENTORY_SLOT_BAG_0, i))
{
if (pItem->GetTemplate() && !pItem->IsEquipped())
if (!pItem->IsEquipped())
continue;

ItemTemplate const* proto = pItem->GetTemplate();
if (!proto)
continue;
uint8 slot = pItem->GetSlot();
ChatHandler(player->GetSession()).PSendSysMessage("|cffDA70D6You have lost your |cffffffff|Hitem:%d:0:0:0:0:0:0:0:0|h[%s]|h|r", pItem->GetEntry(), pItem->GetTemplate()->Name1.c_str());
player->DestroyItem(INVENTORY_SLOT_BAG_0, slot, true);

std::string itemName = proto->Name1;
if (itemName.empty())
itemName = "Unknown Item";

std::ostringstream msg;
msg << "|cffDA70D6You have lost your |cffffffff|Hitem:" << proto->ItemId
<< ":0:0:0:0:0:0:0:0|h[" << itemName << "]|h|r";
ChatHandler(player->GetSession()).SendSysMessage(msg.str().c_str());

player->DestroyItem(INVENTORY_SLOT_BAG_0, pItem->GetSlot(), true);
}
}

player->SetMoney(0);
}

Expand Down