Skip to content

Commit 7f83587

Browse files
authored
Allow additem from console (#281)
1 parent 8909a18 commit 7f83587

2 files changed

Lines changed: 12 additions & 3 deletions

File tree

src/game/ChatCommands/PlayerCommands.cpp

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1078,12 +1078,18 @@ bool ChatHandler::HandleAddItemCommand(char* args)
10781078
}
10791079
}
10801080

1081-
Player* pl = m_session->GetPlayer();
1081+
Player* pl = m_session ? m_session->GetPlayer() : nullptr;
10821082
Player* plTarget = getSelectedPlayer();
10831083
if (!plTarget)
10841084
{
10851085
plTarget = pl;
10861086
}
1087+
if (!plTarget)
1088+
{
1089+
SendSysMessage(LANG_NO_CHAR_SELECTED);
1090+
SetSentErrorMessage(true);
1091+
return false;
1092+
}
10871093

10881094
DETAIL_LOG(GetMangosString(LANG_ADDITEM), itemId, count);
10891095

@@ -1140,7 +1146,10 @@ bool ChatHandler::HandleAddItemCommand(char* args)
11401146
item->SetBinding(false);
11411147
}
11421148

1143-
pl->SendNewItem(item, count, false, true);
1149+
if (pl)
1150+
{
1151+
pl->SendNewItem(item, count, false, true);
1152+
}
11441153
if (pl != plTarget)
11451154
{
11461155
plTarget->SendNewItem(item, count, true, false);

src/game/WorldHandlers/Chat.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -786,7 +786,7 @@ ChatCommand* ChatHandler::getCommandTable()
786786
{ "levelup", SEC_ADMINISTRATOR, true, &ChatHandler::HandleLevelUpCommand, "", NULL },
787787
{ "showarea", SEC_ADMINISTRATOR, true, &ChatHandler::HandleShowAreaCommand, "", NULL },
788788
{ "hidearea", SEC_ADMINISTRATOR, true, &ChatHandler::HandleHideAreaCommand, "", NULL },
789-
{ "additem", SEC_ADMINISTRATOR, false, &ChatHandler::HandleAddItemCommand, "", NULL },
789+
{ "additem", SEC_ADMINISTRATOR, true, &ChatHandler::HandleAddItemCommand, "", NULL },
790790
{ "additemset", SEC_ADMINISTRATOR, false, &ChatHandler::HandleAddItemSetCommand, "", NULL },
791791
{ "bank", SEC_ADMINISTRATOR, false, &ChatHandler::HandleBankCommand, "", NULL },
792792
{ "wchange", SEC_ADMINISTRATOR, false, &ChatHandler::HandleChangeWeatherCommand, "", NULL },

0 commit comments

Comments
 (0)