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
+2 -4
View File
@@ -1993,10 +1993,8 @@ void Spell::SendLoot(uint64 guid, LootType loottype)
if (!gameObjTarget->isSpawned() && !player->IsGameMaster())
{
#ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outError("Possible hacking attempt: Player %s [guid: %u] tried to loot a gameobject [entry: %u id: %u] which is on respawn time without being in GM mode!",
#endif
// player->GetName().c_str(), player->GetGUIDLow(), gameObjTarget->GetEntry(), gameObjTarget->GetGUIDLow());
return;
sLog->outError("Possible hacking attempt: Player %s [guid: %u] tried to loot a gameobject [entry: %u id: %u] which is on respawn time without being in GM mode!", player->GetName().c_str(), player->GetGUIDLow(), gameObjTarget->GetEntry(), gameObjTarget->GetGUIDLow());
#endif return;
}
// special case, already has GossipHello inside so return and avoid calling twice
if (gameObjTarget->GetGoType() == GAMEOBJECT_TYPE_GOOBER)