Fixed travis build errors with Talamortis.

# Conflicts:
#	src/authserver/Server/AuthSocket.cpp
#	src/game/AI/SmartScripts/SmartScript.cpp
#	src/game/Calendar/CalendarMgr.cpp
#	src/game/Chat/Channels/Channel.cpp
#	src/game/Conditions/ConditionMgr.cpp
#	src/game/DungeonFinding/LFGMgr.cpp
#	src/game/DungeonFinding/LFGScripts.cpp
#	src/game/Entities/Player/Player.cpp
#	src/game/Entities/Unit/Unit.cpp
#	src/game/Entities/Vehicle/Vehicle.cpp
#	src/game/Guilds/Guild.cpp
#	src/game/Handlers/ChannelHandler.cpp
#	src/game/Handlers/GuildHandler.cpp
#	src/game/Handlers/LFGHandler.cpp
#	src/game/Handlers/LootHandler.cpp
#	src/game/Handlers/MailHandler.cpp
#	src/game/Handlers/MiscHandler.cpp
#	src/game/Handlers/NPCHandler.cpp
#	src/game/Handlers/PetHandler.cpp
#	src/game/Handlers/PetitionsHandler.cpp
#	src/game/Handlers/QueryHandler.cpp
#	src/game/Handlers/QuestHandler.cpp
#	src/game/Movement/MotionMaster.cpp
#	src/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
#	src/game/Server/WorldSession.cpp
#	src/game/Server/WorldSocket.cpp
#	src/game/Spells/SpellEffects.cpp
#	src/scripts/Commands/cs_modify.cpp
This commit is contained in:
Yehonal
2017-08-19 20:31:24 +02:00
parent f794ad2acf
commit bf80a43d78
27 changed files with 44 additions and 85 deletions

View File

@@ -685,10 +685,8 @@ void Channel::List(Player const* player)
}
#ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_CHATSYS, "SMSG_CHANNEL_LIST %s Channel: %s",
sLog->outDebug(LOG_FILTER_CHATSYS, "SMSG_CHANNEL_LIST %s Channel: %s", player->GetSession()->GetPlayerInfo().c_str(), GetName().c_str());
#endif
// player->GetSession()->GetPlayerInfo().c_str(), GetName().c_str());
WorldPacket data(SMSG_CHANNEL_LIST, 1+(GetName().size()+1)+1+4+playersStore.size()*(8+1));
data << uint8(1); // channel type?
data << GetName(); // channel name