diff --git a/sql/mangos.sql b/sql/mangos.sql index 235176431..b12ef24f3 100644 --- a/sql/mangos.sql +++ b/sql/mangos.sql @@ -23,7 +23,7 @@ DROP TABLE IF EXISTS `db_version`; CREATE TABLE `db_version` ( `version` varchar(120) default NULL, `creature_ai_version` varchar(120) default NULL, - `required_7705_01_mangos_command` bit(1) default NULL + `required_7706_01_mangos_command` bit(1) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes'; -- @@ -444,7 +444,6 @@ INSERT INTO `command` VALUES ('pdump write',3,'Syntax: .pdump write $filename $playerNameOrGUID\r\nWrite character dump with name/guid $playerNameOrGUID to file $filename.'), ('pdump load',3,'Syntax: .pdump load $filename $account [$newname] [$newguid]\r\nLoad character dump from dump file into character list of $account with saved or $newname, with saved (or first free) or $newguid guid.'), ('pinfo',2,'Syntax: .pinfo [$player_name] [rep]\r\n\r\nOutput account information for selected player or player find by $player_name. If \"rep\" parameter provided show reputation information for player.'), -('plimit',3,'Syntax: .plimit [#num|-1|-2|-3|reset|player|moderator|gamemaster|administrator]\r\n\r\nWithout arg show current player amount and security level limitations for login to server, with arg set player linit ($num > 0) or securiti limitation ($num < 0 or security leme name. With `reset` sets player limit to the one in the config file'), ('quest add',3,'Syntax: .quest add #quest_id\r\n\r\nAdd to character quest log quest #quest_id. Quest started from item can\'t be added by this command but correct .additem call provided in command output.'), ('quest complete',3,'Syntax: .quest complete #questid\r\nMark all quest objectives as completed for target character active quest. After this target character can go and get quest reward.'), ('quest remove',3,'Syntax: .quest remove #quest_id\r\n\r\nSet quest #quest_id state to not completed and not active (and remove from active quest list) for selected player.'), @@ -480,6 +479,7 @@ INSERT INTO `command` VALUES ('server idlerestart',3,'Syntax: .server idlerestart #delay\r\n\r\nRestart the server after #delay seconds if no active connections are present (no players). Use #exist_code or 2 as program exist code.'), ('server idlerestart cancel',3,'Syntax: .server idlerestart cancel\r\n\r\nCancel the restart/shutdown timer if any.'), ('server motd',0,'Syntax: .server motd\r\n\r\nShow server Message of the day.'), +('server plimit',3,'Syntax: .server plimit [#num|-1|-2|-3|reset|player|moderator|gamemaster|administrator]\r\n\r\nWithout arg show current player amount and security level limitations for login to server, with arg set player linit ($num > 0) or securiti limitation ($num < 0 or security leme name. With `reset` sets player limit to the one in the config file'), ('server restart',3,'Syntax: .server restart #delay\r\n\r\nRestart the server after #delay seconds. Use #exist_code or 2 as program exist code.'), ('server restart cancel',3,'Syntax: .server restart cancel\r\n\r\nCancel the restart/shutdown timer if any.'), ('server set loglevel',4,'Syntax: .server set loglevel #level\r\n\r\nSet server log level (0 - errors only, 1 - basic, 2 - detail, 3 - debug).'), diff --git a/sql/updates/7706_01_mangos_command.sql b/sql/updates/7706_01_mangos_command.sql new file mode 100644 index 000000000..a57ddcc56 --- /dev/null +++ b/sql/updates/7706_01_mangos_command.sql @@ -0,0 +1,6 @@ +ALTER TABLE db_version CHANGE COLUMN required_7705_01_mangos_command required_7706_01_mangos_command bit; + +DELETE FROM `command` WHERE `name` IN ('plimit','server plimit'); + +INSERT INTO `command` VALUES +('server plimit',3,'Syntax: .server plimit [#num|-1|-2|-3|reset|player|moderator|gamemaster|administrator]\r\n\r\nWithout arg show current player amount and security level limitations for login to server, with arg set player linit ($num > 0) or securiti limitation ($num < 0 or security leme name. With `reset` sets player limit to the one in the config file'); diff --git a/sql/updates/Makefile.am b/sql/updates/Makefile.am index f19b671c2..1d6d055f6 100644 --- a/sql/updates/Makefile.am +++ b/sql/updates/Makefile.am @@ -174,6 +174,7 @@ pkgdata_DATA = \ 7662_01_mangos_spell_chain.sql \ 7662_02_mangos_spell_bonus_data.sql \ 7705_01_mangos_command.sql \ + 7706_01_mangos_command.sql \ README ## Additional files to include when running 'make dist' @@ -328,4 +329,5 @@ EXTRA_DIST = \ 7662_01_mangos_spell_chain.sql \ 7662_02_mangos_spell_bonus_data.sql \ 7705_01_mangos_command.sql \ + 7706_01_mangos_command.sql \ README diff --git a/src/game/Chat.cpp b/src/game/Chat.cpp index 33ce5b4a8..ca40303d5 100644 --- a/src/game/Chat.cpp +++ b/src/game/Chat.cpp @@ -511,6 +511,7 @@ ChatCommand * ChatHandler::getCommandTable() { "idleshutdown", SEC_ADMINISTRATOR, true, NULL, "", serverShutdownCommandTable }, { "info", SEC_PLAYER, true, &ChatHandler::HandleServerInfoCommand, "", NULL }, { "motd", SEC_PLAYER, true, &ChatHandler::HandleServerMotdCommand, "", NULL }, + { "plimit", SEC_ADMINISTRATOR, true, &ChatHandler::HandleServerPLimitCommand, "", NULL }, { "restart", SEC_ADMINISTRATOR, true, NULL, "", serverRestartCommandTable }, { "shutdown", SEC_ADMINISTRATOR, true, NULL, "", serverShutdownCommandTable }, { "set", SEC_ADMINISTRATOR, true, NULL, "", serverSetCommandTable }, @@ -598,7 +599,6 @@ ChatCommand * ChatHandler::getCommandTable() { "unban", SEC_ADMINISTRATOR, true, NULL, "", unbanCommandTable }, { "baninfo", SEC_ADMINISTRATOR, false, NULL, "", baninfoCommandTable }, { "banlist", SEC_ADMINISTRATOR, true, NULL, "", banlistCommandTable }, - { "plimit", SEC_ADMINISTRATOR, true, &ChatHandler::HandlePLimitCommand, "", NULL }, { "start", SEC_PLAYER, false, &ChatHandler::HandleStartCommand, "", NULL }, { "taxicheat", SEC_MODERATOR, false, &ChatHandler::HandleTaxiCheatCommand, "", NULL }, { "linkgrave", SEC_ADMINISTRATOR, false, &ChatHandler::HandleLinkGraveCommand, "", NULL }, diff --git a/src/game/Chat.h b/src/game/Chat.h index 51001a36a..b58e3f2a2 100644 --- a/src/game/Chat.h +++ b/src/game/Chat.h @@ -113,6 +113,10 @@ class ChatHandler bool HandleCastSelfCommand(const char *args); bool HandleCastTargetCommand(const char *args); + bool HandleCharacterCustomizeCommand(const char * args); + bool HandleCharacterDeleteCommand(const char* args); + bool HandleCharacterRenameCommand(const char * args); + bool HandleDebugAnimCommand(const char* args); bool HandleDebugArenaCommand(const char * args); bool HandleDebugBattlegroundCommand(const char * args); @@ -366,9 +370,10 @@ class ChatHandler bool HandleServerIdleShutDownCommand(const char* args); bool HandleServerInfoCommand(const char* args); bool HandleServerMotdCommand(const char* args); + bool HandleServerPLimitCommand(const char* args); bool HandleServerRestartCommand(const char* args); - bool HandleServerSetMotdCommand(const char* args); bool HandleServerSetLogLevelCommand(const char* args); + bool HandleServerSetMotdCommand(const char* args); bool HandleServerShutDownCommand(const char* args); bool HandleServerShutDownCancelCommand(const char* args); @@ -415,12 +420,10 @@ class ChatHandler bool HandleGoTriggerCommand(const char* args); bool HandleGoGraveyardCommand(const char* args); bool HandlePInfoCommand(const char* args); - bool HandlePLimitCommand(const char* args); bool HandleMuteCommand(const char* args); bool HandleUnmuteCommand(const char* args); bool HandleMovegensCommand(const char* args); - bool HandleCharacterDeleteCommand(const char* args); bool HandleGoXYCommand(const char* args); bool HandleGoXYZCommand(const char* args); bool HandleGoZoneXYCommand(const char* args); @@ -457,8 +460,6 @@ class ChatHandler bool HandleMaxSkillCommand(const char* args); bool HandleSetSkillCommand(const char* args); bool HandleRespawnCommand(const char* args); - bool HandleCharacterRenameCommand(const char * args); - bool HandleCharacterCustomizeCommand(const char * args); bool HandlePDumpLoadCommand(const char *args); bool HandlePDumpWriteCommand(const char *args); bool HandleComeToMeCommand(const char *args); diff --git a/src/game/Level3.cpp b/src/game/Level3.cpp index 44bb0ef37..4f904a0d4 100644 --- a/src/game/Level3.cpp +++ b/src/game/Level3.cpp @@ -5917,7 +5917,7 @@ bool ChatHandler::HandleMovegensCommand(const char* /*args*/) return true; } -bool ChatHandler::HandlePLimitCommand(const char *args) +bool ChatHandler::HandleServerPLimitCommand(const char *args) { if(*args) { diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 653102b9e..2b4573cae 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "7705" + #define REVISION_NR "7706" #endif // __REVISION_NR_H__