diff options
| author | Shocker <none@none> | 2010-11-15 02:45:48 +0200 |
|---|---|---|
| committer | Shocker <none@none> | 2010-11-15 02:45:48 +0200 |
| commit | 43588a272d0d62f6e357720464a5f9584eb48b32 (patch) | |
| tree | 2f7f6b46ee2d06c1e1fd1051b85d772f66771d4c /src/server/scripts/Commands | |
| parent | 0aad81fbbf9542c54c62340ba690eba0bf75ebf4 (diff) | |
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)
--HG--
branch : trunk
Diffstat (limited to 'src/server/scripts/Commands')
| -rw-r--r-- | src/server/scripts/Commands/cs_npc.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/server/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp index d155eb44377..5da54bc72fc 100644 --- a/src/server/scripts/Commands/cs_npc.cpp +++ b/src/server/scripts/Commands/cs_npc.cpp @@ -38,7 +38,6 @@ class npc_commandscript : public CommandScript { static ChatCommand npcAddCommandTable[] = { - { "", SEC_GAMEMASTER, false, &HandleNpcAddCommand, "", NULL }, { "formation", SEC_MODERATOR, false, &HandleNpcAddFormationCommand, "", NULL }, { "item", SEC_GAMEMASTER, false, &HandleNpcAddVendorItemCommand, "", NULL }, { "move", SEC_GAMEMASTER, false, &HandleNpcAddMoveCommand, "", NULL }, @@ -46,18 +45,19 @@ class npc_commandscript : public CommandScript //{ TODO: fix or remove this commands { "weapon", SEC_ADMINISTRATOR, false, &HandleNpcAddWeaponCommand, "", NULL }, //} + { "", SEC_GAMEMASTER, false, &HandleNpcAddCommand, "", NULL }, { NULL, 0, false, NULL, "", NULL } }; static ChatCommand npcDeleteCommandTable[] = { - { "", SEC_GAMEMASTER, false, &HandleNpcDeleteCommand, "", NULL }, { "item", SEC_GAMEMASTER, false, &HandleNpcDeleteVendorItemCommand, "", NULL }, + { "", SEC_GAMEMASTER, false, &HandleNpcDeleteCommand, "", NULL }, { NULL, 0, false, NULL, "", NULL } }; static ChatCommand npcFollowCommandTable[] = { - { "", SEC_GAMEMASTER, false, &HandleNpcFollowCommand, "", NULL }, { "stop", SEC_GAMEMASTER, false, &HandleNpcUnFollowCommand, "", NULL }, + { "", SEC_GAMEMASTER, false, &HandleNpcFollowCommand, "", NULL }, { NULL, 0, false, NULL, "", NULL } }; static ChatCommand npcSetCommandTable[] = @@ -183,8 +183,13 @@ class npc_commandscript : public CommandScript char* fextendedcost = strtok(NULL, " "); //add ExtendedCost, default: 0 uint32 extendedcost = fextendedcost ? atol(fextendedcost) : 0; - Creature* vendor = handler->getSelectedCreature(); + if (!vendor) + { + handler->SendSysMessage(LANG_SELECT_CREATURE); + handler->SetSentErrorMessage(true); + return false; + } uint32 vendor_entry = vendor ? vendor->GetEntry() : 0; |