josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Commands: Fix npc add commands and add check for npc add item to ensure a creature is selected. Patch by Paradox (thanks to rothmans92 for reporting the problem)

Browse Source 
--HG--
branch : trunk
This commit is contained in:
Shocker
2010-11-15 02:45:48 +02:00
parent 0aad81fbbf
commit 43588a272d
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/Commands/cs_npc.cpp
+9 -4
View File
@@ -38,7 +38,6 @@ class npc_commandscript : public CommandScript
{ {
static ChatCommand npcAddCommandTable[] = static ChatCommand npcAddCommandTable[] =
{ {
{ "", SEC_GAMEMASTER, false, &HandleNpcAddCommand, "", NULL },
{ "formation", SEC_MODERATOR, false, &HandleNpcAddFormationCommand, "", NULL }, { "formation", SEC_MODERATOR, false, &HandleNpcAddFormationCommand, "", NULL },
{ "item", SEC_GAMEMASTER, false, &HandleNpcAddVendorItemCommand, "", NULL }, { "item", SEC_GAMEMASTER, false, &HandleNpcAddVendorItemCommand, "", NULL },
{ "move", SEC_GAMEMASTER, false, &HandleNpcAddMoveCommand, "", NULL }, { "move", SEC_GAMEMASTER, false, &HandleNpcAddMoveCommand, "", NULL },
@@ -46,18 +45,19 @@ class npc_commandscript : public CommandScript
//{ TODO: fix or remove this commands //{ TODO: fix or remove this commands
{ "weapon", SEC_ADMINISTRATOR, false, &HandleNpcAddWeaponCommand, "", NULL }, { "weapon", SEC_ADMINISTRATOR, false, &HandleNpcAddWeaponCommand, "", NULL },
//} //}
{ "", SEC_GAMEMASTER, false, &HandleNpcAddCommand, "", NULL },
{ NULL, 0, false, NULL, "", NULL } { NULL, 0, false, NULL, "", NULL }
}; };
static ChatCommand npcDeleteCommandTable[] = static ChatCommand npcDeleteCommandTable[] =
{ {
{ "", SEC_GAMEMASTER, false, &HandleNpcDeleteCommand, "", NULL },
{ "item", SEC_GAMEMASTER, false, &HandleNpcDeleteVendorItemCommand, "", NULL }, { "item", SEC_GAMEMASTER, false, &HandleNpcDeleteVendorItemCommand, "", NULL },
{ "", SEC_GAMEMASTER, false, &HandleNpcDeleteCommand, "", NULL },
{ NULL, 0, false, NULL, "", NULL } { NULL, 0, false, NULL, "", NULL }
}; };
static ChatCommand npcFollowCommandTable[] = static ChatCommand npcFollowCommandTable[] =
{ {
{ "", SEC_GAMEMASTER, false, &HandleNpcFollowCommand, "", NULL },
{ "stop", SEC_GAMEMASTER, false, &HandleNpcUnFollowCommand, "", NULL }, { "stop", SEC_GAMEMASTER, false, &HandleNpcUnFollowCommand, "", NULL },
{ "", SEC_GAMEMASTER, false, &HandleNpcFollowCommand, "", NULL },
{ NULL, 0, false, NULL, "", NULL } { NULL, 0, false, NULL, "", NULL }
}; };
static ChatCommand npcSetCommandTable[] = static ChatCommand npcSetCommandTable[] =
@@ -183,8 +183,13 @@ class npc_commandscript : public CommandScript
char* fextendedcost = strtok(NULL, " "); //add ExtendedCost, default: 0 char* fextendedcost = strtok(NULL, " "); //add ExtendedCost, default: 0
uint32 extendedcost = fextendedcost ? atol(fextendedcost) : 0; uint32 extendedcost = fextendedcost ? atol(fextendedcost) : 0;
Creature* vendor = handler->getSelectedCreature(); Creature* vendor = handler->getSelectedCreature();
if (!vendor)
{
handler->SendSysMessage(LANG_SELECT_CREATURE);
handler->SetSentErrorMessage(true);
return false;
}
uint32 vendor_entry = vendor ? vendor->GetEntry() : 0; uint32 vendor_entry = vendor ? vendor->GetEntry() : 0;