Merge commit '799bdc17105c566a705cb93b4f1d1813c23f2ba2' into 4.3.4

Conflicts:
	sql/updates/world/2014_10_27_00_world.sql
	sql/updates/world/2014_10_27_01_world_335.sql
	src/server/game/AuctionHouse/AuctionHouseMgr.cpp
This commit is contained in:
Carbenium committed 2015-07-21 18:30:05 +02:00
commit 68fd138476
10 files changed
+73 -44

No files matched your search

+1 -3
View File
@@ -146,11 +146,9 @@ public:
static bool HandleAHBotRebuildCommand(ChatHandler* /*handler*/, const char* args)
{
char* arg = strtok((char*)args, " ");
if (!arg)
return false;
bool all = false;
if (strcmp(arg, "all") == 0)
if (arg && strcmp(arg, "all") == 0)
all = true;
sAuctionBot->Rebuild(all);