Merge remote-tracking branch 'origin/master' into 4.3.4

Conflicts:
	src/server/game/AI/EventAI/CreatureEventAI.h
	src/server/game/Achievements/AchievementMgr.h
	src/server/game/Battlegrounds/Battleground.h
	src/server/game/DataStores/DBCEnums.h
	src/server/game/Entities/Object/ObjectDefines.h
	src/server/game/Entities/Object/Updates/UpdateFields.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Unit/Unit.h
	src/server/game/Groups/Group.h
	src/server/game/Guilds/Guild.h
	src/server/game/Instances/InstanceScript.h
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Movement/Spline/MoveSplineFlag.h
	src/server/game/OutdoorPvP/OutdoorPvP.h
	src/server/game/Quests/QuestDef.h
	src/server/game/Spells/Spell.h
	src/server/game/Spells/SpellInfo.h

1 files changed, 5 insertions, 5 deletions

diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp
index ae9c5364308..90b87796fff 100644
--- a/src/server/scripts/Commands/cs_misc.cpp
+++ b/src/server/scripts/Commands/cs_misc.cpp
@@ -953,8 +953,8 @@ public:
         if (!player_str)
             return false;
 
-        char* location_str = strtok(NULL, "");
-        if (!location_str)
+        std::string location_str = strtok(NULL, "");
+        if (location_str.empty())
             location_str = "inn";
 
         Player* player = NULL;
@@ -969,19 +969,19 @@ public:
             return false;
         }
 
-        if (!stricmp(location_str, "inn"))
+        if (location_str == "inn")
         {
             player->TeleportTo(player->m_homebindMapId, player->m_homebindX, player->m_homebindY, player->m_homebindZ, player->GetOrientation());
             return true;
         }
 
-        if (!stricmp(location_str, "graveyard"))
+        if (location_str == "graveyard")
         {
             player->RepopAtGraveyard();
             return true;
         }
 
-        if (!stricmp(location_str, "startzone"))
+        if (location_str == "startzone")
         {
             player->TeleportTo(player->GetStartPosition());
             return true;