Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-23 10:26:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Commands:

Browse Source 
* Add remove support for disable command
* Add quest disables support
* Add check for no existent entry
* Fix problems with flags 0
* Fix code style
This commit is contained in:
Vincent-Michael
2012-08-03 15:15:19 +02:00
parent f9cb4280bd
commit cc0ff69ca4
6 changed files with 277 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

316
src/server/scripts/Commands/cs_disable.cpp
View File

@@ -26,6 +26,7 @@ EndScriptData */
#include "ObjectMgr.h"
#include "Chat.h"
#include "DisableMgr.h"
#include "OutdoorPvP.h"
class disable_commandscript : public CommandScript
{
@@ -34,56 +35,230 @@ public:
ChatCommand* GetCommands() const
{
static ChatCommand removeDisableCommandTable[] =
{
{ "spell", SEC_ADMINISTRATOR, true, &HandleRemoveDisableSpellCommand, "", NULL },
{ "quest", SEC_ADMINISTRATOR, true, &HandleRemoveDisableQuestCommand, "", NULL },
{ "map", SEC_ADMINISTRATOR, true, &HandleRemoveDisableMapCommand, "", NULL },
{ "battleground", SEC_ADMINISTRATOR, true, &HandleRemoveDisableBattlegroundCommand, "", NULL },
{ "achievement_criteria", SEC_ADMINISTRATOR, true, &HandleRemoveDisableAchievementCriteriaCommand, "", NULL },
{ "outdoorpvp", SEC_ADMINISTRATOR, true, &HandleRemoveDisableOutdoorPvPCommand, "", NULL },
{ "vmap", SEC_ADMINISTRATOR, true, &HandleRemoveDisableVmapCommand, "", NULL },
{ NULL, 0, false, NULL, "", NULL }
};
static ChatCommand addDisableCommandTable[] =
{
{ "spell", SEC_ADMINISTRATOR, true, &HandleAddDisableSpellCommand, "", NULL },
{ "quest", SEC_ADMINISTRATOR, true, &HandleAddDisableQuestCommand, "", NULL },
{ "map", SEC_ADMINISTRATOR, true, &HandleAddDisableMapCommand, "", NULL },
{ "battleground", SEC_ADMINISTRATOR, true, &HandleAddDisableBattlegroundCommand, "", NULL },
{ "achievement_criteria", SEC_ADMINISTRATOR, true, &HandleAddDisableAchievementCriteriaCommand, "", NULL },
{ "outdoorpvp", SEC_ADMINISTRATOR, true, &HandleAddDisableOutdoorPvPCommand, "", NULL },
{ "vmap", SEC_ADMINISTRATOR, true, &HandleAddDisableVmapCommand, "", NULL },
{ NULL, 0, false, NULL, "", NULL }
};
static ChatCommand disableCommandTable[] =
{
{ "spell", SEC_GAMEMASTER, false, &HandleDisableSpellCommand, "", NULL },
{ "map", SEC_GAMEMASTER, false, &HandleDisableMapCommand, "", NULL },
{ "battleground", SEC_GAMEMASTER, false, &HandleDisableBattlegroundCommand, "", NULL },
{ "achievement_criteria", SEC_GAMEMASTER, false, &HandleDisableAchievementCriteriaCommand, "", NULL },
{ "outdoorpvp", SEC_GAMEMASTER, false, &HandleDisableOutdoorPvPCommand, "", NULL },
{ "vmap", SEC_GAMEMASTER, false, &HandleDisableVmapCommand, "", NULL },
{ NULL, 0, false, NULL, "", NULL }
};
{ "add", SEC_ADMINISTRATOR, true, NULL, "", addDisableCommandTable },
{ "remove", SEC_ADMINISTRATOR, true, NULL, "", removeDisableCommandTable },
{ NULL, 0, false, NULL, "", NULL }
};
static ChatCommand commandTable[] =
{
{ "disable", SEC_GAMEMASTER, false, NULL, "", disableCommandTable },
{ NULL, 0, false, NULL, "", NULL }
{ "disable", SEC_ADMINISTRATOR, false, NULL, "", disableCommandTable },
{ NULL, 0, false, NULL, "", NULL }
};
return commandTable;
}
static void HandleDisables(ChatHandler* handler, char const* args, uint8 disableType)
static bool HandleAddDisables(ChatHandler* handler, char const* args, uint8 disableType)
{
char* cEntry = strtok((char*)args, " ");
if (!cEntry || !atoi(cEntry))
char* entryStr = strtok((char*)args, " ");
if (!entryStr || !atoi(entryStr))
return false;
char* flagsStr = strtok(NULL, " ");
uint8 flags = flagsStr ? uint8(atoi(flagsStr)) : 0;
char* commentStr = strtok(NULL, "");
if (!commentStr)
return false;
std::string disableComment = commentStr;
uint32 entry = uint32(atoi(entryStr));
std::string disableTypeStr = "";
switch (disableType)
{
handler->SendSysMessage("No entry specified.");
return;
case DISABLE_TYPE_SPELL:
{
if (!sSpellMgr->GetSpellInfo(entry))
{
handler->PSendSysMessage(LANG_COMMAND_NOSPELLFOUND);
handler->SetSentErrorMessage(true);
return false;
}
disableTypeStr = "spell";
break;
}
case DISABLE_TYPE_QUEST:
{
if (!sObjectMgr->GetQuestTemplate(entry))
{
handler->PSendSysMessage(LANG_COMMAND_QUEST_NOTFOUND, entry);
handler->SetSentErrorMessage(true);
return false;
}
disableTypeStr = "quest";
break;
}
case DISABLE_TYPE_MAP:
{
if (!sMapStore.LookupEntry(entry))
{
handler->PSendSysMessage(LANG_COMMAND_NOMAPFOUND);
handler->SetSentErrorMessage(true);
return false;
}
disableTypeStr = "map";
break;
}
case DISABLE_TYPE_BATTLEGROUND:
{
if (!sBattlemasterListStore.LookupEntry(entry))
{
handler->PSendSysMessage(LANG_COMMAND_NO_BATTLEGROUND_FOUND);
handler->SetSentErrorMessage(true);
return false;
}
disableTypeStr = "battleground";
break;
}
case DISABLE_TYPE_ACHIEVEMENT_CRITERIA:
{
if (!sAchievementCriteriaStore.LookupEntry(entry))
{
handler->PSendSysMessage(LANG_COMMAND_NO_ACHIEVEMENT_CRITERIA_FOUND);
handler->SetSentErrorMessage(true);
return false;
}
disableTypeStr = "achievement criteria";
break;
}
case DISABLE_TYPE_OUTDOORPVP:
{
if (entry > MAX_OUTDOORPVP_TYPES)
{
handler->PSendSysMessage(LANG_COMMAND_NO_OUTDOOR_PVP_FORUND);
handler->SetSentErrorMessage(true);
return false;
}
disableTypeStr = "outdoorpvp";
break;
}
case DISABLE_TYPE_VMAP:
{
if (!sMapStore.LookupEntry(entry))
{
handler->PSendSysMessage(LANG_COMMAND_NOMAPFOUND);
handler->SetSentErrorMessage(true);
return false;
}
disableTypeStr = "vmap";
break;
}
default:
break;
}
PreparedStatement* stmt = NULL;
stmt = WorldDatabase.GetPreparedStatement(WORLD_SEL_DISABLES);
stmt->setUInt32(0, entry);
stmt->setUInt8(1, disableType);
PreparedQueryResult result = WorldDatabase.Query(stmt);
if (result)
{
handler->PSendSysMessage("This %s (Id: %u) is already disabled.", disableTypeStr.c_str(), entry);
handler->SetSentErrorMessage(true);
return false;
}
char* cFlags = strtok(NULL, " ");
if (!cFlags || !atoi(cFlags))
{
handler->SendSysMessage("No flags specified.");
return;
}
stmt = WorldDatabase.GetPreparedStatement(WORLD_INS_DISABLES);
stmt->setUInt32(0, entry);
stmt->setUInt8(1, disableType);
stmt->setUInt16(2, flags);
stmt->setString(3, disableComment);
WorldDatabase.Execute(stmt);
char* cComment = strtok(NULL, "");
if (!cComment)
{
handler->SendSysMessage("No comment specified.");
return;
}
handler->PSendSysMessage("Add Disabled %s (Id: %u) for reason %s", disableTypeStr.c_str(), entry, disableComment.c_str());
return true;
}
std::string entryStr = cEntry;
std::string disableComment = cComment;
uint32 entry = (uint32)atoi(cEntry);
uint8 flags = atoi(cFlags);
static bool HandleAddDisableSpellCommand(ChatHandler* handler, char const* args)
{
if (!*args)
return false;
return HandleAddDisables(handler, args, DISABLE_TYPE_SPELL);
}
static bool HandleAddDisableQuestCommand(ChatHandler* handler, char const* args)
{
if (!*args)
return false;
return HandleAddDisables(handler, args, DISABLE_TYPE_QUEST);
}
static bool HandleAddDisableMapCommand(ChatHandler* handler, char const* args)
{
if (!*args)
return false;
return HandleAddDisables(handler, args, DISABLE_TYPE_MAP);
}
static bool HandleAddDisableBattlegroundCommand(ChatHandler* handler, char const* args)
{
if (!*args)
return false;
return HandleAddDisables(handler, args, DISABLE_TYPE_BATTLEGROUND);
}
static bool HandleAddDisableAchievementCriteriaCommand(ChatHandler* handler, char const* args)
{
if (!*args)
return false;
return HandleAddDisables(handler, args, DISABLE_TYPE_ACHIEVEMENT_CRITERIA);
}
static bool HandleAddDisableOutdoorPvPCommand(ChatHandler* handler, char const* args)
{
if (!*args)
return false;
HandleAddDisables(handler, args, DISABLE_TYPE_OUTDOORPVP);
return true;
}
static bool HandleAddDisableVmapCommand(ChatHandler* handler, char const* args)
{
if (!*args)
return false;
return HandleAddDisables(handler, args, DISABLE_TYPE_VMAP);
}
static bool HandleRemoveDisables(ChatHandler* handler, char const* args, uint8 disableType)
{
char* entryStr = strtok((char*)args, " ");
if (!entryStr || !atoi(entryStr))
return false;
uint32 entry = uint32(atoi(entryStr));
std::string disableTypeStr = "";
@@ -92,6 +267,9 @@ public:
case DISABLE_TYPE_SPELL:
disableTypeStr = "spell";
break;
case DISABLE_TYPE_QUEST:
disableTypeStr = "quest";
break;
case DISABLE_TYPE_MAP:
disableTypeStr = "map";
break;
@@ -109,87 +287,85 @@ public:
break;
}
PreparedStatement* stmt = WorldDatabase.GetPreparedStatement(WORLD_SEL_DISABLES);
PreparedStatement* stmt = NULL;
stmt = WorldDatabase.GetPreparedStatement(WORLD_SEL_DISABLES);
stmt->setUInt32(0, entry);
stmt->setUInt8(1, disableType);
PreparedQueryResult result = WorldDatabase.Query(stmt);
if (result)
stmt->setUInt8(1, disableType);
PreparedQueryResult result = WorldDatabase.Query(stmt);
if (!result)
{
handler->PSendSysMessage("This %s (id %u) is already disabled.", disableTypeStr.c_str(), entry);
return;
handler->PSendSysMessage("This %s (Id: %u) is not disabled.", disableTypeStr.c_str(), entry);
handler->SetSentErrorMessage(true);
return false;
}
PreparedStatement* stmt2 = WorldDatabase.GetPreparedStatement(WORLD_INS_DISABLES);
stmt2->setUInt32(0, entry);
stmt2->setUInt8(1, disableType);
stmt2->setUInt16(2, flags);
stmt2->setString(3, disableComment);
WorldDatabase.Execute(stmt2);
handler->PSendSysMessage("Disabled %s %u for reason %s", disableTypeStr.c_str(), entry, disableComment.c_str());
return;
stmt = WorldDatabase.GetPreparedStatement(WORLD_DEL_DISABLES);
stmt->setUInt32(0, entry);
stmt->setUInt8(1, disableType);
WorldDatabase.Execute(stmt);
handler->PSendSysMessage("Remove Disabled %s (Id: %u)", disableTypeStr.c_str(), entry);
return true;
}
static bool HandleDisableSpellCommand(ChatHandler* handler, char const* args)
static bool HandleRemoveDisableSpellCommand(ChatHandler* handler, char const* args)
{
if (!*args)
return false;
HandleDisables(handler, args, DISABLE_TYPE_SPELL);
return true;
return HandleRemoveDisables(handler, args, DISABLE_TYPE_SPELL);
}
static bool HandleDisableMapCommand(ChatHandler* handler, char const* args)
static bool HandleRemoveDisableQuestCommand(ChatHandler* handler, char const* args)
{
if (!*args)
return false;
HandleDisables(handler, args, DISABLE_TYPE_MAP);
return true;
return HandleRemoveDisables(handler, args, DISABLE_TYPE_QUEST);
}
static bool HandleDisableBattlegroundCommand(ChatHandler* handler, char const* args)
static bool HandleRemoveDisableMapCommand(ChatHandler* handler, char const* args)
{
if (!*args)
return false;
HandleDisables(handler, args, DISABLE_TYPE_BATTLEGROUND);
return true;
return HandleAddDisables(handler, args, DISABLE_TYPE_MAP);
}
static bool HandleDisableAchievementCriteriaCommand(ChatHandler* handler, char const* args)
static bool HandleRemoveDisableBattlegroundCommand(ChatHandler* handler, char const* args)
{
if (!*args)
return false;
HandleDisables(handler, args, DISABLE_TYPE_ACHIEVEMENT_CRITERIA);
return true;
return HandleRemoveDisables(handler, args, DISABLE_TYPE_BATTLEGROUND);
}
static bool HandleDisableOutdoorPvPCommand(ChatHandler* handler, char const* args)
static bool HandleRemoveDisableAchievementCriteriaCommand(ChatHandler* handler, char const* args)
{
if (!*args)
return false;
HandleDisables(handler, args, DISABLE_TYPE_OUTDOORPVP);
return true;
return HandleRemoveDisables(handler, args, DISABLE_TYPE_ACHIEVEMENT_CRITERIA);
}
static bool HandleDisableVmapCommand(ChatHandler* handler, char const* args)
static bool HandleRemoveDisableOutdoorPvPCommand(ChatHandler* handler, char const* args)
{
if (!*args)
return false;
HandleDisables(handler, args, DISABLE_TYPE_VMAP);
return true;
return HandleRemoveDisables(handler, args, DISABLE_TYPE_OUTDOORPVP);
}
static bool HandleRemoveDisableVmapCommand(ChatHandler* handler, char const* args)
{
if (!*args)
return false;
return HandleRemoveDisables(handler, args, DISABLE_TYPE_VMAP);
}
};
void AddSC_disable_commandscript()
{
new disable_commandscript();
}
}