mirror of
https://github.com/mangosfour/server.git
synced 2025-12-16 04:37:00 +00:00
Merge branch 'master' into 303
Conflicts: src/game/CharacterHandler.cpp src/game/Chat.h src/game/Player.h src/game/World.h src/game/debugcmds.cpp
This commit is contained in:
commit
71b1065c8b
50 changed files with 3499 additions and 976 deletions
|
|
@ -30,6 +30,7 @@
|
|||
#include "GossipDef.h"
|
||||
#include "Language.h"
|
||||
#include "MapManager.h"
|
||||
#include "BattleGroundMgr.h"
|
||||
#include <fstream>
|
||||
#include "ObjectMgr.h"
|
||||
|
||||
|
|
@ -520,6 +521,12 @@ bool ChatHandler::HandleGetItemState(const char* args)
|
|||
return true;
|
||||
}
|
||||
|
||||
bool ChatHandler::HandleDebugArenaCommand(const char * /*args*/)
|
||||
{
|
||||
sBattleGroundMgr.ToggleArenaTesting();
|
||||
return true;
|
||||
}
|
||||
|
||||
bool ChatHandler::HandleSpawnVehicle(const char* args)
|
||||
{
|
||||
if(!args)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue