sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changed DISABLED_ cmake variable to ENABLED_ and implemented for all disabled logs

Browse Source
This commit is contained in:
Yehonal
2017-08-19 19:42:48 +02:00
parent f888e8c86b
commit c1586e0d99
109 changed files with 3620 additions and 1228 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/config.cmake.dist
+3 -3
View File
@@ -8,6 +8,6 @@ option(WITH_COREDEBUG "Include additional debug-code in core"
option(WITH_PERFTOOLS "Enable compilation with gperftools libraries included" 0) option(WITH_PERFTOOLS "Enable compilation with gperftools libraries included" 0)
option(WITH_MESHEXTRACTOR "Build meshextractor (alpha)" 0) option(WITH_MESHEXTRACTOR "Build meshextractor (alpha)" 0)
option(WITHOUT_GIT "Disable the GIT testing routines" 0) option(WITHOUT_GIT "Disable the GIT testing routines" 0)
option(DISABLE_EXTRAS "Set to 1 to disable extra features optimizing performances" 0) option(ENABLE_EXTRAS "Set to 0 to disable extra features optimizing performances" 1)
option(DISABLE_VMAP_CHECKS "Remove DisableMgr Checks on vmap" 0) option(ENABLE_VMAP_CHECKS "Enable Checks relative to DisableMgr system on vmap" 1)
option(DISABLE_EXTRA_LOGS "Disable extra log functions that can be CPU intensive" 1) option(ENABLE_EXTRA_LOGS "Enable extra log functions that can be CPU intensive" 0)
modules/worldengine/lib-collision/src/Management/MMapManager.cpp
+40 -14
View File
@@ -34,7 +34,7 @@ namespace MMAP
FILE* file = fopen(fileName, "rb"); FILE* file = fopen(fileName, "rb");
if (!file) if (!file)
{ {
#if defined(DISABLE_EXTRAS) || defined(DISABLE_EXTRA_LOGS) #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_MAPS, "MMAP:loadMapData: Error: Could not open mmap file '%s'", fileName); sLog->outDebug(LOG_FILTER_MAPS, "MMAP:loadMapData: Error: Could not open mmap file '%s'", fileName);
#endif #endif
delete [] fileName; delete [] fileName;
@@ -63,7 +63,9 @@ namespace MMAP
delete [] fileName; delete [] fileName;
;//sLog->outDetail("MMAP:loadMapData: Loaded %03i.mmap", mapId); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("MMAP:loadMapData: Loaded %03i.mmap", mapId);
#endif
// store inside our map list // store inside our map list
MMapData* mmap_data = new MMapData(mesh); MMapData* mmap_data = new MMapData(mesh);
@@ -117,7 +119,9 @@ namespace MMAP
FILE *file = fopen(fileName, "rb"); FILE *file = fopen(fileName, "rb");
if (!file) if (!file)
{ {
;//sLog->outDebug(LOG_FILTER_MAPS, "MMAP:loadMap: Could not open mmtile file '%s'", fileName); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_MAPS, "MMAP:loadMap: Could not open mmtile file '%s'", fileName);
#endif
delete [] fileName; delete [] fileName;
return false; return false;
} }
@@ -167,7 +171,9 @@ namespace MMAP
{ {
mmap->mmapLoadedTiles.insert(std::pair<uint32, dtTileRef>(packedGridPos, tileRef)); mmap->mmapLoadedTiles.insert(std::pair<uint32, dtTileRef>(packedGridPos, tileRef));
++loadedTiles; ++loadedTiles;
;//sLog->outDetail("MMAP:loadMap: Loaded mmtile %03i[%02i,%02i] into %03i[%02i,%02i]", mapId, x, y, mapId, header->x, header->y); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("MMAP:loadMap: Loaded mmtile %03i[%02i,%02i] into %03i[%02i,%02i]", mapId, x, y, mapId, header->x, header->y);
#endif
return true; return true;
} }
else else
@@ -188,7 +194,9 @@ namespace MMAP
if (loadedMMaps.find(mapId) == loadedMMaps.end()) if (loadedMMaps.find(mapId) == loadedMMaps.end())
{ {
// file may not exist, therefore not loaded // file may not exist, therefore not loaded
;//sLog->outDebug(LOG_FILTER_MAPS, "MMAP:unloadMap: Asked to unload not loaded navmesh map. %03u%02i%02i.mmtile", mapId, x, y); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_MAPS, "MMAP:unloadMap: Asked to unload not loaded navmesh map. %03u%02i%02i.mmtile", mapId, x, y);
#endif
return false; return false;
} }
@@ -199,7 +207,9 @@ namespace MMAP
if (mmap->mmapLoadedTiles.find(packedGridPos) == mmap->mmapLoadedTiles.end()) if (mmap->mmapLoadedTiles.find(packedGridPos) == mmap->mmapLoadedTiles.end())
{ {
// file may not exist, therefore not loaded // file may not exist, therefore not loaded
;//sLog->outDebug(LOG_FILTER_MAPS, "MMAP:unloadMap: Asked to unload not loaded navmesh tile. %03u%02i%02i.mmtile", mapId, x, y); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_MAPS, "MMAP:unloadMap: Asked to unload not loaded navmesh tile. %03u%02i%02i.mmtile", mapId, x, y);
#endif
return false; return false;
} }
@@ -224,7 +234,9 @@ namespace MMAP
{ {
mmap->mmapLoadedTiles.erase(packedGridPos); mmap->mmapLoadedTiles.erase(packedGridPos);
--loadedTiles; --loadedTiles;
;//sLog->outDetail("MMAP:unloadMap: Unloaded mmtile %03i[%02i,%02i] from %03i", mapId, x, y, mapId); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("MMAP:unloadMap: Unloaded mmtile %03i[%02i,%02i] from %03i", mapId, x, y, mapId);
#endif
return true; return true;
} }
@@ -238,7 +250,9 @@ namespace MMAP
if (loadedMMaps.find(mapId) == loadedMMaps.end()) if (loadedMMaps.find(mapId) == loadedMMaps.end())
{ {
// file may not exist, therefore not loaded // file may not exist, therefore not loaded
;//sLog->outDebug(LOG_FILTER_MAPS, "MMAP:unloadMap: Asked to unload not loaded navmesh map %03u", mapId); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_MAPS, "MMAP:unloadMap: Asked to unload not loaded navmesh map %03u", mapId);
#endif
return false; return false;
} }
@@ -260,13 +274,17 @@ namespace MMAP
else else
{ {
--loadedTiles; --loadedTiles;
;//sLog->outDetail("MMAP:unloadMap: Unloaded mmtile %03i[%02i,%02i] from %03i", mapId, x, y, mapId); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("MMAP:unloadMap: Unloaded mmtile %03i[%02i,%02i] from %03i", mapId, x, y, mapId);
#endif
} }
} }
delete mmap; delete mmap;
loadedMMaps.erase(mapId); loadedMMaps.erase(mapId);
;//sLog->outDetail("MMAP:unloadMap: Unloaded %03i.mmap", mapId); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("MMAP:unloadMap: Unloaded %03i.mmap", mapId);
#endif
return true; return true;
} }
@@ -279,14 +297,18 @@ namespace MMAP
if (loadedMMaps.find(mapId) == loadedMMaps.end()) if (loadedMMaps.find(mapId) == loadedMMaps.end())
{ {
// file may not exist, therefore not loaded // file may not exist, therefore not loaded
;//sLog->outDebug(LOG_FILTER_MAPS, "MMAP:unloadMapInstance: Asked to unload not loaded navmesh map %03u", mapId); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_MAPS, "MMAP:unloadMapInstance: Asked to unload not loaded navmesh map %03u", mapId);
#endif
return false; return false;
} }
MMapData* mmap = loadedMMaps[mapId]; MMapData* mmap = loadedMMaps[mapId];
if (mmap->navMeshQueries.find(instanceId) == mmap->navMeshQueries.end()) if (mmap->navMeshQueries.find(instanceId) == mmap->navMeshQueries.end())
{ {
;//sLog->outDebug(LOG_FILTER_MAPS, "MMAP:unloadMapInstance: Asked to unload not loaded dtNavMeshQuery mapId %03u instanceId %u", mapId, instanceId); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_MAPS, "MMAP:unloadMapInstance: Asked to unload not loaded dtNavMeshQuery mapId %03u instanceId %u", mapId, instanceId);
#endif
return false; return false;
} }
@@ -294,7 +316,9 @@ namespace MMAP
dtFreeNavMeshQuery(query); dtFreeNavMeshQuery(query);
mmap->navMeshQueries.erase(instanceId); mmap->navMeshQueries.erase(instanceId);
;//sLog->outDetail("MMAP:unloadMapInstance: Unloaded mapId %03u instanceId %u", mapId, instanceId); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("MMAP:unloadMapInstance: Unloaded mapId %03u instanceId %u", mapId, instanceId);
#endif
return true; return true;
} }
@@ -336,7 +360,9 @@ namespace MMAP
return NULL; return NULL;
} }
;//sLog->outDetail("MMAP:GetNavMeshQuery: created dtNavMeshQuery for mapId %03u instanceId %u", mapId, instanceId); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("MMAP:GetNavMeshQuery: created dtNavMeshQuery for mapId %03u instanceId %u", mapId, instanceId);
#endif
mmap->navMeshQueries.insert(std::pair<uint32, dtNavMeshQuery*>(instanceId, query)); mmap->navMeshQueries.insert(std::pair<uint32, dtNavMeshQuery*>(instanceId, query));
} }
} }
modules/worldengine/lib-collision/src/Management/VMapManager2.cpp
+11 -7
View File
@@ -124,7 +124,7 @@ namespace VMAP
bool VMapManager2::isInLineOfSight(unsigned int mapId, float x1, float y1, float z1, float x2, float y2, float z2) bool VMapManager2::isInLineOfSight(unsigned int mapId, float x1, float y1, float z1, float x2, float y2, float z2)
{ {
#if defined(DISABLE_EXTRAS) || defined(DISABLE_VMAP_CHECKS) #if ENABLE_EXTRAS && ENABLE_VMAP_CHECKS
if (!isLineOfSightCalcEnabled() || DisableMgr::IsDisabledFor(DISABLE_TYPE_VMAP, mapId, NULL, VMAP_DISABLE_LOS)) if (!isLineOfSightCalcEnabled() || DisableMgr::IsDisabledFor(DISABLE_TYPE_VMAP, mapId, NULL, VMAP_DISABLE_LOS))
return true; return true;
#endif #endif
@@ -149,7 +149,7 @@ namespace VMAP
*/ */
bool VMapManager2::getObjectHitPos(unsigned int mapId, float x1, float y1, float z1, float x2, float y2, float z2, float& rx, float &ry, float& rz, float modifyDist) bool VMapManager2::getObjectHitPos(unsigned int mapId, float x1, float y1, float z1, float x2, float y2, float z2, float& rx, float &ry, float& rz, float modifyDist)
{ {
#if defined(DISABLE_EXTRAS) || defined(DISABLE_VMAP_CHECKS) #if ENABLE_EXTRAS && ENABLE_VMAP_CHECKS
if (isLineOfSightCalcEnabled() && !DisableMgr::IsDisabledFor(DISABLE_TYPE_VMAP, mapId, NULL, VMAP_DISABLE_LOS)) if (isLineOfSightCalcEnabled() && !DisableMgr::IsDisabledFor(DISABLE_TYPE_VMAP, mapId, NULL, VMAP_DISABLE_LOS))
#endif #endif
{ {
@@ -181,7 +181,7 @@ namespace VMAP
float VMapManager2::getHeight(unsigned int mapId, float x, float y, float z, float maxSearchDist) float VMapManager2::getHeight(unsigned int mapId, float x, float y, float z, float maxSearchDist)
{ {
#if defined(DISABLE_EXTRAS) || defined(DISABLE_VMAP_CHECKS) #if ENABLE_EXTRAS && ENABLE_VMAP_CHECKS
if (isHeightCalcEnabled() && !DisableMgr::IsDisabledFor(DISABLE_TYPE_VMAP, mapId, NULL, VMAP_DISABLE_HEIGHT)) if (isHeightCalcEnabled() && !DisableMgr::IsDisabledFor(DISABLE_TYPE_VMAP, mapId, NULL, VMAP_DISABLE_HEIGHT))
#endif #endif
{ {
@@ -202,7 +202,7 @@ namespace VMAP
bool VMapManager2::getAreaInfo(unsigned int mapId, float x, float y, float& z, uint32& flags, int32& adtId, int32& rootId, int32& groupId) const bool VMapManager2::getAreaInfo(unsigned int mapId, float x, float y, float& z, uint32& flags, int32& adtId, int32& rootId, int32& groupId) const
{ {
#if defined(DISABLE_EXTRAS) || defined(DISABLE_VMAP_CHECKS) #if ENABLE_EXTRAS && ENABLE_VMAP_CHECKS
if (!DisableMgr::IsDisabledFor(DISABLE_TYPE_VMAP, mapId, NULL, VMAP_DISABLE_AREAFLAG)) if (!DisableMgr::IsDisabledFor(DISABLE_TYPE_VMAP, mapId, NULL, VMAP_DISABLE_AREAFLAG))
#endif #endif
{ {
@@ -222,7 +222,7 @@ namespace VMAP
bool VMapManager2::GetLiquidLevel(uint32 mapId, float x, float y, float z, uint8 reqLiquidType, float& level, float& floor, uint32& type) const bool VMapManager2::GetLiquidLevel(uint32 mapId, float x, float y, float z, uint8 reqLiquidType, float& level, float& floor, uint32& type) const
{ {
#if defined(DISABLE_EXTRAS) || defined(DISABLE_VMAP_CHECKS) #if ENABLE_EXTRAS && ENABLE_VMAP_CHECKS
if (!DisableMgr::IsDisabledFor(DISABLE_TYPE_VMAP, mapId, NULL, VMAP_DISABLE_LIQUIDSTATUS)) if (!DisableMgr::IsDisabledFor(DISABLE_TYPE_VMAP, mapId, NULL, VMAP_DISABLE_LIQUIDSTATUS))
#endif #endif
{ {
@@ -262,7 +262,9 @@ namespace VMAP
delete worldmodel; delete worldmodel;
return NULL; return NULL;
} }
;//sLog->outDebug(LOG_FILTER_MAPS, "VMapManager2: loading file '%s%s'", basepath.c_str(), filename.c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_MAPS, "VMapManager2: loading file '%s%s'", basepath.c_str(), filename.c_str());
#endif
model = iLoadedModelFiles.insert(std::pair<std::string, ManagedModel>(filename, ManagedModel())).first; model = iLoadedModelFiles.insert(std::pair<std::string, ManagedModel>(filename, ManagedModel())).first;
model->second.setModel(worldmodel); model->second.setModel(worldmodel);
} }
@@ -283,7 +285,9 @@ namespace VMAP
} }
if (model->second.decRefCount() == 0) if (model->second.decRefCount() == 0)
{ {
;//sLog->outDebug(LOG_FILTER_MAPS, "VMapManager2: unloading file '%s'", filename.c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_MAPS, "VMapManager2: unloading file '%s'", filename.c_str());
#endif
delete model->second.getModel(); delete model->second.getModel();
iLoadedModelFiles.erase(model); iLoadedModelFiles.erase(model);
}*/ }*/
modules/worldengine/lib-collision/src/Maps/MapTree.cpp
+9 -9
View File
@@ -44,8 +44,8 @@ namespace VMAP
AreaInfoCallback(ModelInstance* val): prims(val) {} AreaInfoCallback(ModelInstance* val): prims(val) {}
void operator()(const Vector3& point, uint32 entry) void operator()(const Vector3& point, uint32 entry)
{ {
#ifdef VMAP_DEBUG #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS && VMAP_DEBUG
;//sLog->outDebug(LOG_FILTER_MAPS, "AreaInfoCallback: trying to intersect '%s'", prims[entry].name.c_str()); sLog->outDebug(LOG_FILTER_MAPS, "AreaInfoCallback: trying to intersect '%s'", prims[entry].name.c_str());
#endif #endif
prims[entry].intersectPoint(point, aInfo); prims[entry].intersectPoint(point, aInfo);
} }
@@ -60,8 +60,8 @@ namespace VMAP
LocationInfoCallback(ModelInstance* val, LocationInfo &info): prims(val), locInfo(info), result(false) {} LocationInfoCallback(ModelInstance* val, LocationInfo &info): prims(val), locInfo(info), result(false) {}
void operator()(const Vector3& point, uint32 entry) void operator()(const Vector3& point, uint32 entry)
{ {
#ifdef VMAP_DEBUG #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS && VMAP_DEBUG
;//sLog->outDebug(LOG_FILTER_MAPS, "LocationInfoCallback: trying to intersect '%s'", prims[entry].name.c_str()); sLog->outDebug(LOG_FILTER_MAPS, "LocationInfoCallback: trying to intersect '%s'", prims[entry].name.c_str());
#endif #endif
if (prims[entry].GetLocationInfo(point, locInfo)) if (prims[entry].GetLocationInfo(point, locInfo))
result = true; result = true;
@@ -373,10 +373,10 @@ namespace VMAP
{ {
if (!iLoadedSpawns.count(referencedVal)) if (!iLoadedSpawns.count(referencedVal))
{ {
#ifdef VMAP_DEBUG #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS && VMAP_DEBUG
if (referencedVal > iNTreeValues) if (referencedVal > iNTreeValues)
{ {
;//sLog->outDebug(LOG_FILTER_MAPS, "StaticMapTree::LoadMapTile() : invalid tree element (%u/%u)", referencedVal, iNTreeValues); sLog->outDebug(LOG_FILTER_MAPS, "StaticMapTree::LoadMapTile() : invalid tree element (%u/%u)", referencedVal, iNTreeValues);
continue; continue;
} }
#endif #endif
@@ -386,11 +386,11 @@ namespace VMAP
else else
{ {
++iLoadedSpawns[referencedVal]; ++iLoadedSpawns[referencedVal];
#ifdef VMAP_DEBUG #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS && VMAP_DEBUG
if (iTreeValues[referencedVal].ID != spawn.ID) if (iTreeValues[referencedVal].ID != spawn.ID)
;//sLog->outDebug(LOG_FILTER_MAPS, "StaticMapTree::LoadMapTile() : trying to load wrong spawn in node"); sLog->outDebug(LOG_FILTER_MAPS, "StaticMapTree::LoadMapTile() : trying to load wrong spawn in node");
else if (iTreeValues[referencedVal].name != spawn.name) else if (iTreeValues[referencedVal].name != spawn.name)
;//sLog->outDebug(LOG_FILTER_MAPS, "StaticMapTree::LoadMapTile() : name collision on GUID=%u", spawn.ID); sLog->outDebug(LOG_FILTER_MAPS, "StaticMapTree::LoadMapTile() : name collision on GUID=%u", spawn.ID);
#endif #endif
} }
} }
modules/worldengine/nucleus/src/Database/MySQLConnection.cpp
+3 -1
View File
@@ -121,7 +121,9 @@ bool MySQLConnection::Open()
// sLog->outInfo(LOG_FILTER_SQL, "[WARNING] MySQL client/server version mismatch; may conflict with behaviour of prepared statements."); // sLog->outInfo(LOG_FILTER_SQL, "[WARNING] MySQL client/server version mismatch; may conflict with behaviour of prepared statements.");
} }
;//sLog->outDetail("Connected to MySQL database at %s", m_connectionInfo.host.c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("Connected to MySQL database at %s", m_connectionInfo.host.c_str());
#endif
mysql_autocommit(m_Mysql, 1); mysql_autocommit(m_Mysql, 1);
// set connection properties to UTF8 to properly handle locales for different // set connection properties to UTF8 to properly handle locales for different
src/authserver/Server/AuthSocket.cpp
+102 -34
View File
@@ -197,7 +197,9 @@ void AuthSocket::OnAccept(void)
void AuthSocket::OnClose(void) void AuthSocket::OnClose(void)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "AuthSocket::OnClose"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "AuthSocket::OnClose");
#endif
} }
// Read the packet from the client // Read the packet from the client
@@ -229,11 +231,15 @@ void AuthSocket::OnRead()
{ {
if ((uint8)table[i].cmd == _cmd && (table[i].status == _status)) if ((uint8)table[i].cmd == _cmd && (table[i].status == _status))
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "Got data for cmd %u recv length %u", (uint32)_cmd, (uint32)socket().recv_len()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "Got data for cmd %u recv length %u", (uint32)_cmd, (uint32)socket().recv_len());
#endif
if (!(*this.*table[i].handler)()) if (!(*this.*table[i].handler)())
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "Command handler failed for cmd %u recv length %u", (uint32)_cmd, (uint32)socket().recv_len()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "Command handler failed for cmd %u recv length %u", (uint32)_cmd, (uint32)socket().recv_len());
#endif
return; return;
} }
break; break;
@@ -243,7 +249,9 @@ void AuthSocket::OnRead()
// Report unknown packets in the error log // Report unknown packets in the error log
if (i == AUTH_TOTAL_COMMANDS) if (i == AUTH_TOTAL_COMMANDS)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "Got unknown packet from '%s'", socket().getRemoteAddress().c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "Got unknown packet from '%s'", socket().getRemoteAddress().c_str());
#endif
socket().shutdown(); socket().shutdown();
return; return;
} }
@@ -296,7 +304,9 @@ ACE_Thread_Mutex LastLoginAttemptMutex;
// Logon Challenge command handler // Logon Challenge command handler
bool AuthSocket::_HandleLogonChallenge() bool AuthSocket::_HandleLogonChallenge()
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "Entering _HandleLogonChallenge"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "Entering _HandleLogonChallenge");
#endif
if (socket().recv_len() < sizeof(sAuthLogonChallenge_C)) if (socket().recv_len() < sizeof(sAuthLogonChallenge_C))
return false; return false;
@@ -336,7 +346,9 @@ bool AuthSocket::_HandleLogonChallenge()
EndianConvertPtr<uint16>(&buf[0]); EndianConvertPtr<uint16>(&buf[0]);
uint16 remaining = ((sAuthLogonChallenge_C *)&buf[0])->size; uint16 remaining = ((sAuthLogonChallenge_C *)&buf[0])->size;
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "[AuthChallenge] got header, body is %#04x bytes", remaining); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "[AuthChallenge] got header, body is %#04x bytes", remaining);
#endif
if ((remaining < sizeof(sAuthLogonChallenge_C) - buf.size()) || (socket().recv_len() < remaining)) if ((remaining < sizeof(sAuthLogonChallenge_C) - buf.size()) || (socket().recv_len() < remaining))
return false; return false;
@@ -348,8 +360,12 @@ bool AuthSocket::_HandleLogonChallenge()
// Read the remaining of the packet // Read the remaining of the packet
socket().recv((char *)&buf[4], remaining); socket().recv((char *)&buf[4], remaining);
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "[AuthChallenge] got full packet, %#04x bytes", ch->size); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "[AuthChallenge] name(%d): '%s'", ch->I_len, ch->I); sLog->outDebug(LOG_FILTER_NETWORKIO, "[AuthChallenge] got full packet, %#04x bytes", ch->size);
#endif
#ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "[AuthChallenge] name(%d): '%s'", ch->I_len, ch->I);
#endif
// BigEndian code, nop in little endian case // BigEndian code, nop in little endian case
// size already converted // size already converted
@@ -387,7 +403,9 @@ bool AuthSocket::_HandleLogonChallenge()
if (result) if (result)
{ {
pkt << uint8(WOW_FAIL_BANNED); pkt << uint8(WOW_FAIL_BANNED);
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "'%s:%d' [AuthChallenge] Banned ip tries to login!",socket().getRemoteAddress().c_str(), socket().getRemotePort()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "'%s:%d' [AuthChallenge] Banned ip tries to login!",socket().getRemoteAddress().c_str(), socket().getRemotePort());
#endif
} }
else else
{ {
@@ -405,20 +423,30 @@ bool AuthSocket::_HandleLogonChallenge()
bool locked = false; bool locked = false;
if (fields[2].GetUInt8() == 1) // if ip is locked if (fields[2].GetUInt8() == 1) // if ip is locked
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "[AuthChallenge] Account '%s' is locked to IP - '%s'", _login.c_str(), fields[3].GetCString()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "[AuthChallenge] Player address is '%s'", ip_address.c_str()); sLog->outDebug(LOG_FILTER_NETWORKIO, "[AuthChallenge] Account '%s' is locked to IP - '%s'", _login.c_str(), fields[3].GetCString());
#endif
#ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "[AuthChallenge] Player address is '%s'", ip_address.c_str());
#endif
if (strcmp(fields[3].GetCString(), ip_address.c_str()) != 0) if (strcmp(fields[3].GetCString(), ip_address.c_str()) != 0)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "[AuthChallenge] Account IP differs"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "[AuthChallenge] Account IP differs");
#endif
pkt << uint8(WOW_FAIL_LOCKED_ENFORCED); pkt << uint8(WOW_FAIL_LOCKED_ENFORCED);
locked = true; locked = true;
} }
else else
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "[AuthChallenge] Account IP matches"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "[AuthChallenge] Account IP matches");
#endif
} }
else else
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "[AuthChallenge] Account '%s' is not locked to ip", _login.c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "[AuthChallenge] Account '%s' is not locked to ip", _login.c_str());
#endif
if (!locked) if (!locked)
{ {
@@ -434,12 +462,16 @@ bool AuthSocket::_HandleLogonChallenge()
if ((*banresult)[0].GetUInt32() == (*banresult)[1].GetUInt32()) if ((*banresult)[0].GetUInt32() == (*banresult)[1].GetUInt32())
{ {
pkt << uint8(WOW_FAIL_BANNED); pkt << uint8(WOW_FAIL_BANNED);
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "'%s:%d' [AuthChallenge] Banned account %s tried to login!", socket().getRemoteAddress().c_str(), socket().getRemotePort(), _login.c_str ()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "'%s:%d' [AuthChallenge] Banned account %s tried to login!", socket().getRemoteAddress().c_str(), socket().getRemotePort(), _login.c_str ());
#endif
} }
else else
{ {
pkt << uint8(WOW_FAIL_SUSPENDED); pkt << uint8(WOW_FAIL_SUSPENDED);
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "'%s:%d' [AuthChallenge] Temporarily banned account %s tried to login!", socket().getRemoteAddress().c_str(), socket().getRemotePort(), _login.c_str ()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "'%s:%d' [AuthChallenge] Temporarily banned account %s tried to login!", socket().getRemoteAddress().c_str(), socket().getRemotePort(), _login.c_str ());
#endif
} }
} }
else else
@@ -451,7 +483,9 @@ bool AuthSocket::_HandleLogonChallenge()
std::string databaseV = fields[5].GetString(); std::string databaseV = fields[5].GetString();
std::string databaseS = fields[6].GetString(); std::string databaseS = fields[6].GetString();
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "database authentication values: v='%s' s='%s'", databaseV.c_str(), databaseS.c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "database authentication values: v='%s' s='%s'", databaseV.c_str(), databaseS.c_str());
#endif
// multiply with 2 since bytes are stored as hexstring // multiply with 2 since bytes are stored as hexstring
if (databaseV.size() != s_BYTE_SIZE * 2 || databaseS.size() != s_BYTE_SIZE * 2) if (databaseV.size() != s_BYTE_SIZE * 2 || databaseS.size() != s_BYTE_SIZE * 2)
@@ -513,7 +547,9 @@ bool AuthSocket::_HandleLogonChallenge()
for (int i = 0; i < 4; ++i) for (int i = 0; i < 4; ++i)
_localizationName[i] = ch->country[4-i-1]; _localizationName[i] = ch->country[4-i-1];
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "'%s:%d' [AuthChallenge] account %s is using '%c%c%c%c' locale (%u)", socket().getRemoteAddress().c_str(), socket().getRemotePort(), #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "'%s:%d' [AuthChallenge] account %s is using '%c%c%c%c' locale (%u)", socket().getRemoteAddress().c_str(), socket().getRemotePort(),
#endif
// _login.c_str (), ch->country[3], ch->country[2], ch->country[1], ch->country[0], GetLocaleByName(_localizationName) // _login.c_str (), ch->country[3], ch->country[2], ch->country[1], ch->country[0], GetLocaleByName(_localizationName)
// ); // );
@@ -533,7 +569,9 @@ bool AuthSocket::_HandleLogonChallenge()
// Logon Proof command handler // Logon Proof command handler
bool AuthSocket::_HandleLogonProof() bool AuthSocket::_HandleLogonProof()
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "Entering _HandleLogonProof"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "Entering _HandleLogonProof");
#endif
// Read the packet // Read the packet
sAuthLogonProof_C lp; sAuthLogonProof_C lp;
@@ -546,7 +584,9 @@ bool AuthSocket::_HandleLogonProof()
if (_expversion == NO_VALID_EXP_FLAG) if (_expversion == NO_VALID_EXP_FLAG)
{ {
// Check if we have the appropriate patch on the disk // Check if we have the appropriate patch on the disk
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "Client with invalid version, patching is not implemented"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "Client with invalid version, patching is not implemented");
#endif
socket().shutdown(); socket().shutdown();
return true; return true;
} }
@@ -630,7 +670,9 @@ bool AuthSocket::_HandleLogonProof()
// Check if SRP6 results match (password is correct), else send an error // Check if SRP6 results match (password is correct), else send an error
if (!memcmp(M.AsByteArray().get(), lp.M1, 20)) if (!memcmp(M.AsByteArray().get(), lp.M1, 20))
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "'%s:%d' User '%s' successfully authenticated", socket().getRemoteAddress().c_str(), socket().getRemotePort(), _login.c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "'%s:%d' User '%s' successfully authenticated", socket().getRemoteAddress().c_str(), socket().getRemotePort(), _login.c_str());
#endif
// Update the sessionkey, last_ip, last login time and reset number of failed logins in the account table for this account // Update the sessionkey, last_ip, last login time and reset number of failed logins in the account table for this account
// No SQL injection (escaped user name) and IP address as received by socket // No SQL injection (escaped user name) and IP address as received by socket
@@ -680,7 +722,9 @@ bool AuthSocket::_HandleLogonProof()
char data[4] = { AUTH_LOGON_PROOF, WOW_FAIL_UNKNOWN_ACCOUNT, 3, 0 }; char data[4] = { AUTH_LOGON_PROOF, WOW_FAIL_UNKNOWN_ACCOUNT, 3, 0 };
socket().send(data, sizeof(data)); socket().send(data, sizeof(data));
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "'%s:%d' [AuthChallenge] account %s tried to login with invalid password!", socket().getRemoteAddress().c_str(), socket().getRemotePort(), _login.c_str ()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "'%s:%d' [AuthChallenge] account %s tried to login with invalid password!", socket().getRemoteAddress().c_str(), socket().getRemotePort(), _login.c_str ());
#endif
uint32 MaxWrongPassCount = sConfigMgr->GetIntDefault("WrongPass.MaxCount", 0); uint32 MaxWrongPassCount = sConfigMgr->GetIntDefault("WrongPass.MaxCount", 0);
if (MaxWrongPassCount > 0) if (MaxWrongPassCount > 0)
@@ -710,7 +754,9 @@ bool AuthSocket::_HandleLogonProof()
stmt->setUInt32(1, WrongPassBanTime); stmt->setUInt32(1, WrongPassBanTime);
LoginDatabase.Execute(stmt); LoginDatabase.Execute(stmt);
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "'%s:%d' [AuthChallenge] account %s got banned for '%u' seconds because it failed to authenticate '%u' times", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "'%s:%d' [AuthChallenge] account %s got banned for '%u' seconds because it failed to authenticate '%u' times",
#endif
// socket().getRemoteAddress().c_str(), socket().getRemotePort(), _login.c_str(), WrongPassBanTime, failed_logins); // socket().getRemoteAddress().c_str(), socket().getRemotePort(), _login.c_str(), WrongPassBanTime, failed_logins);
} }
else else
@@ -720,7 +766,9 @@ bool AuthSocket::_HandleLogonProof()
stmt->setUInt32(1, WrongPassBanTime); stmt->setUInt32(1, WrongPassBanTime);
LoginDatabase.Execute(stmt); LoginDatabase.Execute(stmt);
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "'%s:%d' [AuthChallenge] IP %s got banned for '%u' seconds because account %s failed to authenticate '%u' times", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "'%s:%d' [AuthChallenge] IP %s got banned for '%u' seconds because account %s failed to authenticate '%u' times",
#endif
// socket().getRemoteAddress().c_str(), socket().getRemotePort(), socket().getRemoteAddress().c_str(), WrongPassBanTime, _login.c_str(), failed_logins); // socket().getRemoteAddress().c_str(), socket().getRemotePort(), socket().getRemoteAddress().c_str(), WrongPassBanTime, _login.c_str(), failed_logins);
} }
} }
@@ -734,7 +782,9 @@ bool AuthSocket::_HandleLogonProof()
// Reconnect Challenge command handler // Reconnect Challenge command handler
bool AuthSocket::_HandleReconnectChallenge() bool AuthSocket::_HandleReconnectChallenge()
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "Entering _HandleReconnectChallenge"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "Entering _HandleReconnectChallenge");
#endif
if (socket().recv_len() < sizeof(sAuthLogonChallenge_C)) if (socket().recv_len() < sizeof(sAuthLogonChallenge_C))
return false; return false;
@@ -747,7 +797,9 @@ bool AuthSocket::_HandleReconnectChallenge()
EndianConvertPtr<uint16>(&buf[0]); EndianConvertPtr<uint16>(&buf[0]);
uint16 remaining = ((sAuthLogonChallenge_C *)&buf[0])->size; uint16 remaining = ((sAuthLogonChallenge_C *)&buf[0])->size;
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "[ReconnectChallenge] got header, body is %#04x bytes", remaining); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "[ReconnectChallenge] got header, body is %#04x bytes", remaining);
#endif
if ((remaining < sizeof(sAuthLogonChallenge_C) - buf.size()) || (socket().recv_len() < remaining)) if ((remaining < sizeof(sAuthLogonChallenge_C) - buf.size()) || (socket().recv_len() < remaining))
return false; return false;
@@ -762,8 +814,12 @@ bool AuthSocket::_HandleReconnectChallenge()
// Read the remaining of the packet // Read the remaining of the packet
socket().recv((char *)&buf[4], remaining); socket().recv((char *)&buf[4], remaining);
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "[ReconnectChallenge] got full packet, %#04x bytes", ch->size); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "[ReconnectChallenge] name(%d): '%s'", ch->I_len, ch->I); sLog->outDebug(LOG_FILTER_NETWORKIO, "[ReconnectChallenge] got full packet, %#04x bytes", ch->size);
#endif
#ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "[ReconnectChallenge] name(%d): '%s'", ch->I_len, ch->I);
#endif
_login = (const char*)ch->I; _login = (const char*)ch->I;
@@ -813,7 +869,9 @@ bool AuthSocket::_HandleReconnectChallenge()
// Reconnect Proof command handler // Reconnect Proof command handler
bool AuthSocket::_HandleReconnectProof() bool AuthSocket::_HandleReconnectProof()
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "Entering _HandleReconnectProof"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "Entering _HandleReconnectProof");
#endif
// Read the packet // Read the packet
sAuthReconnectProof_C lp; sAuthReconnectProof_C lp;
if (!socket().recv((char *)&lp, sizeof(sAuthReconnectProof_C))) if (!socket().recv((char *)&lp, sizeof(sAuthReconnectProof_C)))
@@ -880,7 +938,9 @@ ACE_INET_Addr const& AuthSocket::GetAddressForClient(Realm const& realm, ACE_INE
// Realm List command handler // Realm List command handler
bool AuthSocket::_HandleRealmList() bool AuthSocket::_HandleRealmList()
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "Entering _HandleRealmList"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "Entering _HandleRealmList");
#endif
if (socket().recv_len() < 5) if (socket().recv_len() < 5)
return false; return false;
@@ -1010,7 +1070,9 @@ bool AuthSocket::_HandleRealmList()
// Resume patch transfer // Resume patch transfer
bool AuthSocket::_HandleXferResume() bool AuthSocket::_HandleXferResume()
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "Entering _HandleXferResume"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "Entering _HandleXferResume");
#endif
// Check packet length and patch existence // Check packet length and patch existence
if (socket().recv_len() < 9 || !pPatch) // FIXME: pPatch is never used if (socket().recv_len() < 9 || !pPatch) // FIXME: pPatch is never used
{ {
@@ -1031,7 +1093,9 @@ bool AuthSocket::_HandleXferResume()
// Cancel patch transfer // Cancel patch transfer
bool AuthSocket::_HandleXferCancel() bool AuthSocket::_HandleXferCancel()
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "Entering _HandleXferCancel"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "Entering _HandleXferCancel");
#endif
// Close and delete the socket // Close and delete the socket
socket().recv_skip(1); //clear input buffer socket().recv_skip(1); //clear input buffer
@@ -1043,7 +1107,9 @@ bool AuthSocket::_HandleXferCancel()
// Accept patch transfer // Accept patch transfer
bool AuthSocket::_HandleXferAccept() bool AuthSocket::_HandleXferAccept()
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "Entering _HandleXferAccept"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "Entering _HandleXferAccept");
#endif
// Check packet length and patch existence // Check packet length and patch existence
if (!pPatch) if (!pPatch)
@@ -1129,7 +1195,9 @@ void Patcher::LoadPatchMD5(char *szFileName)
std::string path = "./patches/"; std::string path = "./patches/";
path += szFileName; path += szFileName;
FILE* pPatch = fopen(path.c_str(), "rb"); FILE* pPatch = fopen(path.c_str(), "rb");
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "Loading patch info from %s\n", path.c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "Loading patch info from %s\n", path.c_str());
#endif
if (!pPatch) if (!pPatch)
{ {
src/cmake/showoptions.cmake
+12 -12
View File
@@ -107,25 +107,25 @@ endif()
# Performance optimization options: # Performance optimization options:
if( DISABLE_EXTRAS ) if( ENABLE_EXTRAS )
message("* Disable extra features : Yes") message("* Enable extra features : Yes (default)")
add_definitions(-DDISABLE_EXTRAS) add_definitions(-DENABLE_EXTRAS)
else() else()
message("* Disable extra features : No (default)") message("* Enable extra features : No")
endif() endif()
if( DISABLE_VMAP_CHECKS ) if( ENABLE_VMAP_CHECKS )
message("* Disable vmap DisableMgr checks : Yes") message("* Enable vmap DisableMgr checks : Yes (default)")
add_definitions(-DDISABLE_VMAP_CHECKS) add_definitions(-DENABLE_VMAP_CHECKS)
else() else()
message("* Disable vmap DisableMgr checks : No (default)") message("* Enable vmap DisableMgr checks : No")
endif() endif()
if( DISABLE_EXTRA_LOGS ) if( ENABLE_EXTRA_LOGS )
message("* Disable extra logging functions : Yes (default)") message("* Enable extra logging functions : Yes")
add_definitions(-DDISABLE_EXTRA_LOGS) add_definitions(-DENABLE_EXTRA_LOGS)
else() else()
message("* Disable extra logging functions : No") message("* Enable extra logging functions : No (default)")
endif() endif()
message("") message("")
src/game/AI/CoreAI/CombatAI.cpp
+3 -1
View File
@@ -281,7 +281,9 @@ void VehicleAI::LoadConditions()
{ {
conditions = sConditionMgr->GetConditionsForNotGroupedEntry(CONDITION_SOURCE_TYPE_CREATURE_TEMPLATE_VEHICLE, me->GetEntry()); conditions = sConditionMgr->GetConditionsForNotGroupedEntry(CONDITION_SOURCE_TYPE_CREATURE_TEMPLATE_VEHICLE, me->GetEntry());
//if (!conditions.empty()) //if (!conditions.empty())
;//sLog->outDebug(LOG_FILTER_CONDITIONSYS, "VehicleAI::LoadConditions: loaded %u conditions", uint32(conditions.size())); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_CONDITIONSYS, "VehicleAI::LoadConditions: loaded %u conditions", uint32(conditions.size()));
#endif
} }
void VehicleAI::CheckConditions(uint32 diff) void VehicleAI::CheckConditions(uint32 diff)
src/game/AI/CoreAI/GuardAI.cpp
+3 -1
View File
@@ -39,7 +39,9 @@ void GuardAI::EnterEvadeMode()
return; return;
} }
;//sLog->outDebug(LOG_FILTER_UNITS, "Guard entry: %u enters evade mode.", me->GetEntry()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_UNITS, "Guard entry: %u enters evade mode.", me->GetEntry());
#endif
me->RemoveAllAuras(); me->RemoveAllAuras();
me->DeleteThreatList(); me->DeleteThreatList();
src/game/AI/CoreAI/PetAI.cpp
+6 -2
View File
@@ -61,7 +61,9 @@ void PetAI::_stopAttack()
{ {
if (!me->IsAlive()) if (!me->IsAlive())
{ {
;//sLog->outStaticDebug("Creature stoped attacking cuz his dead [guid=%u]", me->GetGUIDLow()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug("Creature stoped attacking cuz his dead [guid=%u]", me->GetGUIDLow());
#endif
me->GetMotionMaster()->Clear(); me->GetMotionMaster()->Clear();
me->GetMotionMaster()->MoveIdle(); me->GetMotionMaster()->MoveIdle();
me->CombatStop(); me->CombatStop();
@@ -120,7 +122,9 @@ void PetAI::UpdateAI(uint32 diff)
if (_needToStop()) if (_needToStop())
{ {
;//sLog->outStaticDebug("Pet AI stopped attacking [guid=%u]", me->GetGUIDLow()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug("Pet AI stopped attacking [guid=%u]", me->GetGUIDLow());
#endif
_stopAttack(); _stopAttack();
return; return;
} }
src/game/AI/CreatureAI.cpp
+3 -1
View File
@@ -132,7 +132,9 @@ void CreatureAI::EnterEvadeMode()
if (!_EnterEvadeMode()) if (!_EnterEvadeMode())
return; return;
;//sLog->outDebug(LOG_FILTER_UNITS, "Creature %u enters evade mode.", me->GetEntry()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_UNITS, "Creature %u enters evade mode.", me->GetEntry());
#endif
if (!me->GetVehicle()) // otherwise me will be in evade mode forever if (!me->GetVehicle()) // otherwise me will be in evade mode forever
{ {
src/game/AI/CreatureAISelector.cpp
+6 -2
View File
@@ -86,7 +86,9 @@ namespace FactorySelector
// xinef: unused // xinef: unused
// ainame = (ai_factory == NULL) ? "NullCreatureAI" : ai_factory->key(); // ainame = (ai_factory == NULL) ? "NullCreatureAI" : ai_factory->key();
;//sLog->outDebug(LOG_FILTER_TSCR, "Creature %u used AI is %s.", creature->GetGUIDLow(), ainame.c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_TSCR, "Creature %u used AI is %s.", creature->GetGUIDLow(), ainame.c_str());
#endif
return (ai_factory == NULL ? new NullCreatureAI(creature) : ai_factory->Create(creature)); return (ai_factory == NULL ? new NullCreatureAI(creature) : ai_factory->Create(creature));
} }
@@ -134,7 +136,9 @@ namespace FactorySelector
// xinef: unused // xinef: unused
//std::string ainame = (ai_factory == NULL || go->GetScriptId()) ? "NullGameObjectAI" : ai_factory->key(); //std::string ainame = (ai_factory == NULL || go->GetScriptId()) ? "NullGameObjectAI" : ai_factory->key();
;//sLog->outDebug(LOG_FILTER_TSCR, "GameObject %u used AI is %s.", go->GetGUIDLow(), ainame.c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_TSCR, "GameObject %u used AI is %s.", go->GetGUIDLow(), ainame.c_str());
#endif
return (ai_factory == NULL ? new NullGameObjectAI(go) : ai_factory->Create(go)); return (ai_factory == NULL ? new NullGameObjectAI(go) : ai_factory->Create(go));
} }
src/game/AI/ScriptedAI/ScriptedEscortAI.cpp
+24 -8
View File
@@ -156,7 +156,9 @@ void npc_escortAI::EnterEvadeMode()
{ {
AddEscortState(STATE_ESCORT_RETURNING); AddEscortState(STATE_ESCORT_RETURNING);
ReturnToLastPoint(); ReturnToLastPoint();
;//sLog->outDebug(LOG_FILTER_TSCR, "TSCR: EscortAI has left combat and is now returning to last point"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_TSCR, "TSCR: EscortAI has left combat and is now returning to last point");
#endif
} }
else else
{ {
@@ -282,7 +284,9 @@ void npc_escortAI::MovementInform(uint32 moveType, uint32 pointId)
//Combat start position reached, continue waypoint movement //Combat start position reached, continue waypoint movement
if (pointId == POINT_LAST_POINT) if (pointId == POINT_LAST_POINT)
{ {
;//sLog->outDebug(LOG_FILTER_TSCR, "TSCR: EscortAI has returned to original position before combat"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_TSCR, "TSCR: EscortAI has returned to original position before combat");
#endif
me->SetWalk(!m_bIsRunning); me->SetWalk(!m_bIsRunning);
RemoveEscortState(STATE_ESCORT_RETURNING); RemoveEscortState(STATE_ESCORT_RETURNING);
@@ -292,7 +296,9 @@ void npc_escortAI::MovementInform(uint32 moveType, uint32 pointId)
} }
else if (pointId == POINT_HOME) else if (pointId == POINT_HOME)
{ {
;//sLog->outDebug(LOG_FILTER_TSCR, "TSCR: EscortAI has returned to original home location and will continue from beginning of waypoint list."); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_TSCR, "TSCR: EscortAI has returned to original home location and will continue from beginning of waypoint list.");
#endif
CurrentWP = WaypointList.begin(); CurrentWP = WaypointList.begin();
m_uiWPWaitTimer = 1; m_uiWPWaitTimer = 1;
@@ -380,14 +386,18 @@ void npc_escortAI::SetRun(bool on)
if (!m_bIsRunning) if (!m_bIsRunning)
me->SetWalk(false); me->SetWalk(false);
else else
;//sLog->outDebug(LOG_FILTER_TSCR, "TSCR: EscortAI attempt to set run mode, but is already running."); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_TSCR, "TSCR: EscortAI attempt to set run mode, but is already running.");
#endif
} }
else else
{ {
if (m_bIsRunning) if (m_bIsRunning)
me->SetWalk(true); me->SetWalk(true);
else else
;//sLog->outDebug(LOG_FILTER_TSCR, "TSCR: EscortAI attempt to set walk mode, but is already walking."); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_TSCR, "TSCR: EscortAI attempt to set walk mode, but is already walking.");
#endif
} }
m_bIsRunning = on; m_bIsRunning = on;
@@ -433,13 +443,17 @@ void npc_escortAI::Start(bool isActiveAttacker /* = true*/, bool run /* = false
m_bCanReturnToStart = canLoopPath; m_bCanReturnToStart = canLoopPath;
//if (m_bCanReturnToStart && m_bCanInstantRespawn) //if (m_bCanReturnToStart && m_bCanInstantRespawn)
;//sLog->outDebug(LOG_FILTER_TSCR, "TSCR: EscortAI is set to return home after waypoint end and instant respawn at waypoint end. Creature will never despawn."); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_TSCR, "TSCR: EscortAI is set to return home after waypoint end and instant respawn at waypoint end. Creature will never despawn.");
#endif
if (me->GetMotionMaster()->GetCurrentMovementGeneratorType() == WAYPOINT_MOTION_TYPE) if (me->GetMotionMaster()->GetCurrentMovementGeneratorType() == WAYPOINT_MOTION_TYPE)
{ {
me->GetMotionMaster()->MovementExpired(); me->GetMotionMaster()->MovementExpired();
me->GetMotionMaster()->MoveIdle(); me->GetMotionMaster()->MoveIdle();
;//sLog->outDebug(LOG_FILTER_TSCR, "TSCR: EscortAI start with WAYPOINT_MOTION_TYPE, changed to MoveIdle."); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_TSCR, "TSCR: EscortAI start with WAYPOINT_MOTION_TYPE, changed to MoveIdle.");
#endif
} }
//disable npcflags //disable npcflags
@@ -450,7 +464,9 @@ void npc_escortAI::Start(bool isActiveAttacker /* = true*/, bool run /* = false
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_NPC); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_NPC);
} }
;//sLog->outDebug(LOG_FILTER_TSCR, "TSCR: EscortAI started with " UI64FMTD " waypoints. ActiveAttacker = %d, Run = %d, PlayerGUID = " UI64FMTD "", uint64(WaypointList.size()), m_bIsActiveAttacker, m_bIsRunning, m_uiPlayerGUID); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_TSCR, "TSCR: EscortAI started with " UI64FMTD " waypoints. ActiveAttacker = %d, Run = %d, PlayerGUID = " UI64FMTD "", uint64(WaypointList.size()), m_bIsActiveAttacker, m_bIsRunning, m_uiPlayerGUID);
#endif
CurrentWP = WaypointList.begin(); CurrentWP = WaypointList.begin();
src/game/AI/ScriptedAI/ScriptedFollowerAI.cpp
+27 -9
View File
@@ -141,7 +141,9 @@ void FollowerAI::EnterEvadeMode()
if (HasFollowState(STATE_FOLLOW_INPROGRESS)) if (HasFollowState(STATE_FOLLOW_INPROGRESS))
{ {
;//sLog->outDebug(LOG_FILTER_TSCR, "TSCR: FollowerAI left combat, returning to CombatStartPosition."); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_TSCR, "TSCR: FollowerAI left combat, returning to CombatStartPosition.");
#endif
if (me->GetMotionMaster()->GetCurrentMovementGeneratorType() == CHASE_MOTION_TYPE) if (me->GetMotionMaster()->GetCurrentMovementGeneratorType() == CHASE_MOTION_TYPE)
{ {
@@ -167,7 +169,9 @@ void FollowerAI::UpdateAI(uint32 uiDiff)
{ {
if (HasFollowState(STATE_FOLLOW_COMPLETE) && !HasFollowState(STATE_FOLLOW_POSTEVENT)) if (HasFollowState(STATE_FOLLOW_COMPLETE) && !HasFollowState(STATE_FOLLOW_POSTEVENT))
{ {
;//sLog->outDebug(LOG_FILTER_TSCR, "TSCR: FollowerAI is set completed, despawns."); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_TSCR, "TSCR: FollowerAI is set completed, despawns.");
#endif
me->DespawnOrUnsummon(); me->DespawnOrUnsummon();
return; return;
} }
@@ -178,7 +182,9 @@ void FollowerAI::UpdateAI(uint32 uiDiff)
{ {
if (HasFollowState(STATE_FOLLOW_RETURNING)) if (HasFollowState(STATE_FOLLOW_RETURNING))
{ {
;//sLog->outDebug(LOG_FILTER_TSCR, "TSCR: FollowerAI is returning to leader."); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_TSCR, "TSCR: FollowerAI is returning to leader.");
#endif
RemoveFollowState(STATE_FOLLOW_RETURNING); RemoveFollowState(STATE_FOLLOW_RETURNING);
me->GetMotionMaster()->MoveFollow(player, PET_FOLLOW_DIST, PET_FOLLOW_ANGLE); me->GetMotionMaster()->MoveFollow(player, PET_FOLLOW_DIST, PET_FOLLOW_ANGLE);
@@ -207,7 +213,9 @@ void FollowerAI::UpdateAI(uint32 uiDiff)
if (bIsMaxRangeExceeded) if (bIsMaxRangeExceeded)
{ {
;//sLog->outDebug(LOG_FILTER_TSCR, "TSCR: FollowerAI failed because player/group was to far away or not found"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_TSCR, "TSCR: FollowerAI failed because player/group was to far away or not found");
#endif
me->DespawnOrUnsummon(); me->DespawnOrUnsummon();
return; return;
} }
@@ -250,7 +258,9 @@ void FollowerAI::StartFollow(Player* player, uint32 factionForFollower, const Qu
{ {
if (me->GetVictim()) if (me->GetVictim())
{ {
;//sLog->outDebug(LOG_FILTER_TSCR, "TSCR: FollowerAI attempt to StartFollow while in combat."); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_TSCR, "TSCR: FollowerAI attempt to StartFollow while in combat.");
#endif
return; return;
} }
@@ -272,7 +282,9 @@ void FollowerAI::StartFollow(Player* player, uint32 factionForFollower, const Qu
{ {
me->GetMotionMaster()->Clear(); me->GetMotionMaster()->Clear();
me->GetMotionMaster()->MoveIdle(); me->GetMotionMaster()->MoveIdle();
;//sLog->outDebug(LOG_FILTER_TSCR, "TSCR: FollowerAI start with WAYPOINT_MOTION_TYPE, set to MoveIdle."); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_TSCR, "TSCR: FollowerAI start with WAYPOINT_MOTION_TYPE, set to MoveIdle.");
#endif
} }
me->SetUInt32Value(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_NONE); me->SetUInt32Value(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_NONE);
@@ -281,7 +293,9 @@ void FollowerAI::StartFollow(Player* player, uint32 factionForFollower, const Qu
me->GetMotionMaster()->MoveFollow(player, PET_FOLLOW_DIST, PET_FOLLOW_ANGLE); me->GetMotionMaster()->MoveFollow(player, PET_FOLLOW_DIST, PET_FOLLOW_ANGLE);
;//sLog->outDebug(LOG_FILTER_TSCR, "TSCR: FollowerAI start follow %s (GUID " UI64FMTD ")", player->GetName().c_str(), m_uiLeaderGUID); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_TSCR, "TSCR: FollowerAI start follow %s (GUID " UI64FMTD ")", player->GetName().c_str(), m_uiLeaderGUID);
#endif
} }
Player* FollowerAI::GetLeaderForFollower() Player* FollowerAI::GetLeaderForFollower()
@@ -300,7 +314,9 @@ Player* FollowerAI::GetLeaderForFollower()
if (member && me->IsWithinDistInMap(member, MAX_PLAYER_DISTANCE) && member->IsAlive()) if (member && me->IsWithinDistInMap(member, MAX_PLAYER_DISTANCE) && member->IsAlive())
{ {
;//sLog->outDebug(LOG_FILTER_TSCR, "TSCR: FollowerAI GetLeader changed and returned new leader."); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_TSCR, "TSCR: FollowerAI GetLeader changed and returned new leader.");
#endif
m_uiLeaderGUID = member->GetGUID(); m_uiLeaderGUID = member->GetGUID();
return member; return member;
} }
@@ -309,7 +325,9 @@ Player* FollowerAI::GetLeaderForFollower()
} }
} }
;//sLog->outDebug(LOG_FILTER_TSCR, "TSCR: FollowerAI GetLeader can not find suitable leader."); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_TSCR, "TSCR: FollowerAI GetLeader can not find suitable leader.");
#endif
return NULL; return NULL;
} }
src/game/AI/SmartScripts/SmartAI.cpp
+6 -2
View File
@@ -1096,7 +1096,9 @@ void SmartGameObjectAI::Reset()
// Called when a player opens a gossip dialog with the gameobject. // Called when a player opens a gossip dialog with the gameobject.
bool SmartGameObjectAI::GossipHello(Player* player, bool reportUse) bool SmartGameObjectAI::GossipHello(Player* player, bool reportUse)
{ {
;//sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartGameObjectAI::GossipHello"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartGameObjectAI::GossipHello");
#endif
GetScript()->ProcessEventsFor(SMART_EVENT_GOSSIP_HELLO, player, (uint32)reportUse, 0, false, NULL, go); GetScript()->ProcessEventsFor(SMART_EVENT_GOSSIP_HELLO, player, (uint32)reportUse, 0, false, NULL, go);
return false; return false;
} }
@@ -1177,7 +1179,9 @@ class SmartTrigger : public AreaTriggerScript
if (!player->IsAlive()) if (!player->IsAlive())
return false; return false;
;//sLog->outDebug(LOG_FILTER_DATABASE_AI, "AreaTrigger %u is using SmartTrigger script", trigger->id); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_DATABASE_AI, "AreaTrigger %u is using SmartTrigger script", trigger->id);
#endif
SmartScript script; SmartScript script;
script.OnInitialize(NULL, trigger); script.OnInitialize(NULL, trigger);
script.ProcessEventsFor(SMART_EVENT_AREATRIGGER_ONTRIGGER, player, trigger->id); script.ProcessEventsFor(SMART_EVENT_AREATRIGGER_ONTRIGGER, player, trigger->id);
src/game/AI/SmartScripts/SmartScript.cpp
+129 -43
View File
@@ -145,7 +145,9 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
mLastInvoker = unit->GetGUID(); mLastInvoker = unit->GetGUID();
//if (Unit* tempInvoker = GetLastInvoker()) //if (Unit* tempInvoker = GetLastInvoker())
;//sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction: Invoker: %s (guidlow: %u)", tempInvoker->GetName().c_str(), tempInvoker->GetGUIDLow()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction: Invoker: %s (guidlow: %u)", tempInvoker->GetName().c_str(), tempInvoker->GetGUIDLow());
#endif
switch (e.GetActionType()) switch (e.GetActionType())
{ {
@@ -191,7 +193,9 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
mTextTimer = e.action.talk.duration; mTextTimer = e.action.talk.duration;
mUseTextTimer = true; mUseTextTimer = true;
sCreatureTextMgr->SendChat(talker, uint8(e.action.talk.textGroupID), talkTarget); sCreatureTextMgr->SendChat(talker, uint8(e.action.talk.textGroupID), talkTarget);
;//sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction: SMART_ACTION_TALK: talker: %s (GuidLow: %u), textGuid: %u", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction: SMART_ACTION_TALK: talker: %s (GuidLow: %u), textGuid: %u",
#endif
// talker->GetName().c_str(), talker->GetGUIDLow(), GUID_LOPART(mTextGUID)); // talker->GetName().c_str(), talker->GetGUIDLow(), GUID_LOPART(mTextGUID));
break; break;
} }
@@ -209,7 +213,9 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
Unit* templastInvoker = GetLastInvoker(); Unit* templastInvoker = GetLastInvoker();
sCreatureTextMgr->SendChat(me, uint8(e.action.talk.textGroupID), IsPlayer(templastInvoker) ? templastInvoker : 0, CHAT_MSG_ADDON, LANG_ADDON, TEXT_RANGE_NORMAL, 0, TEAM_NEUTRAL, false, (*itr)->ToPlayer()); sCreatureTextMgr->SendChat(me, uint8(e.action.talk.textGroupID), IsPlayer(templastInvoker) ? templastInvoker : 0, CHAT_MSG_ADDON, LANG_ADDON, TEXT_RANGE_NORMAL, 0, TEAM_NEUTRAL, false, (*itr)->ToPlayer());
} }
;//sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_SIMPLE_TALK: talker: %s (GuidLow: %u), textGroupId: %u", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_SIMPLE_TALK: talker: %s (GuidLow: %u), textGroupId: %u",
#endif
// (*itr)->GetName().c_str(), (*itr)->GetGUIDLow(), uint8(e.action.talk.textGroupID)); // (*itr)->GetName().c_str(), (*itr)->GetGUIDLow(), uint8(e.action.talk.textGroupID));
} }
@@ -227,7 +233,9 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
if (IsUnit(*itr)) if (IsUnit(*itr))
{ {
(*itr)->ToUnit()->HandleEmoteCommand(e.action.emote.emote); (*itr)->ToUnit()->HandleEmoteCommand(e.action.emote.emote);
;//sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_PLAY_EMOTE: target: %s (GuidLow: %u), emote: %u", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_PLAY_EMOTE: target: %s (GuidLow: %u), emote: %u",
#endif
// (*itr)->GetName().c_str(), (*itr)->GetGUIDLow(), e.action.emote.emote); // (*itr)->GetName().c_str(), (*itr)->GetGUIDLow(), e.action.emote.emote);
} }
} }
@@ -246,7 +254,9 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
if (IsUnit(*itr)) if (IsUnit(*itr))
{ {
(*itr)->SendPlaySound(e.action.sound.sound, e.action.sound.onlySelf > 0); (*itr)->SendPlaySound(e.action.sound.sound, e.action.sound.onlySelf > 0);
;//sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_SOUND: target: %s (GuidLow: %u), sound: %u, onlyself: %u", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_SOUND: target: %s (GuidLow: %u), sound: %u, onlyself: %u",
#endif
// (*itr)->GetName().c_str(), (*itr)->GetGUIDLow(), e.action.sound.sound, e.action.sound.range); // (*itr)->GetName().c_str(), (*itr)->GetGUIDLow(), e.action.sound.sound, e.action.sound.range);
} }
} }
@@ -267,7 +277,9 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
if (e.action.faction.factionID) if (e.action.faction.factionID)
{ {
(*itr)->ToCreature()->setFaction(e.action.faction.factionID); (*itr)->ToCreature()->setFaction(e.action.faction.factionID);
;//sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_SET_FACTION: Creature entry %u, GuidLow %u set faction to %u", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_SET_FACTION: Creature entry %u, GuidLow %u set faction to %u",
#endif
// (*itr)->GetEntry(), (*itr)->GetGUIDLow(), e.action.faction.factionID); // (*itr)->GetEntry(), (*itr)->GetGUIDLow(), e.action.faction.factionID);
} }
else else
@@ -277,7 +289,9 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
if ((*itr)->ToCreature()->getFaction() != ci->faction) if ((*itr)->ToCreature()->getFaction() != ci->faction)
{ {
(*itr)->ToCreature()->setFaction(ci->faction); (*itr)->ToCreature()->setFaction(ci->faction);
;//sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_SET_FACTION: Creature entry %u, GuidLow %u set faction to %u", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_SET_FACTION: Creature entry %u, GuidLow %u set faction to %u",
#endif
// (*itr)->GetEntry(), (*itr)->GetGUIDLow(), ci->faction); // (*itr)->GetEntry(), (*itr)->GetGUIDLow(), ci->faction);
} }
} }
@@ -309,7 +323,9 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
{ {
uint32 displayId = ObjectMgr::ChooseDisplayId(ci); uint32 displayId = ObjectMgr::ChooseDisplayId(ci);
(*itr)->ToCreature()->SetDisplayId(displayId); (*itr)->ToCreature()->SetDisplayId(displayId);
;//sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_MORPH_TO_ENTRY_OR_MODEL: Creature entry %u, GuidLow %u set displayid to %u", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_MORPH_TO_ENTRY_OR_MODEL: Creature entry %u, GuidLow %u set displayid to %u",
#endif
// (*itr)->GetEntry(), (*itr)->GetGUIDLow(), display_id); // (*itr)->GetEntry(), (*itr)->GetGUIDLow(), display_id);
} }
} }
@@ -317,14 +333,18 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
else else
{ {
(*itr)->ToCreature()->SetDisplayId(e.action.morphOrMount.model); (*itr)->ToCreature()->SetDisplayId(e.action.morphOrMount.model);
;//sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_MORPH_TO_ENTRY_OR_MODEL: Creature entry %u, GuidLow %u set displayid to %u", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_MORPH_TO_ENTRY_OR_MODEL: Creature entry %u, GuidLow %u set displayid to %u",
#endif
// (*itr)->GetEntry(), (*itr)->GetGUIDLow(), e.action.morphOrMount.model); // (*itr)->GetEntry(), (*itr)->GetGUIDLow(), e.action.morphOrMount.model);
} }
} }
else else
{ {
(*itr)->ToCreature()->DeMorph(); (*itr)->ToCreature()->DeMorph();
;//sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_MORPH_TO_ENTRY_OR_MODEL: Creature entry %u, GuidLow %u demorphs.", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_MORPH_TO_ENTRY_OR_MODEL: Creature entry %u, GuidLow %u demorphs.",
#endif
// (*itr)->GetEntry(), (*itr)->GetGUIDLow()); // (*itr)->GetEntry(), (*itr)->GetGUIDLow());
} }
} }
@@ -343,7 +363,9 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
if (IsPlayer(*itr)) if (IsPlayer(*itr))
{ {
(*itr)->ToPlayer()->FailQuest(e.action.quest.quest); (*itr)->ToPlayer()->FailQuest(e.action.quest.quest);
;//sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_FAIL_QUEST: Player guidLow %u fails quest %u", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_FAIL_QUEST: Player guidLow %u fails quest %u",
#endif
// (*itr)->GetGUIDLow(), e.action.quest.quest); // (*itr)->GetGUIDLow(), e.action.quest.quest);
} }
} }
@@ -364,7 +386,9 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
if (Quest const* q = sObjectMgr->GetQuestTemplate(e.action.quest.quest)) if (Quest const* q = sObjectMgr->GetQuestTemplate(e.action.quest.quest))
{ {
(*itr)->ToPlayer()->AddQuestAndCheckCompletion(q, NULL); (*itr)->ToPlayer()->AddQuestAndCheckCompletion(q, NULL);
;//sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_ADD_QUEST: Player guidLow %u add quest %u", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_ADD_QUEST: Player guidLow %u add quest %u",
#endif
// (*itr)->GetGUIDLow(), e.action.quest.quest); // (*itr)->GetGUIDLow(), e.action.quest.quest);
} }
} }
@@ -426,7 +450,9 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
{ {
uint32 emote = temp[urand(0, count - 1)]; uint32 emote = temp[urand(0, count - 1)];
(*itr)->ToUnit()->HandleEmoteCommand(emote); (*itr)->ToUnit()->HandleEmoteCommand(emote);
;//sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_RANDOM_EMOTE: Creature guidLow %u handle random emote %u", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_RANDOM_EMOTE: Creature guidLow %u handle random emote %u",
#endif
// (*itr)->GetGUIDLow(), emote); // (*itr)->GetGUIDLow(), emote);
} }
} }
@@ -445,7 +471,9 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
if (Unit* target = ObjectAccessor::GetUnit(*me, (*i)->getUnitGuid())) if (Unit* target = ObjectAccessor::GetUnit(*me, (*i)->getUnitGuid()))
{ {
me->getThreatManager().modifyThreatPercent(target, e.action.threatPCT.threatINC ? (int32)e.action.threatPCT.threatINC : -(int32)e.action.threatPCT.threatDEC); me->getThreatManager().modifyThreatPercent(target, e.action.threatPCT.threatINC ? (int32)e.action.threatPCT.threatINC : -(int32)e.action.threatPCT.threatDEC);
;//sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_THREAT_ALL_PCT: Creature guidLow %u modify threat for unit %u, value %i", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_THREAT_ALL_PCT: Creature guidLow %u modify threat for unit %u, value %i",
#endif
// me->GetGUIDLow(), target->GetGUIDLow(), e.action.threatPCT.threatINC ? (int32)e.action.threatPCT.threatINC : -(int32)e.action.threatPCT.threatDEC); // me->GetGUIDLow(), target->GetGUIDLow(), e.action.threatPCT.threatINC ? (int32)e.action.threatPCT.threatINC : -(int32)e.action.threatPCT.threatDEC);
} }
} }
@@ -465,7 +493,9 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
if (IsUnit(*itr)) if (IsUnit(*itr))
{ {
me->getThreatManager().modifyThreatPercent((*itr)->ToUnit(), e.action.threatPCT.threatINC ? (int32)e.action.threatPCT.threatINC : -(int32)e.action.threatPCT.threatDEC); me->getThreatManager().modifyThreatPercent((*itr)->ToUnit(), e.action.threatPCT.threatINC ? (int32)e.action.threatPCT.threatINC : -(int32)e.action.threatPCT.threatDEC);
;//sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_THREAT_SINGLE_PCT: Creature guidLow %u modify threat for unit %u, value %i", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_THREAT_SINGLE_PCT: Creature guidLow %u modify threat for unit %u, value %i",
#endif
// me->GetGUIDLow(), (*itr)->GetGUIDLow(), e.action.threatPCT.threatINC ? (int32)e.action.threatPCT.threatINC : -(int32)e.action.threatPCT.threatDEC); // me->GetGUIDLow(), (*itr)->GetGUIDLow(), e.action.threatPCT.threatINC ? (int32)e.action.threatPCT.threatINC : -(int32)e.action.threatPCT.threatDEC);
} }
} }
@@ -492,7 +522,9 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
if (Player* player = (*itr)->ToUnit()->GetCharmerOrOwnerPlayerOrPlayerItself()) if (Player* player = (*itr)->ToUnit()->GetCharmerOrOwnerPlayerOrPlayerItself())
{ {
player->GroupEventHappens(e.action.quest.quest, me); player->GroupEventHappens(e.action.quest.quest, me);
;//sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_CALL_AREAEXPLOREDOREVENTHAPPENS: Player guidLow %u credited quest %u", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_CALL_AREAEXPLOREDOREVENTHAPPENS: Player guidLow %u credited quest %u",
#endif
// (*itr)->GetGUIDLow(), e.action.quest.quest); // (*itr)->GetGUIDLow(), e.action.quest.quest);
} }
} }
@@ -599,7 +631,9 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
if (IsUnit(*itr)) if (IsUnit(*itr))
{ {
(*itr)->ToUnit()->AddAura(e.action.cast.spell, (*itr)->ToUnit()); (*itr)->ToUnit()->AddAura(e.action.cast.spell, (*itr)->ToUnit());
;//sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_ADD_AURA: Adding aura %u to unit %u", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_ADD_AURA: Adding aura %u to unit %u",
#endif
// e.action.cast.spell, (*itr)->GetGUIDLow()); // e.action.cast.spell, (*itr)->GetGUIDLow());
} }
} }
@@ -621,7 +655,9 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
// xinef: wtf is this shit? // xinef: wtf is this shit?
(*itr)->ToGameObject()->SetLootState(GO_READY); (*itr)->ToGameObject()->SetLootState(GO_READY);
(*itr)->ToGameObject()->UseDoorOrButton(0, e.action.activateObject.alternative ? true : false, unit); (*itr)->ToGameObject()->UseDoorOrButton(0, e.action.activateObject.alternative ? true : false, unit);
;//sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_ACTIVATE_GOBJECT. Gameobject %u (entry: %u) activated", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_ACTIVATE_GOBJECT. Gameobject %u (entry: %u) activated",
#endif
// (*itr)->GetGUIDLow(), (*itr)->GetEntry()); // (*itr)->GetGUIDLow(), (*itr)->GetEntry());
} }
} }
@@ -640,7 +676,9 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
if (IsGameObject(*itr)) if (IsGameObject(*itr))
{ {
(*itr)->ToGameObject()->ResetDoorOrButton(); (*itr)->ToGameObject()->ResetDoorOrButton();
;//sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_RESET_GOBJECT. Gameobject %u (entry: %u) reset", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_RESET_GOBJECT. Gameobject %u (entry: %u) reset",
#endif
// (*itr)->GetGUIDLow(), (*itr)->GetEntry()); // (*itr)->GetGUIDLow(), (*itr)->GetEntry());
} }
} }
@@ -659,7 +697,9 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
if (IsUnit(*itr)) if (IsUnit(*itr))
{ {
(*itr)->ToUnit()->SetUInt32Value(UNIT_NPC_EMOTESTATE, e.action.emote.emote); (*itr)->ToUnit()->SetUInt32Value(UNIT_NPC_EMOTESTATE, e.action.emote.emote);
;//sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_SET_EMOTE_STATE. Unit %u set emotestate to %u", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_SET_EMOTE_STATE. Unit %u set emotestate to %u",
#endif
// (*itr)->GetGUIDLow(), e.action.emote.emote); // (*itr)->GetGUIDLow(), e.action.emote.emote);
} }
} }
@@ -729,7 +769,9 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
break; break;
CAST_AI(SmartAI, me->AI())->SetAutoAttack(e.action.autoAttack.attack); CAST_AI(SmartAI, me->AI())->SetAutoAttack(e.action.autoAttack.attack);
;//sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_AUTO_ATTACK: Creature: %u bool on = %u", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_AUTO_ATTACK: Creature: %u bool on = %u",
#endif
// me->GetGUIDLow(), e.action.autoAttack.attack); // me->GetGUIDLow(), e.action.autoAttack.attack);
break; break;
} }
@@ -747,7 +789,9 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
else else
CAST_AI(SmartAI, me->AI())->SetCombatMove(move); CAST_AI(SmartAI, me->AI())->SetCombatMove(move);
;//sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_ALLOW_COMBAT_MOVEMENT: Creature %u bool on = %u", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_ALLOW_COMBAT_MOVEMENT: Creature %u bool on = %u",
#endif
// me->GetGUIDLow(), e.action.combatMove.move); // me->GetGUIDLow(), e.action.combatMove.move);
break; break;
} }
@@ -757,7 +801,9 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
break; break;
SetPhase(e.action.setEventPhase.phase); SetPhase(e.action.setEventPhase.phase);
;//sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_SET_EVENT_PHASE: Creature %u set event phase %u", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_SET_EVENT_PHASE: Creature %u set event phase %u",
#endif
// GetBaseObject()->GetGUIDLow(), e.action.setEventPhase.phase); // GetBaseObject()->GetGUIDLow(), e.action.setEventPhase.phase);
break; break;
} }
@@ -768,7 +814,9 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
IncPhase(e.action.incEventPhase.inc); IncPhase(e.action.incEventPhase.inc);
DecPhase(e.action.incEventPhase.dec); DecPhase(e.action.incEventPhase.dec);
;//sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_INC_EVENT_PHASE: Creature %u inc event phase by %u, " #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_INC_EVENT_PHASE: Creature %u inc event phase by %u, "
#endif
// "decrease by %u", GetBaseObject()->GetGUIDLow(), e.action.incEventPhase.inc, e.action.incEventPhase.dec); // "decrease by %u", GetBaseObject()->GetGUIDLow(), e.action.incEventPhase.inc, e.action.incEventPhase.dec);
break; break;
} }
@@ -801,7 +849,9 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
TrinityStringTextBuilder builder(me, CHAT_MSG_MONSTER_EMOTE, LANG_FLEE, LANG_UNIVERSAL, NULL); TrinityStringTextBuilder builder(me, CHAT_MSG_MONSTER_EMOTE, LANG_FLEE, LANG_UNIVERSAL, NULL);
sCreatureTextMgr->SendChatPacket(me, builder, CHAT_MSG_MONSTER_EMOTE); sCreatureTextMgr->SendChatPacket(me, builder, CHAT_MSG_MONSTER_EMOTE);
} }
;//sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_FLEE_FOR_ASSIST: Creature %u DoFleeToGetAssistance", me->GetGUIDLow()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_FLEE_FOR_ASSIST: Creature %u DoFleeToGetAssistance", me->GetGUIDLow());
#endif
break; break;
} }
case SMART_ACTION_COMBAT_STOP: case SMART_ACTION_COMBAT_STOP:
@@ -827,7 +877,9 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
{ {
if (Player* player = (*itr)->ToUnit()->GetCharmerOrOwnerPlayerOrPlayerItself()) if (Player* player = (*itr)->ToUnit()->GetCharmerOrOwnerPlayerOrPlayerItself())
player->GroupEventHappens(e.action.quest.quest, GetBaseObject()); player->GroupEventHappens(e.action.quest.quest, GetBaseObject());
;//sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction: SMART_ACTION_CALL_GROUPEVENTHAPPENS: Player %u, group credit for quest %u", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction: SMART_ACTION_CALL_GROUPEVENTHAPPENS: Player %u, group credit for quest %u",
#endif
// (*itr)->GetGUIDLow(), e.action.quest.quest); // (*itr)->GetGUIDLow(), e.action.quest.quest);
} }
} }
@@ -859,7 +911,9 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
else else
(*itr)->ToUnit()->RemoveAllAuras(); (*itr)->ToUnit()->RemoveAllAuras();
;//sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction: SMART_ACTION_REMOVEAURASFROMSPELL: Unit %u, spell %u", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction: SMART_ACTION_REMOVEAURASFROMSPELL: Unit %u, spell %u",
#endif
// (*itr)->GetGUIDLow(), e.action.removeAura.spell); // (*itr)->GetGUIDLow(), e.action.removeAura.spell);
} }
@@ -884,7 +938,9 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
{ {
float angle = e.action.follow.angle > 6 ? (e.action.follow.angle * M_PI / 180.0f) : e.action.follow.angle; float angle = e.action.follow.angle > 6 ? (e.action.follow.angle * M_PI / 180.0f) : e.action.follow.angle;
CAST_AI(SmartAI, me->AI())->SetFollow((*itr)->ToUnit(), float(int32(e.action.follow.dist))+0.1f, angle, e.action.follow.credit, e.action.follow.entry, e.action.follow.creditType, e.action.follow.aliveState); CAST_AI(SmartAI, me->AI())->SetFollow((*itr)->ToUnit(), float(int32(e.action.follow.dist))+0.1f, angle, e.action.follow.credit, e.action.follow.entry, e.action.follow.creditType, e.action.follow.aliveState);
;//sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction: SMART_ACTION_FOLLOW: Creature %u following target %u", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction: SMART_ACTION_FOLLOW: Creature %u following target %u",
#endif
// me->GetGUIDLow(), (*itr)->GetGUIDLow()); // me->GetGUIDLow(), (*itr)->GetGUIDLow());
break; break;
} }
@@ -921,7 +977,9 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
uint32 phase = temp[urand(0, count - 1)]; uint32 phase = temp[urand(0, count - 1)];
SetPhase(phase); SetPhase(phase);
;//sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction: SMART_ACTION_RANDOM_PHASE: Creature %u sets event phase to %u", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction: SMART_ACTION_RANDOM_PHASE: Creature %u sets event phase to %u",
#endif
// GetBaseObject()->GetGUIDLow(), phase); // GetBaseObject()->GetGUIDLow(), phase);
break; break;
} }
@@ -932,7 +990,9 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
uint32 phase = urand(e.action.randomPhaseRange.phaseMin, e.action.randomPhaseRange.phaseMax); uint32 phase = urand(e.action.randomPhaseRange.phaseMin, e.action.randomPhaseRange.phaseMax);
SetPhase(phase); SetPhase(phase);
;//sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction: SMART_ACTION_RANDOM_PHASE_RANGE: Creature %u sets event phase to %u", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction: SMART_ACTION_RANDOM_PHASE_RANGE: Creature %u sets event phase to %u",
#endif
// GetBaseObject()->GetGUIDLow(), phase); // GetBaseObject()->GetGUIDLow(), phase);
break; break;
} }
@@ -941,7 +1001,9 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
if (trigger && IsPlayer(unit)) if (trigger && IsPlayer(unit))
{ {
unit->ToPlayer()->RewardPlayerAndGroupAtEvent(e.action.killedMonster.creature, unit); unit->ToPlayer()->RewardPlayerAndGroupAtEvent(e.action.killedMonster.creature, unit);
;//sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction: SMART_ACTION_CALL_KILLEDMONSTER: (trigger == true) Player %u, Killcredit: %u", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction: SMART_ACTION_CALL_KILLEDMONSTER: (trigger == true) Player %u, Killcredit: %u",
#endif
// unit->GetGUIDLow(), e.action.killedMonster.creature); // unit->GetGUIDLow(), e.action.killedMonster.creature);
} }
else if (e.target.type == SMART_TARGET_NONE || e.target.type == SMART_TARGET_SELF) // Loot recipient and his group members else if (e.target.type == SMART_TARGET_NONE || e.target.type == SMART_TARGET_SELF) // Loot recipient and his group members
@@ -972,7 +1034,9 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
continue; continue;
player->RewardPlayerAndGroupAtEvent(e.action.killedMonster.creature, player); player->RewardPlayerAndGroupAtEvent(e.action.killedMonster.creature, player);
;//sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction: SMART_ACTION_CALL_KILLEDMONSTER: Player %u, Killcredit: %u", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction: SMART_ACTION_CALL_KILLEDMONSTER: Player %u, Killcredit: %u",
#endif
// (*itr)->GetGUIDLow(), e.action.killedMonster.creature); // (*itr)->GetGUIDLow(), e.action.killedMonster.creature);
} }
@@ -997,7 +1061,9 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
} }
instance->SetData(e.action.setInstanceData.field, e.action.setInstanceData.data); instance->SetData(e.action.setInstanceData.field, e.action.setInstanceData.data);
;//sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction: SMART_ACTION_SET_INST_DATA: Field: %u, data: %u", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction: SMART_ACTION_SET_INST_DATA: Field: %u, data: %u",
#endif
// e.action.setInstanceData.field, e.action.setInstanceData.data); // e.action.setInstanceData.field, e.action.setInstanceData.data);
break; break;
} }
@@ -1022,7 +1088,9 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
break; break;
instance->SetData64(e.action.setInstanceData64.field, targets->front()->GetGUID()); instance->SetData64(e.action.setInstanceData64.field, targets->front()->GetGUID());
;//sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction: SMART_ACTION_SET_INST_DATA64: Field: %u, data: "UI64FMTD, #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction: SMART_ACTION_SET_INST_DATA64: Field: %u, data: "UI64FMTD,
#endif
// e.action.setInstanceData64.field, targets->front()->GetGUID()); // e.action.setInstanceData64.field, targets->front()->GetGUID());
delete targets; delete targets;
@@ -1046,7 +1114,9 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
if (me && !me->isDead()) if (me && !me->isDead())
{ {
Unit::Kill(me, me); Unit::Kill(me, me);
;//sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction: SMART_ACTION_DIE: Creature %u", me->GetGUIDLow()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction: SMART_ACTION_DIE: Creature %u", me->GetGUIDLow());
#endif
} }
break; break;
} }
@@ -1088,7 +1158,9 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
if (me) if (me)
{ {
me->SetSheath(SheathState(e.action.setSheath.sheath)); me->SetSheath(SheathState(e.action.setSheath.sheath));
;//sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction: SMART_ACTION_SET_SHEATH: Creature %u, State: %u", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction: SMART_ACTION_SET_SHEATH: Creature %u, State: %u",
#endif
// me->GetGUIDLow(), e.action.setSheath.sheath); // me->GetGUIDLow(), e.action.setSheath.sheath);
} }
break; break;
@@ -2233,7 +2305,9 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
if (!GetBaseObject()) if (!GetBaseObject())
break; break;
;//sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_SEND_GOSSIP_MENU: gossipMenuId %d, gossipNpcTextId %d", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_SEND_GOSSIP_MENU: gossipMenuId %d, gossipNpcTextId %d",
#endif
// e.action.sendGossipMenu.gossipMenuId, e.action.sendGossipMenu.gossipNpcTextId); // e.action.sendGossipMenu.gossipMenuId, e.action.sendGossipMenu.gossipNpcTextId);
ObjectList* targets = GetTargets(e, unit); ObjectList* targets = GetTargets(e, unit);
@@ -3683,7 +3757,9 @@ void SmartScript::ProcessEvent(SmartScriptHolder& e, Unit* unit, uint32 var0, ui
} }
case SMART_EVENT_GOSSIP_SELECT: case SMART_EVENT_GOSSIP_SELECT:
{ {
;//sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript: Gossip Select: menu %u action %u", var0, var1);//little help for scripters #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript: Gossip Select: menu %u action %u", var0, var1);//little help for scripters
#endif
if (e.event.gossip.sender != var0 || e.event.gossip.action != var1) if (e.event.gossip.sender != var0 || e.event.gossip.action != var1)
return; return;
ProcessAction(e, unit, var0, var1); ProcessAction(e, unit, var0, var1);
@@ -4027,9 +4103,13 @@ void SmartScript::FillScript(SmartAIEventList e, WorldObject* obj, AreaTriggerEn
if (e.empty()) if (e.empty())
{ {
//if (obj) //if (obj)
;//sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript: EventMap for Entry %u is empty but is using SmartScript.", obj->GetEntry()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript: EventMap for Entry %u is empty but is using SmartScript.", obj->GetEntry());
#endif
//if (at) //if (at)
;//sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript: EventMap for AreaTrigger %u is empty but is using SmartScript.", at->id); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript: EventMap for AreaTrigger %u is empty but is using SmartScript.", at->id);
#endif
return; return;
} }
for (SmartAIEventList::iterator i = e.begin(); i != e.end(); ++i) for (SmartAIEventList::iterator i = e.begin(); i != e.end(); ++i)
@@ -4091,12 +4171,16 @@ void SmartScript::OnInitialize(WorldObject* obj, AreaTriggerEntry const* at)
case TYPEID_UNIT: case TYPEID_UNIT:
mScriptType = SMART_SCRIPT_TYPE_CREATURE; mScriptType = SMART_SCRIPT_TYPE_CREATURE;
me = obj->ToCreature(); me = obj->ToCreature();
;//sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::OnInitialize: source is Creature %u", me->GetEntry()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::OnInitialize: source is Creature %u", me->GetEntry());
#endif
break; break;
case TYPEID_GAMEOBJECT: case TYPEID_GAMEOBJECT:
mScriptType = SMART_SCRIPT_TYPE_GAMEOBJECT; mScriptType = SMART_SCRIPT_TYPE_GAMEOBJECT;
go = obj->ToGameObject(); go = obj->ToGameObject();
;//sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::OnInitialize: source is GameObject %u", go->GetEntry()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::OnInitialize: source is GameObject %u", go->GetEntry());
#endif
break; break;
default: default:
sLog->outError("SmartScript::OnInitialize: Unhandled TypeID !WARNING!"); sLog->outError("SmartScript::OnInitialize: Unhandled TypeID !WARNING!");
@@ -4106,7 +4190,9 @@ void SmartScript::OnInitialize(WorldObject* obj, AreaTriggerEntry const* at)
{ {
mScriptType = SMART_SCRIPT_TYPE_AREATRIGGER; mScriptType = SMART_SCRIPT_TYPE_AREATRIGGER;
trigger = at; trigger = at;
;//sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::OnInitialize: source is AreaTrigger %u", trigger->id); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::OnInitialize: source is AreaTrigger %u", trigger->id);
#endif
} }
else else
{ {
src/game/AI/SmartScripts/SmartScriptMgr.h
+3 -1
View File
@@ -1635,7 +1635,9 @@ class SmartAIMgr
else else
{ {
//if (entry > 0)//first search is for guid (negative), do not drop error if not found //if (entry > 0)//first search is for guid (negative), do not drop error if not found
;//sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartAIMgr::GetScript: Could not load Script for Entry %d ScriptType %u.", entry, uint32(type)); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartAIMgr::GetScript: Could not load Script for Entry %d ScriptType %u.", entry, uint32(type));
#endif
return temp; return temp;
} }
} }
src/game/Achievements/AchievementMgr.cpp
+11 -5
View File
@@ -649,8 +649,8 @@ void AchievementMgr::SendAchievementEarned(AchievementEntry const* achievement)
if (achievement->flags & ACHIEVEMENT_FLAG_HIDDEN) if (achievement->flags & ACHIEVEMENT_FLAG_HIDDEN)
return; return;
#ifdef TRINITY_DEBUG #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS && TRINITY_DEBUG
;//sLog->outDebug(LOG_FILTER_ACHIEVEMENTSYS, "AchievementMgr::SendAchievementEarned(%u)", achievement->ID); sLog->outDebug(LOG_FILTER_ACHIEVEMENTSYS, "AchievementMgr::SendAchievementEarned(%u)", achievement->ID);
#endif #endif
if (Guild* guild = sGuildMgr->GetGuildById(GetPlayer()->GetGuildId())) if (Guild* guild = sGuildMgr->GetGuildById(GetPlayer()->GetGuildId()))
@@ -739,7 +739,9 @@ static const uint32 achievIdForDungeon[][4] =
*/ */
void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, uint32 miscValue1 /*= 0*/, uint32 miscValue2 /*= 0*/, Unit* unit /*= NULL*/) void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, uint32 miscValue1 /*= 0*/, uint32 miscValue2 /*= 0*/, Unit* unit /*= NULL*/)
{ {
;//sLog->outDebug(LOG_FILTER_ACHIEVEMENTSYS, "AchievementMgr::UpdateAchievementCriteria(%u, %u, %u)", type, miscValue1, miscValue2); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_ACHIEVEMENTSYS, "AchievementMgr::UpdateAchievementCriteria(%u, %u, %u)", type, miscValue1, miscValue2);
#endif
// disable for gamemasters with GM-mode enabled // disable for gamemasters with GM-mode enabled
if (m_player->IsGameMaster()) if (m_player->IsGameMaster())
@@ -1973,7 +1975,9 @@ void AchievementMgr::SetCriteriaProgress(AchievementCriteriaEntry const* entry,
if (entry->timeLimit && timedIter == m_timedAchievements.end()) if (entry->timeLimit && timedIter == m_timedAchievements.end())
return; return;
;//sLog->outDebug(LOG_FILTER_ACHIEVEMENTSYS, "AchievementMgr::SetCriteriaProgress(%u, %u) for (GUID:%u)", entry->ID, changeValue, m_player->GetGUIDLow()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_ACHIEVEMENTSYS, "AchievementMgr::SetCriteriaProgress(%u, %u) for (GUID:%u)", entry->ID, changeValue, m_player->GetGUIDLow());
#endif
CriteriaProgress* progress = GetCriteriaProgress(entry); CriteriaProgress* progress = GetCriteriaProgress(entry);
if (!progress) if (!progress)
@@ -2118,7 +2122,9 @@ void AchievementMgr::RemoveTimedAchievement(AchievementCriteriaTimedTypes type,
void AchievementMgr::CompletedAchievement(AchievementEntry const* achievement) void AchievementMgr::CompletedAchievement(AchievementEntry const* achievement)
{ {
;//sLog->outDetail("AchievementMgr::CompletedAchievement(%u)", achievement->ID); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("AchievementMgr::CompletedAchievement(%u)", achievement->ID);
#endif
// disable for gamemasters with GM-mode enabled // disable for gamemasters with GM-mode enabled
if (m_player->IsGameMaster()) if (m_player->IsGameMaster())
src/game/AuctionHouse/AuctionHouseMgr.cpp
+12 -4
View File
@@ -65,10 +65,18 @@ uint32 AuctionHouseMgr::GetAuctionDeposit(AuctionHouseEntry const* entry, uint32
uint32 timeHr = (((time / 60) / 60) / 12); uint32 timeHr = (((time / 60) / 60) / 12);
uint32 deposit = uint32(((multiplier * MSV * count / 3) * timeHr * 3) * sWorld->getRate(RATE_AUCTION_DEPOSIT)); uint32 deposit = uint32(((multiplier * MSV * count / 3) * timeHr * 3) * sWorld->getRate(RATE_AUCTION_DEPOSIT));
;//sLog->outDebug(LOG_FILTER_AUCTIONHOUSE, "MSV: %u", MSV); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
;//sLog->outDebug(LOG_FILTER_AUCTIONHOUSE, "Items: %u", count); sLog->outDebug(LOG_FILTER_AUCTIONHOUSE, "MSV: %u", MSV);
;//sLog->outDebug(LOG_FILTER_AUCTIONHOUSE, "Multiplier: %f", multiplier); #endif
;//sLog->outDebug(LOG_FILTER_AUCTIONHOUSE, "Deposit: %u", deposit); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_AUCTIONHOUSE, "Items: %u", count);
#endif
#ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_AUCTIONHOUSE, "Multiplier: %f", multiplier);
#endif
#ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_AUCTIONHOUSE, "Deposit: %u", deposit);
#endif
if (deposit < AH_MINIMUM_DEPOSIT) if (deposit < AH_MINIMUM_DEPOSIT)
return AH_MINIMUM_DEPOSIT; return AH_MINIMUM_DEPOSIT;
src/game/Battlefield/Battlefield.cpp
+3 -1
View File
@@ -899,7 +899,9 @@ bool BfCapturePoint::SetCapturePointData(GameObject* capturePoint)
{ {
ASSERT(capturePoint); ASSERT(capturePoint);
;//sLog->outDebug(LOG_FILTER_BATTLEFIELD, "Creating capture point %u", capturePoint->GetEntry()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_BATTLEFIELD, "Creating capture point %u", capturePoint->GetEntry());
#endif
m_capturePoint = capturePoint->GetGUID(); m_capturePoint = capturePoint->GetGUID();
src/game/Battlefield/BattlefieldMgr.cpp
+12 -4
View File
@@ -44,13 +44,17 @@ void BattlefieldMgr::InitBattlefield()
// respawn, init variables // respawn, init variables
if(!pBf->SetupBattlefield()) if(!pBf->SetupBattlefield())
{ {
;//sLog->outDebug(LOG_FILTER_BATTLEFIELD, "Battlefield : Tol Barad init failed."); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_BATTLEFIELD, "Battlefield : Tol Barad init failed.");
#endif
delete pBf; delete pBf;
} }
else else
{ {
m_BattlefieldSet.push_back(pBf); m_BattlefieldSet.push_back(pBf);
;//sLog->outDebug(LOG_FILTER_BATTLEFIELD, "Battlefield : Tol Barad successfully initiated."); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_BATTLEFIELD, "Battlefield : Tol Barad successfully initiated.");
#endif
} */ } */
} }
@@ -69,7 +73,9 @@ void BattlefieldMgr::HandlePlayerEnterZone(Player * player, uint32 zoneid)
return; return;
itr->second->HandlePlayerEnterZone(player, zoneid); itr->second->HandlePlayerEnterZone(player, zoneid);
;//sLog->outDebug(LOG_FILTER_BATTLEFIELD, "Player %u entered outdoorpvp id %u", player->GetGUIDLow(), itr->second->GetTypeId()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_BATTLEFIELD, "Player %u entered outdoorpvp id %u", player->GetGUIDLow(), itr->second->GetTypeId());
#endif
} }
void BattlefieldMgr::HandlePlayerLeaveZone(Player * player, uint32 zoneid) void BattlefieldMgr::HandlePlayerLeaveZone(Player * player, uint32 zoneid)
@@ -82,7 +88,9 @@ void BattlefieldMgr::HandlePlayerLeaveZone(Player * player, uint32 zoneid)
if (!itr->second->HasPlayer(player)) if (!itr->second->HasPlayer(player))
return; return;
itr->second->HandlePlayerLeaveZone(player, zoneid); itr->second->HandlePlayerLeaveZone(player, zoneid);
;//sLog->outDebug(LOG_FILTER_BATTLEFIELD, "Player %u left outdoorpvp id %u", player->GetGUIDLow(), itr->second->GetTypeId()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_BATTLEFIELD, "Player %u left outdoorpvp id %u", player->GetGUIDLow(), itr->second->GetTypeId());
#endif
} }
Battlefield *BattlefieldMgr::GetBattlefieldToZoneId(uint32 zoneid) Battlefield *BattlefieldMgr::GetBattlefieldToZoneId(uint32 zoneid)
src/game/Battlegrounds/ArenaTeam.cpp
+12 -4
View File
@@ -256,7 +256,9 @@ bool ArenaTeam::LoadMembersFromDB(QueryResult result)
if (Empty() || !captainPresentInTeam) if (Empty() || !captainPresentInTeam)
{ {
// Arena team is empty or captain is not in team, delete from db // Arena team is empty or captain is not in team, delete from db
;//sLog->outDebug(LOG_FILTER_BATTLEGROUND, "ArenaTeam %u does not have any members or its captain is not in team, disbanding it...", TeamId); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_BATTLEGROUND, "ArenaTeam %u does not have any members or its captain is not in team, disbanding it...", TeamId);
#endif
return false; return false;
} }
@@ -389,7 +391,9 @@ void ArenaTeam::Roster(WorldSession* session)
} }
session->SendPacket(&data); session->SendPacket(&data);
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Sent SMSG_ARENA_TEAM_ROSTER"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Sent SMSG_ARENA_TEAM_ROSTER");
#endif
} }
void ArenaTeam::Query(WorldSession* session) void ArenaTeam::Query(WorldSession* session)
@@ -404,7 +408,9 @@ void ArenaTeam::Query(WorldSession* session)
data << uint32(BorderStyle); // border style data << uint32(BorderStyle); // border style
data << uint32(BorderColor); // border color data << uint32(BorderColor); // border color
session->SendPacket(&data); session->SendPacket(&data);
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Sent SMSG_ARENA_TEAM_QUERY_RESPONSE"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Sent SMSG_ARENA_TEAM_QUERY_RESPONSE");
#endif
} }
void ArenaTeam::SendStats(WorldSession* session) void ArenaTeam::SendStats(WorldSession* session)
@@ -514,7 +520,9 @@ void ArenaTeam::BroadcastEvent(ArenaTeamEvents event, uint64 guid, uint8 strCoun
BroadcastPacket(&data); BroadcastPacket(&data);
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Sent SMSG_ARENA_TEAM_EVENT"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Sent SMSG_ARENA_TEAM_EVENT");
#endif
} }
void ArenaTeam::MassInviteToEvent(WorldSession* session) void ArenaTeam::MassInviteToEvent(WorldSession* session)
src/game/Battlegrounds/Battleground.cpp
+6 -2
View File
@@ -296,7 +296,9 @@ inline void Battleground::_CheckSafePositions(uint32 diff)
GetTeamStartLoc(itr->second->GetBgTeamId(), x, y, z, o); GetTeamStartLoc(itr->second->GetBgTeamId(), x, y, z, o);
if (pos.GetExactDistSq(x, y, z) > maxDist) if (pos.GetExactDistSq(x, y, z) > maxDist)
{ {
;//sLog->outDebug(LOG_FILTER_BATTLEGROUND, "BATTLEGROUND: Sending %s back to start location (map: %u) (possible exploit)", player->GetName().c_str(), GetMapId()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_BATTLEGROUND, "BATTLEGROUND: Sending %s back to start location (map: %u) (possible exploit)", player->GetName().c_str(), GetMapId());
#endif
itr->second->TeleportTo(GetMapId(), x, y, z, o); itr->second->TeleportTo(GetMapId(), x, y, z, o);
} }
} }
@@ -1236,7 +1238,9 @@ void Battleground::AddPlayer(Player* player)
AddOrSetPlayerToCorrectBgGroup(player, teamId); AddOrSetPlayerToCorrectBgGroup(player, teamId);
// Log // Log
;//sLog->outDetail("BATTLEGROUND: Player %s joined the battle.", player->GetName().c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("BATTLEGROUND: Player %s joined the battle.", player->GetName().c_str());
#endif
} }
// this method adds player to his team's bg group, or sets his correct group if player is already in bg group // this method adds player to his team's bg group, or sets his correct group if player is already in bg group
src/game/Battlegrounds/Zones/BattlegroundAV.cpp
+90 -30
View File
@@ -59,7 +59,9 @@ void BattlegroundAV::HandleKillPlayer(Player* player, Player* killer)
void BattlegroundAV::HandleKillUnit(Creature* unit, Player* killer) void BattlegroundAV::HandleKillUnit(Creature* unit, Player* killer)
{ {
;//sLog->outDebug(LOG_FILTER_BATTLEGROUND, "bg_av HandleKillUnit %i", unit->GetEntry()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_BATTLEGROUND, "bg_av HandleKillUnit %i", unit->GetEntry());
#endif
if (GetStatus() != STATUS_IN_PROGRESS) if (GetStatus() != STATUS_IN_PROGRESS)
return; return;
uint32 entry = unit->GetEntry(); uint32 entry = unit->GetEntry();
@@ -140,7 +142,9 @@ void BattlegroundAV::HandleQuestComplete(uint32 questid, Player* player)
return;//maybe we should log this, cause this must be a cheater or a big bug return;//maybe we should log this, cause this must be a cheater or a big bug
TeamId teamId = player->GetTeamId(); TeamId teamId = player->GetTeamId();
//TODO add reputation, events (including quest not available anymore, next quest availabe, go/npc de/spawning)and maybe honor //TODO add reputation, events (including quest not available anymore, next quest availabe, go/npc de/spawning)and maybe honor
;//sLog->outDebug(LOG_FILTER_BATTLEGROUND, "BG_AV Quest %i completed", questid); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_BATTLEGROUND, "BG_AV Quest %i completed", questid);
#endif
switch (questid) switch (questid)
{ {
case AV_QUEST_A_SCRAPS1: case AV_QUEST_A_SCRAPS1:
@@ -150,7 +154,9 @@ void BattlegroundAV::HandleQuestComplete(uint32 questid, Player* player)
m_Team_QuestStatus[teamId][0]+=20; m_Team_QuestStatus[teamId][0]+=20;
if (m_Team_QuestStatus[teamId][0] == 500 || m_Team_QuestStatus[teamId][0] == 1000 || m_Team_QuestStatus[teamId][0] == 1500) //25, 50, 75 turn ins if (m_Team_QuestStatus[teamId][0] == 500 || m_Team_QuestStatus[teamId][0] == 1000 || m_Team_QuestStatus[teamId][0] == 1500) //25, 50, 75 turn ins
{ {
;//sLog->outDebug(LOG_FILTER_BATTLEGROUND, "BG_AV Quest %i completed starting with unit upgrading..", questid); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_BATTLEGROUND, "BG_AV Quest %i completed starting with unit upgrading..", questid);
#endif
for (BG_AV_Nodes i = BG_AV_NODES_FIRSTAID_STATION; i <= BG_AV_NODES_FROSTWOLF_HUT; ++i) for (BG_AV_Nodes i = BG_AV_NODES_FIRSTAID_STATION; i <= BG_AV_NODES_FROSTWOLF_HUT; ++i)
if (m_Nodes[i].OwnerId == player->GetTeamId() && m_Nodes[i].State == POINT_CONTROLED) if (m_Nodes[i].OwnerId == player->GetTeamId() && m_Nodes[i].State == POINT_CONTROLED)
{ {
@@ -165,21 +171,27 @@ void BattlegroundAV::HandleQuestComplete(uint32 questid, Player* player)
m_Team_QuestStatus[teamId][1]++; m_Team_QuestStatus[teamId][1]++;
RewardReputationToTeam(teamId, 1, teamId); RewardReputationToTeam(teamId, 1, teamId);
//if (m_Team_QuestStatus[team][1] == 30) //if (m_Team_QuestStatus[team][1] == 30)
;//sLog->outDebug(LOG_FILTER_BATTLEGROUND, "BG_AV Quest %i completed (need to implement some events here", questid); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_BATTLEGROUND, "BG_AV Quest %i completed (need to implement some events here", questid);
#endif
break; break;
case AV_QUEST_A_COMMANDER2: case AV_QUEST_A_COMMANDER2:
case AV_QUEST_H_COMMANDER2: case AV_QUEST_H_COMMANDER2:
m_Team_QuestStatus[teamId][2]++; m_Team_QuestStatus[teamId][2]++;
RewardReputationToTeam(teamId, 1, teamId); RewardReputationToTeam(teamId, 1, teamId);
//if (m_Team_QuestStatus[team][2] == 60) //if (m_Team_QuestStatus[team][2] == 60)
;//sLog->outDebug(LOG_FILTER_BATTLEGROUND, "BG_AV Quest %i completed (need to implement some events here", questid); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_BATTLEGROUND, "BG_AV Quest %i completed (need to implement some events here", questid);
#endif
break; break;
case AV_QUEST_A_COMMANDER3: case AV_QUEST_A_COMMANDER3:
case AV_QUEST_H_COMMANDER3: case AV_QUEST_H_COMMANDER3:
m_Team_QuestStatus[teamId][3]++; m_Team_QuestStatus[teamId][3]++;
RewardReputationToTeam(teamId, 1, teamId); RewardReputationToTeam(teamId, 1, teamId);
//if (m_Team_QuestStatus[team][3] == 120) //if (m_Team_QuestStatus[team][3] == 120)
;//sLog->outDebug(LOG_FILTER_BATTLEGROUND, "BG_AV Quest %i completed (need to implement some events here", questid); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_BATTLEGROUND, "BG_AV Quest %i completed (need to implement some events here", questid);
#endif
break; break;
case AV_QUEST_A_BOSS1: case AV_QUEST_A_BOSS1:
case AV_QUEST_H_BOSS1: case AV_QUEST_H_BOSS1:
@@ -188,16 +200,22 @@ void BattlegroundAV::HandleQuestComplete(uint32 questid, Player* player)
case AV_QUEST_H_BOSS2: case AV_QUEST_H_BOSS2:
m_Team_QuestStatus[teamId][4]++; m_Team_QuestStatus[teamId][4]++;
//if (m_Team_QuestStatus[team][4] >= 200) //if (m_Team_QuestStatus[team][4] >= 200)
;//sLog->outDebug(LOG_FILTER_BATTLEGROUND, "BG_AV Quest %i completed (need to implement some events here", questid); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_BATTLEGROUND, "BG_AV Quest %i completed (need to implement some events here", questid);
#endif
break; break;
case AV_QUEST_A_NEAR_MINE: case AV_QUEST_A_NEAR_MINE:
case AV_QUEST_H_NEAR_MINE: case AV_QUEST_H_NEAR_MINE:
m_Team_QuestStatus[teamId][5]++; m_Team_QuestStatus[teamId][5]++;
if (m_Team_QuestStatus[teamId][5] == 28) if (m_Team_QuestStatus[teamId][5] == 28)
{ {
;//sLog->outDebug(LOG_FILTER_BATTLEGROUND, "BG_AV Quest %i completed (need to implement some events here", questid); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_BATTLEGROUND, "BG_AV Quest %i completed (need to implement some events here", questid);
#endif
//if (m_Team_QuestStatus[team][6] == 7) //if (m_Team_QuestStatus[team][6] == 7)
;//sLog->outDebug(LOG_FILTER_BATTLEGROUND, "BG_AV Quest %i completed (need to implement some events here - ground assault ready", questid); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_BATTLEGROUND, "BG_AV Quest %i completed (need to implement some events here - ground assault ready", questid);
#endif
} }
break; break;
case AV_QUEST_A_OTHER_MINE: case AV_QUEST_A_OTHER_MINE:
@@ -205,9 +223,13 @@ void BattlegroundAV::HandleQuestComplete(uint32 questid, Player* player)
m_Team_QuestStatus[teamId][6]++; m_Team_QuestStatus[teamId][6]++;
if (m_Team_QuestStatus[teamId][6] == 7) if (m_Team_QuestStatus[teamId][6] == 7)
{ {
;//sLog->outDebug(LOG_FILTER_BATTLEGROUND, "BG_AV Quest %i completed (need to implement some events here", questid); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_BATTLEGROUND, "BG_AV Quest %i completed (need to implement some events here", questid);
#endif
//if (m_Team_QuestStatus[team][5] == 20) //if (m_Team_QuestStatus[team][5] == 20)
;//sLog->outDebug(LOG_FILTER_BATTLEGROUND, "BG_AV Quest %i completed (need to implement some events here - ground assault ready", questid); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_BATTLEGROUND, "BG_AV Quest %i completed (need to implement some events here - ground assault ready", questid);
#endif
} }
break; break;
case AV_QUEST_A_RIDER_HIDE: case AV_QUEST_A_RIDER_HIDE:
@@ -215,9 +237,13 @@ void BattlegroundAV::HandleQuestComplete(uint32 questid, Player* player)
m_Team_QuestStatus[teamId][7]++; m_Team_QuestStatus[teamId][7]++;
if (m_Team_QuestStatus[teamId][7] == 25) if (m_Team_QuestStatus[teamId][7] == 25)
{ {
;//sLog->outDebug(LOG_FILTER_BATTLEGROUND, "BG_AV Quest %i completed (need to implement some events here", questid); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_BATTLEGROUND, "BG_AV Quest %i completed (need to implement some events here", questid);
#endif
//if (m_Team_QuestStatus[team][8] == 25) //if (m_Team_QuestStatus[team][8] == 25)
;//sLog->outDebug(LOG_FILTER_BATTLEGROUND, "BG_AV Quest %i completed (need to implement some events here - rider assault ready", questid); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_BATTLEGROUND, "BG_AV Quest %i completed (need to implement some events here - rider assault ready", questid);
#endif
} }
break; break;
case AV_QUEST_A_RIDER_TAME: case AV_QUEST_A_RIDER_TAME:
@@ -225,13 +251,19 @@ void BattlegroundAV::HandleQuestComplete(uint32 questid, Player* player)
m_Team_QuestStatus[teamId][8]++; m_Team_QuestStatus[teamId][8]++;
if (m_Team_QuestStatus[teamId][8] == 25) if (m_Team_QuestStatus[teamId][8] == 25)
{ {
;//sLog->outDebug(LOG_FILTER_BATTLEGROUND, "BG_AV Quest %i completed (need to implement some events here", questid); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_BATTLEGROUND, "BG_AV Quest %i completed (need to implement some events here", questid);
#endif
//if (m_Team_QuestStatus[team][7] == 25) //if (m_Team_QuestStatus[team][7] == 25)
;//sLog->outDebug(LOG_FILTER_BATTLEGROUND, "BG_AV Quest %i completed (need to implement some events here - rider assault ready", questid); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_BATTLEGROUND, "BG_AV Quest %i completed (need to implement some events here - rider assault ready", questid);
#endif
} }
break; break;
default: default:
;//sLog->outDebug(LOG_FILTER_BATTLEGROUND, "BG_AV Quest %i completed but is not interesting at all", questid); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_BATTLEGROUND, "BG_AV Quest %i completed but is not interesting at all", questid);
#endif
return; //was no interesting quest at all return; //was no interesting quest at all
break; break;
} }
@@ -414,7 +446,9 @@ void BattlegroundAV::StartingEventCloseDoors()
void BattlegroundAV::StartingEventOpenDoors() void BattlegroundAV::StartingEventOpenDoors()
{ {
;//sLog->outDebug(LOG_FILTER_BATTLEGROUND, "BG_AV: start spawning mine stuff"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_BATTLEGROUND, "BG_AV: start spawning mine stuff");
#endif
for (uint16 i= BG_AV_OBJECT_MINE_SUPPLY_N_MIN; i <= BG_AV_OBJECT_MINE_SUPPLY_N_MAX; i++) for (uint16 i= BG_AV_OBJECT_MINE_SUPPLY_N_MIN; i <= BG_AV_OBJECT_MINE_SUPPLY_N_MAX; i++)
SpawnBGObject(i, RESPAWN_IMMEDIATELY); SpawnBGObject(i, RESPAWN_IMMEDIATELY);
for (uint16 i= BG_AV_OBJECT_MINE_SUPPLY_S_MIN; i <= BG_AV_OBJECT_MINE_SUPPLY_S_MAX; i++) for (uint16 i= BG_AV_OBJECT_MINE_SUPPLY_S_MIN; i <= BG_AV_OBJECT_MINE_SUPPLY_S_MAX; i++)
@@ -561,7 +595,9 @@ void BattlegroundAV::UpdatePlayerScore(Player* player, uint32 type, uint32 value
void BattlegroundAV::EventPlayerDestroyedPoint(BG_AV_Nodes node) void BattlegroundAV::EventPlayerDestroyedPoint(BG_AV_Nodes node)
{ {
uint32 object = GetObjectThroughNode(node); uint32 object = GetObjectThroughNode(node);
;//sLog->outDebug(LOG_FILTER_BATTLEGROUND, "bg_av: player destroyed point node %i object %i", node, object); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_BATTLEGROUND, "bg_av: player destroyed point node %i object %i", node, object);
#endif
//despawn banner //despawn banner
SpawnBGObject(object, RESPAWN_ONE_DAY); SpawnBGObject(object, RESPAWN_ONE_DAY);
@@ -634,7 +670,9 @@ void BattlegroundAV::ChangeMineOwner(uint8 mine, TeamId teamId, bool initial)
if (!initial) if (!initial)
{ {
;//sLog->outDebug(LOG_FILTER_BATTLEGROUND, "bg_av depopulating mine %i (0=north, 1=south)", mine); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_BATTLEGROUND, "bg_av depopulating mine %i (0=north, 1=south)", mine);
#endif
if (mine == AV_SOUTH_MINE) if (mine == AV_SOUTH_MINE)
for (uint16 i=AV_CPLACE_MINE_S_S_MIN; i <= AV_CPLACE_MINE_S_S_MAX; i++) for (uint16 i=AV_CPLACE_MINE_S_S_MIN; i <= AV_CPLACE_MINE_S_S_MAX; i++)
if (BgCreatures[i]) if (BgCreatures[i])
@@ -645,7 +683,9 @@ void BattlegroundAV::ChangeMineOwner(uint8 mine, TeamId teamId, bool initial)
} }
SendMineWorldStates(mine); SendMineWorldStates(mine);
;//sLog->outDebug(LOG_FILTER_BATTLEGROUND, "bg_av populating mine %i (0=north, 1=south)", mine); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_BATTLEGROUND, "bg_av populating mine %i (0=north, 1=south)", mine);
#endif
uint16 miner; uint16 miner;
//also neutral team exists.. after a big time, the neutral team tries to conquer the mine //also neutral team exists.. after a big time, the neutral team tries to conquer the mine
if (mine == AV_NORTH_MINE) if (mine == AV_NORTH_MINE)
@@ -667,7 +707,9 @@ void BattlegroundAV::ChangeMineOwner(uint8 mine, TeamId teamId, bool initial)
else else
miner = AV_NPC_S_MINE_N_1; miner = AV_NPC_S_MINE_N_1;
//vermin //vermin
;//sLog->outDebug(LOG_FILTER_BATTLEGROUND, "spawning vermin"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_BATTLEGROUND, "spawning vermin");
#endif
if (teamId == TEAM_ALLIANCE) if (teamId == TEAM_ALLIANCE)
cinfo = AV_NPC_S_MINE_A_3; cinfo = AV_NPC_S_MINE_A_3;
else if (teamId == TEAM_HORDE) else if (teamId == TEAM_HORDE)
@@ -785,7 +827,9 @@ void BattlegroundAV::DePopulateNode(BG_AV_Nodes node)
BG_AV_Nodes BattlegroundAV::GetNodeThroughObject(uint32 object) BG_AV_Nodes BattlegroundAV::GetNodeThroughObject(uint32 object)
{ {
;//sLog->outDebug(LOG_FILTER_BATTLEGROUND, "bg_AV getnodethroughobject %i", object); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_BATTLEGROUND, "bg_AV getnodethroughobject %i", object);
#endif
if (object <= BG_AV_OBJECT_FLAG_A_STONEHEART_BUNKER) if (object <= BG_AV_OBJECT_FLAG_A_STONEHEART_BUNKER)
return BG_AV_Nodes(object); return BG_AV_Nodes(object);
if (object <= BG_AV_OBJECT_FLAG_C_A_FROSTWOLF_HUT) if (object <= BG_AV_OBJECT_FLAG_C_A_FROSTWOLF_HUT)
@@ -807,7 +851,9 @@ BG_AV_Nodes BattlegroundAV::GetNodeThroughObject(uint32 object)
uint32 BattlegroundAV::GetObjectThroughNode(BG_AV_Nodes node) uint32 BattlegroundAV::GetObjectThroughNode(BG_AV_Nodes node)
{ //this function is the counterpart to GetNodeThroughObject() { //this function is the counterpart to GetNodeThroughObject()
;//sLog->outDebug(LOG_FILTER_BATTLEGROUND, "bg_AV GetObjectThroughNode %i", node); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_BATTLEGROUND, "bg_AV GetObjectThroughNode %i", node);
#endif
if (m_Nodes[node].OwnerId == TEAM_ALLIANCE) if (m_Nodes[node].OwnerId == TEAM_ALLIANCE)
{ {
if (m_Nodes[node].State == POINT_ASSAULTED) if (m_Nodes[node].State == POINT_ASSAULTED)
@@ -888,7 +934,9 @@ void BattlegroundAV::EventPlayerDefendsPoint(Player* player, uint32 object)
EventPlayerAssaultsPoint(player, object); EventPlayerAssaultsPoint(player, object);
return; return;
} }
;//sLog->outDebug(LOG_FILTER_BATTLEGROUND, "player defends point object: %i node: %i", object, node); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_BATTLEGROUND, "player defends point object: %i node: %i", object, node);
#endif
if (m_Nodes[node].PrevOwnerId != teamId) if (m_Nodes[node].PrevOwnerId != teamId)
{ {
sLog->outError("BG_AV: player defends point which doesn't belong to his team %i", node); sLog->outError("BG_AV: player defends point which doesn't belong to his team %i", node);
@@ -950,7 +998,9 @@ void BattlegroundAV::EventPlayerAssaultsPoint(Player* player, uint32 object)
BG_AV_Nodes node = GetNodeThroughObject(object); BG_AV_Nodes node = GetNodeThroughObject(object);
TeamId prevOwnerId = m_Nodes[node].OwnerId; TeamId prevOwnerId = m_Nodes[node].OwnerId;
TeamId teamId = player->GetTeamId(); TeamId teamId = player->GetTeamId();
;//sLog->outDebug(LOG_FILTER_BATTLEGROUND, "bg_av: player assaults point object %i node %i", object, node); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_BATTLEGROUND, "bg_av: player assaults point object %i node %i", object, node);
#endif
if (prevOwnerId == teamId || teamId == m_Nodes[node].TotalOwnerId) if (prevOwnerId == teamId || teamId == m_Nodes[node].TotalOwnerId)
return; //surely a gm used this object return; //surely a gm used this object
@@ -1304,7 +1354,9 @@ bool BattlegroundAV::SetupBattleground()
} }
uint16 i; uint16 i;
;//sLog->outDebug(LOG_FILTER_BATTLEGROUND, "Alterac Valley: entering state STATUS_WAIT_JOIN ..."); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_BATTLEGROUND, "Alterac Valley: entering state STATUS_WAIT_JOIN ...");
#endif
// Initial Nodes // Initial Nodes
for (i = 0; i < BG_AV_OBJECT_MAX; i++) for (i = 0; i < BG_AV_OBJECT_MAX; i++)
SpawnBGObject(i, RESPAWN_ONE_DAY); SpawnBGObject(i, RESPAWN_ONE_DAY);
@@ -1353,22 +1405,30 @@ bool BattlegroundAV::SetupBattleground()
SpawnBGObject(BG_AV_OBJECT_STORMPIKE_BANNER, RESPAWN_IMMEDIATELY); SpawnBGObject(BG_AV_OBJECT_STORMPIKE_BANNER, RESPAWN_IMMEDIATELY);
//creatures //creatures
;//sLog->outDebug(LOG_FILTER_BATTLEGROUND, "BG_AV start poputlating nodes"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_BATTLEGROUND, "BG_AV start poputlating nodes");
#endif
for (i = BG_AV_NODES_FIRSTAID_STATION; i < BG_AV_NODES_MAX; ++i) for (i = BG_AV_NODES_FIRSTAID_STATION; i < BG_AV_NODES_MAX; ++i)
{ {
if (m_Nodes[i].OwnerId != TEAM_NEUTRAL) if (m_Nodes[i].OwnerId != TEAM_NEUTRAL)
PopulateNode(BG_AV_Nodes(i)); PopulateNode(BG_AV_Nodes(i));
} }
//all creatures which don't get despawned through the script are static //all creatures which don't get despawned through the script are static
;//sLog->outDebug(LOG_FILTER_BATTLEGROUND, "BG_AV: start spawning static creatures"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_BATTLEGROUND, "BG_AV: start spawning static creatures");
#endif
for (i = 0; i < AV_STATICCPLACE_MAX; i++) for (i = 0; i < AV_STATICCPLACE_MAX; i++)
AddAVCreature(0, i + AV_CPLACE_MAX); AddAVCreature(0, i + AV_CPLACE_MAX);
//mainspiritguides: //mainspiritguides:
;//sLog->outDebug(LOG_FILTER_BATTLEGROUND, "BG_AV: start spawning spiritguides creatures"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_BATTLEGROUND, "BG_AV: start spawning spiritguides creatures");
#endif
AddSpiritGuide(7, BG_AV_CreaturePos[7][0], BG_AV_CreaturePos[7][1], BG_AV_CreaturePos[7][2], BG_AV_CreaturePos[7][3], TEAM_ALLIANCE); AddSpiritGuide(7, BG_AV_CreaturePos[7][0], BG_AV_CreaturePos[7][1], BG_AV_CreaturePos[7][2], BG_AV_CreaturePos[7][3], TEAM_ALLIANCE);
AddSpiritGuide(8, BG_AV_CreaturePos[8][0], BG_AV_CreaturePos[8][1], BG_AV_CreaturePos[8][2], BG_AV_CreaturePos[8][3], TEAM_HORDE); AddSpiritGuide(8, BG_AV_CreaturePos[8][0], BG_AV_CreaturePos[8][1], BG_AV_CreaturePos[8][2], BG_AV_CreaturePos[8][3], TEAM_HORDE);
//spawn the marshals (those who get deleted, if a tower gets destroyed) //spawn the marshals (those who get deleted, if a tower gets destroyed)
;//sLog->outDebug(LOG_FILTER_BATTLEGROUND, "BG_AV: start spawning marshal creatures"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_BATTLEGROUND, "BG_AV: start spawning marshal creatures");
#endif
for (i = AV_NPC_A_MARSHAL_SOUTH; i <= AV_NPC_H_MARSHAL_WTOWER; i++) for (i = AV_NPC_A_MARSHAL_SOUTH; i <= AV_NPC_H_MARSHAL_WTOWER; i++)
AddAVCreature(i, AV_CPLACE_A_MARSHAL_SOUTH + (i - AV_NPC_A_MARSHAL_SOUTH)); AddAVCreature(i, AV_CPLACE_A_MARSHAL_SOUTH + (i - AV_NPC_A_MARSHAL_SOUTH));
AddAVCreature(AV_NPC_HERALD, AV_CPLACE_HERALD); AddAVCreature(AV_NPC_HERALD, AV_CPLACE_HERALD);
src/game/Calendar/CalendarMgr.cpp
+3 -1
View File
@@ -306,7 +306,9 @@ CalendarInvite* CalendarMgr::GetInvite(uint64 inviteId) const
if ((*itr2)->GetInviteId() == inviteId) if ((*itr2)->GetInviteId() == inviteId)
return *itr2; return *itr2;
;//sLog->outDebug(LOG_FILTER_CALENDAR, "CalendarMgr::GetInvite: [" UI64FMTD "] not found!", inviteId); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_CALENDAR, "CalendarMgr::GetInvite: [" UI64FMTD "] not found!", inviteId);
#endif
return NULL; return NULL;
} }
src/game/Chat/Channels/Channel.cpp
+6 -2
View File
@@ -96,7 +96,9 @@ void Channel::UpdateChannelInDB() const
stmt->setUInt32(2, _channelDBId); stmt->setUInt32(2, _channelDBId);
CharacterDatabase.Execute(stmt); CharacterDatabase.Execute(stmt);
;//sLog->outDebug(LOG_FILTER_CHATSYS, "Channel(%s) updated in database", _name.c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_CHATSYS, "Channel(%s) updated in database", _name.c_str());
#endif
} }
} }
@@ -682,7 +684,9 @@ void Channel::List(Player const* player)
return; return;
} }
;//sLog->outDebug(LOG_FILTER_CHATSYS, "SMSG_CHANNEL_LIST %s Channel: %s", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_CHATSYS, "SMSG_CHANNEL_LIST %s Channel: %s",
#endif
// player->GetSession()->GetPlayerInfo().c_str(), GetName().c_str()); // player->GetSession()->GetPlayerInfo().c_str(), GetName().c_str());
WorldPacket data(SMSG_CHANNEL_LIST, 1+(GetName().size()+1)+1+4+playersStore.size()*(8+1)); WorldPacket data(SMSG_CHANNEL_LIST, 1+(GetName().size()+1)+1+4+playersStore.size()*(8+1));
src/game/Chat/ChatLink.cpp
+150 -50
View File
@@ -64,7 +64,9 @@ inline bool CheckDelimiter(std::istringstream& iss, char delimiter, const char*
char c = iss.peek(); char c = iss.peek();
if (c != delimiter) if (c != delimiter)
{ {
;//sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): invalid %s link structure ('%c' expected, '%c' found)", iss.str().c_str(), context, delimiter, c); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): invalid %s link structure ('%c' expected, '%c' found)", iss.str().c_str(), context, delimiter, c);
#endif
return false; return false;
} }
iss.ignore(1); iss.ignore(1);
@@ -98,20 +100,26 @@ bool ItemChatLink::Initialize(std::istringstream& iss)
uint32 itemEntry = 0; uint32 itemEntry = 0;
if (!ReadUInt32(iss, itemEntry)) if (!ReadUInt32(iss, itemEntry))
{ {
;//sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): sequence finished unexpectedly while reading item entry", iss.str().c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): sequence finished unexpectedly while reading item entry", iss.str().c_str());
#endif
return false; return false;
} }
// Validate item // Validate item
_item = sObjectMgr->GetItemTemplate(itemEntry); _item = sObjectMgr->GetItemTemplate(itemEntry);
if (!_item) if (!_item)
{ {
;//sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): got invalid itemEntry %u in |item command", iss.str().c_str(), itemEntry); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): got invalid itemEntry %u in |item command", iss.str().c_str(), itemEntry);
#endif
return false; return false;
} }
// Validate item's color // Validate item's color
if (_color != ItemQualityColors[_item->Quality]) if (_color != ItemQualityColors[_item->Quality])
{ {
;//sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): linked item has color %u, but user claims %u", iss.str().c_str(), ItemQualityColors[_item->Quality], _color); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): linked item has color %u, but user claims %u", iss.str().c_str(), ItemQualityColors[_item->Quality], _color);
#endif
return false; return false;
} }
// Number of various item properties after item entry // Number of various item properties after item entry
@@ -125,7 +133,9 @@ bool ItemChatLink::Initialize(std::istringstream& iss)
int32 id = 0; int32 id = 0;
if (!ReadInt32(iss, id)) if (!ReadInt32(iss, id))
{ {
;//sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): sequence finished unexpectedly while reading item property (%u)", iss.str().c_str(), index); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): sequence finished unexpectedly while reading item property (%u)", iss.str().c_str(), index);
#endif
return false; return false;
} }
if (id && (index == randomPropertyPosition)) if (id && (index == randomPropertyPosition))
@@ -136,7 +146,9 @@ bool ItemChatLink::Initialize(std::istringstream& iss)
_property = sItemRandomPropertiesStore.LookupEntry(id); _property = sItemRandomPropertiesStore.LookupEntry(id);
if (!_property) if (!_property)
{ {
;//sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): got invalid item property id %u in |item command", iss.str().c_str(), id); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): got invalid item property id %u in |item command", iss.str().c_str(), id);
#endif
return false; return false;
} }
} }
@@ -145,7 +157,9 @@ bool ItemChatLink::Initialize(std::istringstream& iss)
_suffix = sItemRandomSuffixStore.LookupEntry(-id); _suffix = sItemRandomSuffixStore.LookupEntry(-id);
if (!_suffix) if (!_suffix)
{ {
;//sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): got invalid item suffix id %u in |item command", iss.str().c_str(), -id); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): got invalid item suffix id %u in |item command", iss.str().c_str(), -id);
#endif
return false; return false;
} }
} }
@@ -188,7 +202,9 @@ bool ItemChatLink::ValidateName(char* buffer, const char* context)
} }
} }
//if (!res) //if (!res)
;//sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): linked item (id: %u) name wasn't found in any localization", context, _item->ItemId); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): linked item (id: %u) name wasn't found in any localization", context, _item->ItemId);
#endif
return res; return res;
} }
@@ -200,14 +216,18 @@ bool QuestChatLink::Initialize(std::istringstream& iss)
uint32 questId = 0; uint32 questId = 0;
if (!ReadUInt32(iss, questId)) if (!ReadUInt32(iss, questId))
{ {
;//sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): sequence finished unexpectedly while reading quest entry", iss.str().c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): sequence finished unexpectedly while reading quest entry", iss.str().c_str());
#endif
return false; return false;
} }
// Validate quest // Validate quest
_quest = sObjectMgr->GetQuestTemplate(questId); _quest = sObjectMgr->GetQuestTemplate(questId);
if (!_quest) if (!_quest)
{ {
;//sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): quest template %u not found", iss.str().c_str(), questId); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): quest template %u not found", iss.str().c_str(), questId);
#endif
return false; return false;
} }
// Check delimiter // Check delimiter
@@ -216,13 +236,17 @@ bool QuestChatLink::Initialize(std::istringstream& iss)
// Read quest level // Read quest level
if (!ReadInt32(iss, _questLevel)) if (!ReadInt32(iss, _questLevel))
{ {
;//sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): sequence finished unexpectedly while reading quest level", iss.str().c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): sequence finished unexpectedly while reading quest level", iss.str().c_str());
#endif
return false; return false;
} }
// Validate quest level // Validate quest level
if (_questLevel >= STRONG_MAX_LEVEL) if (_questLevel >= STRONG_MAX_LEVEL)
{ {
;//sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): quest level %d is too big", iss.str().c_str(), _questLevel); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): quest level %d is too big", iss.str().c_str(), _questLevel);
#endif
return false; return false;
} }
return true; return true;
@@ -235,7 +259,9 @@ bool QuestChatLink::ValidateName(char* buffer, const char* context)
bool res = (_quest->GetTitle() == buffer); bool res = (_quest->GetTitle() == buffer);
//if (!res) //if (!res)
;//sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): linked quest (id: %u) title wasn't found in any localization", context, _quest->GetQuestId()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): linked quest (id: %u) title wasn't found in any localization", context, _quest->GetQuestId());
#endif
return res; return res;
} }
@@ -249,14 +275,18 @@ bool SpellChatLink::Initialize(std::istringstream& iss)
uint32 spellId = 0; uint32 spellId = 0;
if (!ReadUInt32(iss, spellId)) if (!ReadUInt32(iss, spellId))
{ {
;//sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): sequence finished unexpectedly while reading spell entry", iss.str().c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): sequence finished unexpectedly while reading spell entry", iss.str().c_str());
#endif
return false; return false;
} }
// Validate spell // Validate spell
_spell = sSpellMgr->GetSpellInfo(spellId); _spell = sSpellMgr->GetSpellInfo(spellId);
if (!_spell) if (!_spell)
{ {
;//sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): got invalid spell id %u in |spell command", iss.str().c_str(), spellId); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): got invalid spell id %u in |spell command", iss.str().c_str(), spellId);
#endif
return false; return false;
} }
return true; return true;
@@ -272,19 +302,25 @@ bool SpellChatLink::ValidateName(char* buffer, const char* context)
SkillLineAbilityMapBounds bounds = sSpellMgr->GetSkillLineAbilityMapBounds(_spell->Id); SkillLineAbilityMapBounds bounds = sSpellMgr->GetSkillLineAbilityMapBounds(_spell->Id);
if (bounds.first == bounds.second) if (bounds.first == bounds.second)
{ {
;//sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): skill line not found for spell %u", context, _spell->Id); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): skill line not found for spell %u", context, _spell->Id);
#endif
return false; return false;
} }
SkillLineAbilityEntry const* skillInfo = bounds.first->second; SkillLineAbilityEntry const* skillInfo = bounds.first->second;
if (!skillInfo) if (!skillInfo)
{ {
;//sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): skill line ability not found for spell %u", context, _spell->Id); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): skill line ability not found for spell %u", context, _spell->Id);
#endif
return false; return false;
} }
SkillLineEntry const* skillLine = sSkillLineStore.LookupEntry(skillInfo->skillId); SkillLineEntry const* skillLine = sSkillLineStore.LookupEntry(skillInfo->skillId);
if (!skillLine) if (!skillLine)
{ {
;//sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): skill line not found for skill %u", context, skillInfo->skillId); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): skill line not found for skill %u", context, skillInfo->skillId);
#endif
return false; return false;
} }
@@ -311,7 +347,9 @@ bool SpellChatLink::ValidateName(char* buffer, const char* context)
} }
//if (!res) //if (!res)
;//sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): linked spell (id: %u) name wasn't found in any localization", context, _spell->Id); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): linked spell (id: %u) name wasn't found in any localization", context, _spell->Id);
#endif
return res; return res;
} }
@@ -325,14 +363,18 @@ bool AchievementChatLink::Initialize(std::istringstream& iss)
uint32 achievementId = 0; uint32 achievementId = 0;
if (!ReadUInt32(iss, achievementId)) if (!ReadUInt32(iss, achievementId))
{ {
;//sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): sequence finished unexpectedly while reading achievement entry", iss.str().c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): sequence finished unexpectedly while reading achievement entry", iss.str().c_str());
#endif
return false; return false;
} }
// Validate achievement // Validate achievement
_achievement = sAchievementStore.LookupEntry(achievementId); _achievement = sAchievementStore.LookupEntry(achievementId);
if (!_achievement) if (!_achievement)
{ {
;//sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): got invalid achivement id %u in |achievement command", iss.str().c_str(), achievementId); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): got invalid achivement id %u in |achievement command", iss.str().c_str(), achievementId);
#endif
return false; return false;
} }
// Check delimiter // Check delimiter
@@ -341,7 +383,9 @@ bool AchievementChatLink::Initialize(std::istringstream& iss)
// Read HEX // Read HEX
if (!ReadHex(iss, _guid, 0)) if (!ReadHex(iss, _guid, 0))
{ {
;//sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): invalid hexadecimal number while reading char's guid", iss.str().c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): invalid hexadecimal number while reading char's guid", iss.str().c_str());
#endif
return false; return false;
} }
// Skip progress // Skip progress
@@ -353,7 +397,9 @@ bool AchievementChatLink::Initialize(std::istringstream& iss)
if (!ReadUInt32(iss, _data[index])) if (!ReadUInt32(iss, _data[index]))
{ {
;//sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): sequence finished unexpectedly while reading achievement property (%u)", iss.str().c_str(), index); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): sequence finished unexpectedly while reading achievement property (%u)", iss.str().c_str(), index);
#endif
return false; return false;
} }
} }
@@ -373,7 +419,9 @@ bool AchievementChatLink::ValidateName(char* buffer, const char* context)
} }
//if (!res) //if (!res)
;//sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): linked achievement (id: %u) name wasn't found in any localization", context, _achievement->ID); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): linked achievement (id: %u) name wasn't found in any localization", context, _achievement->ID);
#endif
return res; return res;
} }
@@ -387,14 +435,18 @@ bool TradeChatLink::Initialize(std::istringstream& iss)
uint32 spellId = 0; uint32 spellId = 0;
if (!ReadUInt32(iss, spellId)) if (!ReadUInt32(iss, spellId))
{ {
;//sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): sequence finished unexpectedly while reading achievement entry", iss.str().c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): sequence finished unexpectedly while reading achievement entry", iss.str().c_str());
#endif
return false; return false;
} }
// Validate spell // Validate spell
_spell = sSpellMgr->GetSpellInfo(spellId); _spell = sSpellMgr->GetSpellInfo(spellId);
if (!_spell) if (!_spell)
{ {
;//sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): got invalid spell id %u in |trade command", iss.str().c_str(), spellId); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): got invalid spell id %u in |trade command", iss.str().c_str(), spellId);
#endif
return false; return false;
} }
// Check delimiter // Check delimiter
@@ -403,7 +455,9 @@ bool TradeChatLink::Initialize(std::istringstream& iss)
// Minimum talent level // Minimum talent level
if (!ReadInt32(iss, _minSkillLevel)) if (!ReadInt32(iss, _minSkillLevel))
{ {
;//sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): sequence finished unexpectedly while reading minimum talent level", iss.str().c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): sequence finished unexpectedly while reading minimum talent level", iss.str().c_str());
#endif
return false; return false;
} }
// Check delimiter // Check delimiter
@@ -412,7 +466,9 @@ bool TradeChatLink::Initialize(std::istringstream& iss)
// Maximum talent level // Maximum talent level
if (!ReadInt32(iss, _maxSkillLevel)) if (!ReadInt32(iss, _maxSkillLevel))
{ {
;//sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): sequence finished unexpectedly while reading maximum talent level", iss.str().c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): sequence finished unexpectedly while reading maximum talent level", iss.str().c_str());
#endif
return false; return false;
} }
// Check delimiter // Check delimiter
@@ -421,7 +477,9 @@ bool TradeChatLink::Initialize(std::istringstream& iss)
// Something hexadecimal // Something hexadecimal
if (!ReadHex(iss, _guid, 0)) if (!ReadHex(iss, _guid, 0))
{ {
;//sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): sequence finished unexpectedly while reading achievement's owner guid", iss.str().c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): sequence finished unexpectedly while reading achievement's owner guid", iss.str().c_str());
#endif
return false; return false;
} }
// Skip base64 encoded stuff // Skip base64 encoded stuff
@@ -438,21 +496,27 @@ bool TalentChatLink::Initialize(std::istringstream& iss)
// Read talent entry // Read talent entry
if (!ReadUInt32(iss, _talentId)) if (!ReadUInt32(iss, _talentId))
{ {
;//sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): sequence finished unexpectedly while reading talent entry", iss.str().c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): sequence finished unexpectedly while reading talent entry", iss.str().c_str());
#endif
return false; return false;
} }
// Validate talent // Validate talent
TalentEntry const* talentInfo = sTalentStore.LookupEntry(_talentId); TalentEntry const* talentInfo = sTalentStore.LookupEntry(_talentId);
if (!talentInfo) if (!talentInfo)
{ {
;//sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): got invalid talent id %u in |talent command", iss.str().c_str(), _talentId); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): got invalid talent id %u in |talent command", iss.str().c_str(), _talentId);
#endif
return false; return false;
} }
// Validate talent's spell // Validate talent's spell
_spell = sSpellMgr->GetSpellInfo(talentInfo->RankID[0]); _spell = sSpellMgr->GetSpellInfo(talentInfo->RankID[0]);
if (!_spell) if (!_spell)
{ {
;//sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): got invalid spell id %u in |trade command", iss.str().c_str(), talentInfo->RankID[0]); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): got invalid spell id %u in |trade command", iss.str().c_str(), talentInfo->RankID[0]);
#endif
return false; return false;
} }
// Delimiter // Delimiter
@@ -461,7 +525,9 @@ bool TalentChatLink::Initialize(std::istringstream& iss)
// Rank // Rank
if (!ReadInt32(iss, _rankId)) if (!ReadInt32(iss, _rankId))
{ {
;//sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): sequence finished unexpectedly while reading talent rank", iss.str().c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): sequence finished unexpectedly while reading talent rank", iss.str().c_str());
#endif
return false; return false;
} }
return true; return true;
@@ -477,14 +543,18 @@ bool EnchantmentChatLink::Initialize(std::istringstream& iss)
uint32 spellId = 0; uint32 spellId = 0;
if (!ReadUInt32(iss, spellId)) if (!ReadUInt32(iss, spellId))
{ {
;//sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): sequence finished unexpectedly while reading enchantment spell entry", iss.str().c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): sequence finished unexpectedly while reading enchantment spell entry", iss.str().c_str());
#endif
return false; return false;
} }
// Validate spell // Validate spell
_spell = sSpellMgr->GetSpellInfo(spellId); _spell = sSpellMgr->GetSpellInfo(spellId);
if (!_spell) if (!_spell)
{ {
;//sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): got invalid spell id %u in |enchant command", iss.str().c_str(), spellId); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): got invalid spell id %u in |enchant command", iss.str().c_str(), spellId);
#endif
return false; return false;
} }
return true; return true;
@@ -499,7 +569,9 @@ bool GlyphChatLink::Initialize(std::istringstream& iss)
// Slot // Slot
if (!ReadUInt32(iss, _slotId)) if (!ReadUInt32(iss, _slotId))
{ {
;//sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): sequence finished unexpectedly while reading slot id", iss.str().c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): sequence finished unexpectedly while reading slot id", iss.str().c_str());
#endif
return false; return false;
} }
// Check delimiter // Check delimiter
@@ -509,21 +581,27 @@ bool GlyphChatLink::Initialize(std::istringstream& iss)
uint32 glyphId = 0; uint32 glyphId = 0;
if (!ReadUInt32(iss, glyphId)) if (!ReadUInt32(iss, glyphId))
{ {
;//sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): sequence finished unexpectedly while reading glyph entry", iss.str().c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): sequence finished unexpectedly while reading glyph entry", iss.str().c_str());
#endif
return false; return false;
} }
// Validate glyph // Validate glyph
_glyph = sGlyphPropertiesStore.LookupEntry(glyphId); _glyph = sGlyphPropertiesStore.LookupEntry(glyphId);
if (!_glyph) if (!_glyph)
{ {
;//sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): got invalid glyph id %u in |glyph command", iss.str().c_str(), glyphId); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): got invalid glyph id %u in |glyph command", iss.str().c_str(), glyphId);
#endif
return false; return false;
} }
// Validate glyph's spell // Validate glyph's spell
_spell = sSpellMgr->GetSpellInfo(_glyph->SpellId); _spell = sSpellMgr->GetSpellInfo(_glyph->SpellId);
if (!_spell) if (!_spell)
{ {
;//sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): got invalid spell id %u in |glyph command", iss.str().c_str(), _glyph->SpellId); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): got invalid spell id %u in |glyph command", iss.str().c_str(), _glyph->SpellId);
#endif
return false; return false;
} }
return true; return true;
@@ -561,14 +639,18 @@ bool LinkExtractor::IsValidMessage()
} }
else if (_iss.get() != PIPE_CHAR) else if (_iss.get() != PIPE_CHAR)
{ {
;//sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): sequence aborted unexpectedly", _iss.str().c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): sequence aborted unexpectedly", _iss.str().c_str());
#endif
return false; return false;
} }
// pipe has always to be followed by at least one char // pipe has always to be followed by at least one char
if (_iss.peek() == '\0') if (_iss.peek() == '\0')
{ {
;//sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): pipe followed by '\\0'", _iss.str().c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): pipe followed by '\\0'", _iss.str().c_str());
#endif
return false; return false;
} }
@@ -591,14 +673,18 @@ bool LinkExtractor::IsValidMessage()
} }
else else
{ {
;//sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): invalid sequence, expected '%c' but got '%c'", _iss.str().c_str(), *validSequenceIterator, commandChar); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): invalid sequence, expected '%c' but got '%c'", _iss.str().c_str(), *validSequenceIterator, commandChar);
#endif
return false; return false;
} }
} }
else if (validSequence != validSequenceIterator) else if (validSequence != validSequenceIterator)
{ {
// no escaped pipes in sequences // no escaped pipes in sequences
;//sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): got escaped pipe in sequence", _iss.str().c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): got escaped pipe in sequence", _iss.str().c_str());
#endif
return false; return false;
} }
@@ -607,7 +693,9 @@ bool LinkExtractor::IsValidMessage()
case 'c': case 'c':
if (!ReadHex(_iss, color, 8)) if (!ReadHex(_iss, color, 8))
{ {
;//sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): invalid hexadecimal number while reading color", _iss.str().c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): invalid hexadecimal number while reading color", _iss.str().c_str());
#endif
return false; return false;
} }
break; break;
@@ -616,7 +704,9 @@ bool LinkExtractor::IsValidMessage()
_iss.getline(buffer, 256, DELIMITER); _iss.getline(buffer, 256, DELIMITER);
if (_iss.eof()) if (_iss.eof())
{ {
;//sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): sequence finished unexpectedly", _iss.str().c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): sequence finished unexpectedly", _iss.str().c_str());
#endif
return false; return false;
} }
@@ -638,7 +728,9 @@ bool LinkExtractor::IsValidMessage()
link = new GlyphChatLink(); link = new GlyphChatLink();
else else
{ {
;//sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): user sent unsupported link type '%s'", _iss.str().c_str(), buffer); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): user sent unsupported link type '%s'", _iss.str().c_str(), buffer);
#endif
return false; return false;
} }
_links.push_back(link); _links.push_back(link);
@@ -653,13 +745,17 @@ bool LinkExtractor::IsValidMessage()
// links start with '[' // links start with '['
if (_iss.get() != '[') if (_iss.get() != '[')
{ {
;//sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): link caption doesn't start with '['", _iss.str().c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): link caption doesn't start with '['", _iss.str().c_str());
#endif
return false; return false;
} }
_iss.getline(buffer, 256, ']'); _iss.getline(buffer, 256, ']');
if (_iss.eof()) if (_iss.eof())
{ {
;//sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): sequence finished unexpectedly", _iss.str().c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): sequence finished unexpectedly", _iss.str().c_str());
#endif
return false; return false;
} }
@@ -677,7 +773,9 @@ bool LinkExtractor::IsValidMessage()
// no further payload // no further payload
break; break;
default: default:
;//sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): got invalid command |%c", _iss.str().c_str(), commandChar); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): got invalid command |%c", _iss.str().c_str(), commandChar);
#endif
return false; return false;
} }
} }
@@ -685,7 +783,9 @@ bool LinkExtractor::IsValidMessage()
// check if every opened sequence was also closed properly // check if every opened sequence was also closed properly
if (validSequence != validSequenceIterator) if (validSequence != validSequenceIterator)
{ {
;//sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): EOF in active sequence", _iss.str().c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): EOF in active sequence", _iss.str().c_str());
#endif
return false; return false;
} }
src/game/Conditions/ConditionMgr.cpp
+24 -8
View File
@@ -26,7 +26,9 @@ bool Condition::Meets(ConditionSourceInfo& sourceInfo)
// object not present, return false // object not present, return false
if (!object) if (!object)
{ {
;//sLog->outDebug(LOG_FILTER_CONDITIONSYS, "Condition object not found for condition (Entry: %u Type: %u Group: %u)", SourceEntry, SourceType, SourceGroup); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_CONDITIONSYS, "Condition object not found for condition (Entry: %u Type: %u Group: %u)", SourceEntry, SourceType, SourceGroup);
#endif
return false; return false;
} }
bool condMeets = false; bool condMeets = false;
@@ -632,7 +634,9 @@ bool ConditionMgr::IsObjectMeetToConditionList(ConditionSourceInfo& sourceInfo,
std::map<uint32, bool> ElseGroupStore; std::map<uint32, bool> ElseGroupStore;
for (ConditionList::const_iterator i = conditions.begin(); i != conditions.end(); ++i) for (ConditionList::const_iterator i = conditions.begin(); i != conditions.end(); ++i)
{ {
;//sLog->outDebug(LOG_FILTER_CONDITIONSYS, "ConditionMgr::IsPlayerMeetToConditionList condType: %u val1: %u", (*i)->ConditionType, (*i)->ConditionValue1); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_CONDITIONSYS, "ConditionMgr::IsPlayerMeetToConditionList condType: %u val1: %u", (*i)->ConditionType, (*i)->ConditionValue1);
#endif
if ((*i)->isLoaded()) if ((*i)->isLoaded())
{ {
//! Find ElseGroup in ElseGroupStore //! Find ElseGroup in ElseGroupStore
@@ -653,7 +657,9 @@ bool ConditionMgr::IsObjectMeetToConditionList(ConditionSourceInfo& sourceInfo,
} }
else else
{ {
;//sLog->outDebug(LOG_FILTER_CONDITIONSYS, "IsPlayerMeetToConditionList: Reference template -%u not found", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_CONDITIONSYS, "IsPlayerMeetToConditionList: Reference template -%u not found",
#endif
// (*i)->ReferenceId);//checked at loading, should never happen // (*i)->ReferenceId);//checked at loading, should never happen
} }
@@ -689,7 +695,9 @@ bool ConditionMgr::IsObjectMeetToConditions(ConditionSourceInfo& sourceInfo, Con
if (conditions.empty()) if (conditions.empty())
return true; return true;
;//sLog->outDebug(LOG_FILTER_CONDITIONSYS, "ConditionMgr::IsObjectMeetToConditions"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_CONDITIONSYS, "ConditionMgr::IsObjectMeetToConditions");
#endif
return IsObjectMeetToConditionList(sourceInfo, conditions); return IsObjectMeetToConditionList(sourceInfo, conditions);
} }
@@ -733,7 +741,9 @@ ConditionList ConditionMgr::GetConditionsForNotGroupedEntry(ConditionSourceType
if (i != (*itr).second.end()) if (i != (*itr).second.end())
{ {
spellCond = (*i).second; spellCond = (*i).second;
;//sLog->outDebug(LOG_FILTER_CONDITIONSYS, "GetConditionsForNotGroupedEntry: found conditions for type %u and entry %u", uint32(sourceType), entry); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_CONDITIONSYS, "GetConditionsForNotGroupedEntry: found conditions for type %u and entry %u", uint32(sourceType), entry);
#endif
} }
} }
} }
@@ -750,7 +760,9 @@ ConditionList ConditionMgr::GetConditionsForSpellClickEvent(uint32 creatureId, u
if (i != (*itr).second.end()) if (i != (*itr).second.end())
{ {
cond = (*i).second; cond = (*i).second;
;//sLog->outDebug(LOG_FILTER_CONDITIONSYS, "GetConditionsForSpellClickEvent: found conditions for Vehicle entry %u spell %u", creatureId, spellId); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_CONDITIONSYS, "GetConditionsForSpellClickEvent: found conditions for Vehicle entry %u spell %u", creatureId, spellId);
#endif
} }
} }
return cond; return cond;
@@ -766,7 +778,9 @@ ConditionList ConditionMgr::GetConditionsForVehicleSpell(uint32 creatureId, uint
if (i != (*itr).second.end()) if (i != (*itr).second.end())
{ {
cond = (*i).second; cond = (*i).second;
;//sLog->outDebug(LOG_FILTER_CONDITIONSYS, "GetConditionsForVehicleSpell: found conditions for Vehicle entry %u spell %u", creatureId, spellId); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_CONDITIONSYS, "GetConditionsForVehicleSpell: found conditions for Vehicle entry %u spell %u", creatureId, spellId);
#endif
} }
} }
return cond; return cond;
@@ -782,7 +796,9 @@ ConditionList ConditionMgr::GetConditionsForSmartEvent(int32 entryOrGuid, uint32
if (i != (*itr).second.end()) if (i != (*itr).second.end())
{ {
cond = (*i).second; cond = (*i).second;
;//sLog->outDebug(LOG_FILTER_CONDITIONSYS, "GetConditionsForSmartEvent: found conditions for Smart Event entry or guid %d event_id %u", entryOrGuid, eventId); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_CONDITIONSYS, "GetConditionsForSmartEvent: found conditions for Smart Event entry or guid %d event_id %u", entryOrGuid, eventId);
#endif
} }
} }
return cond; return cond;
src/game/DungeonFinding/LFGMgr.cpp
+69 -23
View File
@@ -616,7 +616,9 @@ void LFGMgr::JoinLfg(Player* player, uint8 roles, LfgDungeonSet& dungeons, const
// Can't join. Send result // Can't join. Send result
if (joinData.result != LFG_JOIN_OK) if (joinData.result != LFG_JOIN_OK)
{ {
;//sLog->outDebug((LOG_FILTER_LFG, "LFGMgr::Join: [" UI64FMTD "] joining with %u members. result: %u", guid, grp ? grp->GetMembersCount() : 1, joinData.result); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug((LOG_FILTER_LFG, "LFGMgr::Join: [" UI64FMTD "] joining with %u members. result: %u", guid, grp ? grp->GetMembersCount() : 1, joinData.result);
#endif
if (!dungeons.empty()) // Only should show lockmap when have no dungeons available if (!dungeons.empty()) // Only should show lockmap when have no dungeons available
joinData.lockmap.clear(); joinData.lockmap.clear();
player->GetSession()->SendLfgJoinResult(joinData); player->GetSession()->SendLfgJoinResult(joinData);
@@ -707,7 +709,9 @@ void LFGMgr::JoinLfg(Player* player, uint8 roles, LfgDungeonSet& dungeons, const
std::ostringstream o; std::ostringstream o;
o << "LFGMgr::Join: [" << guid << "] joined (" << (grp ? "group" : "player") << ") Members: " << debugNames.c_str() o << "LFGMgr::Join: [" << guid << "] joined (" << (grp ? "group" : "player") << ") Members: " << debugNames.c_str()
<< ". Dungeons (" << uint32(dungeons.size()) << "): " << ConcatenateDungeons(dungeons); << ". Dungeons (" << uint32(dungeons.size()) << "): " << ConcatenateDungeons(dungeons);
;//sLog->outDebug((LOG_FILTER_LFG, "%s", o.str().c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug((LOG_FILTER_LFG, "%s", o.str().c_str());
#endif
}*/ }*/
} }
@@ -1601,7 +1605,9 @@ void LFGMgr::UpdateProposal(uint32 proposalId, uint64 guid, bool accept)
LfgProposalPlayer& player = itProposalPlayer->second; LfgProposalPlayer& player = itProposalPlayer->second;
player.accept = LfgAnswer(accept); player.accept = LfgAnswer(accept);
;//sLog->outDebug((LOG_FILTER_LFG, "LFGMgr::UpdateProposal: Player [" UI64FMTD "] of proposal %u selected: %u", guid, proposalId, accept); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug((LOG_FILTER_LFG, "LFGMgr::UpdateProposal: Player [" UI64FMTD "] of proposal %u selected: %u", guid, proposalId, accept);
#endif
if (!accept) if (!accept)
{ {
RemoveProposal(itProposal, LFG_UPDATETYPE_PROPOSAL_DECLINED); RemoveProposal(itProposal, LFG_UPDATETYPE_PROPOSAL_DECLINED);
@@ -1692,7 +1698,9 @@ void LFGMgr::RemoveProposal(LfgProposalContainer::iterator itProposal, LfgUpdate
LfgProposal& proposal = itProposal->second; LfgProposal& proposal = itProposal->second;
proposal.state = LFG_PROPOSAL_FAILED; proposal.state = LFG_PROPOSAL_FAILED;
;//sLog->outDebug((LOG_FILTER_LFG, "LFGMgr::RemoveProposal: Proposal %u, state FAILED, UpdateType %u", itProposal->first, type); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug((LOG_FILTER_LFG, "LFGMgr::RemoveProposal: Proposal %u, state FAILED, UpdateType %u", itProposal->first, type);
#endif
// Mark all people that didn't answered as no accept // Mark all people that didn't answered as no accept
if (type == LFG_UPDATETYPE_PROPOSAL_FAILED) if (type == LFG_UPDATETYPE_PROPOSAL_FAILED)
for (LfgProposalPlayerContainer::iterator it = proposal.players.begin(); it != proposal.players.end(); ++it) for (LfgProposalPlayerContainer::iterator it = proposal.players.begin(); it != proposal.players.end(); ++it)
@@ -1736,12 +1744,16 @@ void LFGMgr::RemoveProposal(LfgProposalContainer::iterator itProposal, LfgUpdate
if (it->second.accept == LFG_ANSWER_DENY) if (it->second.accept == LFG_ANSWER_DENY)
{ {
updateData.updateType = type; updateData.updateType = type;
;//sLog->outDebug((LOG_FILTER_LFG, "LFGMgr::RemoveProposal: [" UI64FMTD "] didn't accept. Removing from queue and compatible cache", guid); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug((LOG_FILTER_LFG, "LFGMgr::RemoveProposal: [" UI64FMTD "] didn't accept. Removing from queue and compatible cache", guid);
#endif
} }
else else
{ {
updateData.updateType = LFG_UPDATETYPE_REMOVED_FROM_QUEUE; updateData.updateType = LFG_UPDATETYPE_REMOVED_FROM_QUEUE;
;//sLog->outDebug((LOG_FILTER_LFG, "LFGMgr::RemoveProposal: [" UI64FMTD "] in same group that someone that didn't accept. Removing from queue and compatible cache", guid); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug((LOG_FILTER_LFG, "LFGMgr::RemoveProposal: [" UI64FMTD "] in same group that someone that didn't accept. Removing from queue and compatible cache", guid);
#endif
} }
RestoreState(guid, "Proposal Fail (didn't accepted or in group with someone that didn't accept"); RestoreState(guid, "Proposal Fail (didn't accepted or in group with someone that didn't accept");
@@ -1755,7 +1767,9 @@ void LFGMgr::RemoveProposal(LfgProposalContainer::iterator itProposal, LfgUpdate
} }
else else
{ {
;//sLog->outDebug((LOG_FILTER_LFG, "LFGMgr::RemoveProposal: Readding [" UI64FMTD "] to queue.", guid); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug((LOG_FILTER_LFG, "LFGMgr::RemoveProposal: Readding [" UI64FMTD "] to queue.", guid);
#endif
SetState(guid, LFG_STATE_QUEUED); SetState(guid, LFG_STATE_QUEUED);
if (gguid != guid) if (gguid != guid)
{ {
@@ -2131,7 +2145,9 @@ LfgState LFGMgr::GetState(uint64 guid)
else else
state = PlayersStore[guid].GetState(); state = PlayersStore[guid].GetState();
;//sLog->outDebug((LOG_FILTER_LFG, "LFGMgr::GetState: [" UI64FMTD "] = %u", guid, state); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug((LOG_FILTER_LFG, "LFGMgr::GetState: [" UI64FMTD "] = %u", guid, state);
#endif
return state; return state;
} }
@@ -2143,14 +2159,18 @@ LfgState LFGMgr::GetOldState(uint64 guid)
else else
state = PlayersStore[guid].GetOldState(); state = PlayersStore[guid].GetOldState();
;//sLog->outTrace(LOG_FILTER_LFG, "LFGMgr::GetOldState: [" UI64FMTD "] = %u", guid, state); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outTrace(LOG_FILTER_LFG, "LFGMgr::GetOldState: [" UI64FMTD "] = %u", guid, state);
#endif
return state; return state;
} }
uint32 LFGMgr::GetDungeon(uint64 guid, bool asId /*= true */) uint32 LFGMgr::GetDungeon(uint64 guid, bool asId /*= true */)
{ {
uint32 dungeon = GroupsStore[guid].GetDungeon(asId); uint32 dungeon = GroupsStore[guid].GetDungeon(asId);
;//sLog->outDebug((LOG_FILTER_LFG, "LFGMgr::GetDungeon: [" UI64FMTD "] asId: %u = %u", guid, asId, dungeon); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug((LOG_FILTER_LFG, "LFGMgr::GetDungeon: [" UI64FMTD "] asId: %u = %u", guid, asId, dungeon);
#endif
return dungeon; return dungeon;
} }
@@ -2162,39 +2182,51 @@ uint32 LFGMgr::GetDungeonMapId(uint64 guid)
if (LFGDungeonData const* dungeon = GetLFGDungeon(dungeonId)) if (LFGDungeonData const* dungeon = GetLFGDungeon(dungeonId))
mapId = dungeon->map; mapId = dungeon->map;
;//sLog->outDebug((LOG_FILTER_LFG, "LFGMgr::GetDungeonMapId: [" UI64FMTD "] = %u (DungeonId = %u)", guid, mapId, dungeonId); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug((LOG_FILTER_LFG, "LFGMgr::GetDungeonMapId: [" UI64FMTD "] = %u (DungeonId = %u)", guid, mapId, dungeonId);
#endif
return mapId; return mapId;
} }
uint8 LFGMgr::GetRoles(uint64 guid) uint8 LFGMgr::GetRoles(uint64 guid)
{ {
uint8 roles = PlayersStore[guid].GetRoles(); uint8 roles = PlayersStore[guid].GetRoles();
;//sLog->outDebug((LOG_FILTER_LFG, "LFGMgr::GetRoles: [" UI64FMTD "] = %u", guid, roles); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug((LOG_FILTER_LFG, "LFGMgr::GetRoles: [" UI64FMTD "] = %u", guid, roles);
#endif
return roles; return roles;
} }
const std::string& LFGMgr::GetComment(uint64 guid) const std::string& LFGMgr::GetComment(uint64 guid)
{ {
;//sLog->outDebug((LOG_FILTER_LFG, "LFGMgr::GetComment: [" UI64FMTD "] = %s", guid, PlayersStore[guid].GetComment().c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug((LOG_FILTER_LFG, "LFGMgr::GetComment: [" UI64FMTD "] = %s", guid, PlayersStore[guid].GetComment().c_str());
#endif
return PlayersStore[guid].GetComment(); return PlayersStore[guid].GetComment();
} }
LfgDungeonSet const& LFGMgr::GetSelectedDungeons(uint64 guid) LfgDungeonSet const& LFGMgr::GetSelectedDungeons(uint64 guid)
{ {
;//sLog->outTrace(LOG_FILTER_LFG, "LFGMgr::GetSelectedDungeons: [" UI64FMTD "]", guid); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outTrace(LOG_FILTER_LFG, "LFGMgr::GetSelectedDungeons: [" UI64FMTD "]", guid);
#endif
return PlayersStore[guid].GetSelectedDungeons(); return PlayersStore[guid].GetSelectedDungeons();
} }
LfgLockMap const& LFGMgr::GetLockedDungeons(uint64 guid) LfgLockMap const& LFGMgr::GetLockedDungeons(uint64 guid)
{ {
;//sLog->outDebug((LOG_FILTER_LFG, "LFGMgr::GetLockedDungeons: [" UI64FMTD "]", guid); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug((LOG_FILTER_LFG, "LFGMgr::GetLockedDungeons: [" UI64FMTD "]", guid);
#endif
return PlayersStore[guid].GetLockedDungeons(); return PlayersStore[guid].GetLockedDungeons();
} }
uint8 LFGMgr::GetKicksLeft(uint64 guid) uint8 LFGMgr::GetKicksLeft(uint64 guid)
{ {
uint8 kicks = GroupsStore[guid].GetKicksLeft(); uint8 kicks = GroupsStore[guid].GetKicksLeft();
;//sLog->outDebug((LOG_FILTER_LFG, "LFGMgr::GetKicksLeft: [" UI64FMTD "] = %u", guid, kicks); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug((LOG_FILTER_LFG, "LFGMgr::GetKicksLeft: [" UI64FMTD "] = %u", guid, kicks);
#endif
return kicks; return kicks;
} }
@@ -2256,19 +2288,25 @@ void LFGMgr::SetCanOverrideRBState(uint64 guid, bool val)
void LFGMgr::SetDungeon(uint64 guid, uint32 dungeon) void LFGMgr::SetDungeon(uint64 guid, uint32 dungeon)
{ {
;//sLog->outDebug((LOG_FILTER_LFG, "LFGMgr::SetDungeon: [" UI64FMTD "] dungeon %u", guid, dungeon); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug((LOG_FILTER_LFG, "LFGMgr::SetDungeon: [" UI64FMTD "] dungeon %u", guid, dungeon);
#endif
GroupsStore[guid].SetDungeon(dungeon); GroupsStore[guid].SetDungeon(dungeon);
} }
void LFGMgr::SetRoles(uint64 guid, uint8 roles) void LFGMgr::SetRoles(uint64 guid, uint8 roles)
{ {
;//sLog->outDebug((LOG_FILTER_LFG, "LFGMgr::SetRoles: [" UI64FMTD "] roles: %u", guid, roles); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug((LOG_FILTER_LFG, "LFGMgr::SetRoles: [" UI64FMTD "] roles: %u", guid, roles);
#endif
PlayersStore[guid].SetRoles(roles); PlayersStore[guid].SetRoles(roles);
} }
void LFGMgr::SetComment(uint64 guid, std::string const& comment) void LFGMgr::SetComment(uint64 guid, std::string const& comment)
{ {
;//sLog->outDebug((LOG_FILTER_LFG, "LFGMgr::SetComment: [" UI64FMTD "] comment: %s", guid, comment.c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug((LOG_FILTER_LFG, "LFGMgr::SetComment: [" UI64FMTD "] comment: %s", guid, comment.c_str());
#endif
PlayersStore[guid].SetComment(comment); PlayersStore[guid].SetComment(comment);
} }
@@ -2287,25 +2325,33 @@ void LFGMgr::LfrSetComment(Player* p, std::string comment)
void LFGMgr::SetSelectedDungeons(uint64 guid, LfgDungeonSet const& dungeons) void LFGMgr::SetSelectedDungeons(uint64 guid, LfgDungeonSet const& dungeons)
{ {
;//sLog->outDebug((LOG_FILTER_LFG, "LFGMgr::SetSelectedDungeons: [" UI64FMTD "]", guid); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug((LOG_FILTER_LFG, "LFGMgr::SetSelectedDungeons: [" UI64FMTD "]", guid);
#endif
PlayersStore[guid].SetSelectedDungeons(dungeons); PlayersStore[guid].SetSelectedDungeons(dungeons);
} }
void LFGMgr::SetLockedDungeons(uint64 guid, LfgLockMap const& lock) void LFGMgr::SetLockedDungeons(uint64 guid, LfgLockMap const& lock)
{ {
;//sLog->outDebug((LOG_FILTER_LFG, "LFGMgr::SetLockedDungeons: [" UI64FMTD "]", guid); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug((LOG_FILTER_LFG, "LFGMgr::SetLockedDungeons: [" UI64FMTD "]", guid);
#endif
PlayersStore[guid].SetLockedDungeons(lock); PlayersStore[guid].SetLockedDungeons(lock);
} }
void LFGMgr::DecreaseKicksLeft(uint64 guid) void LFGMgr::DecreaseKicksLeft(uint64 guid)
{ {
;//sLog->outDebug((LOG_FILTER_LFG, "LFGMgr::DecreaseKicksLeft: [" UI64FMTD "]", guid); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug((LOG_FILTER_LFG, "LFGMgr::DecreaseKicksLeft: [" UI64FMTD "]", guid);
#endif
GroupsStore[guid].DecreaseKicksLeft(); GroupsStore[guid].DecreaseKicksLeft();
} }
void LFGMgr::RemoveGroupData(uint64 guid) void LFGMgr::RemoveGroupData(uint64 guid)
{ {
;//sLog->outDebug((LOG_FILTER_LFG, "LFGMgr::RemoveGroupData: [" UI64FMTD "]", guid); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug((LOG_FILTER_LFG, "LFGMgr::RemoveGroupData: [" UI64FMTD "]", guid);
#endif
LfgGroupDataContainer::iterator it = GroupsStore.find(guid); LfgGroupDataContainer::iterator it = GroupsStore.find(guid);
if (it == GroupsStore.end()) if (it == GroupsStore.end())
return; return;
src/game/DungeonFinding/LFGScripts.cpp
+21 -7
View File
@@ -102,7 +102,9 @@ void LFGPlayerScript::OnMapChanged(Player* player)
sLFGMgr->LeaveAllLfgQueues(player->GetGUID(), true); sLFGMgr->LeaveAllLfgQueues(player->GetGUID(), true);
player->RemoveAurasDueToSpell(LFG_SPELL_LUCK_OF_THE_DRAW); player->RemoveAurasDueToSpell(LFG_SPELL_LUCK_OF_THE_DRAW);
player->TeleportTo(player->m_homebindMapId, player->m_homebindX, player->m_homebindY, player->m_homebindZ, 0.0f); player->TeleportTo(player->m_homebindMapId, player->m_homebindX, player->m_homebindY, player->m_homebindZ, 0.0f);
;//sLog->outError(LOG_FILTER_LFG, "LFGPlayerScript::OnMapChanged, Player %s (%u) is in LFG dungeon map but does not have a valid group! " #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outError(LOG_FILTER_LFG, "LFGPlayerScript::OnMapChanged, Player %s (%u) is in LFG dungeon map but does not have a valid group! "
#endif
// "Teleporting to homebind.", player->GetName().c_str(), player->GetGUIDLow()); // "Teleporting to homebind.", player->GetName().c_str(), player->GetGUIDLow());
return; return;
} }
@@ -139,14 +141,18 @@ void LFGGroupScript::OnAddMember(Group* group, uint64 guid)
if (leader == guid) if (leader == guid)
{ {
;//sLog->outDebug(LOG_FILTER_LFG, "LFGScripts::OnAddMember [" UI64FMTD "]: added [" UI64FMTD "] leader " UI64FMTD "]", gguid, guid, leader); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_LFG, "LFGScripts::OnAddMember [" UI64FMTD "]: added [" UI64FMTD "] leader " UI64FMTD "]", gguid, guid, leader);
#endif
sLFGMgr->SetLeader(gguid, guid); sLFGMgr->SetLeader(gguid, guid);
} }
else else
{ {
LfgState gstate = sLFGMgr->GetState(gguid); LfgState gstate = sLFGMgr->GetState(gguid);
LfgState state = sLFGMgr->GetState(guid); LfgState state = sLFGMgr->GetState(guid);
;//sLog->outDebug(LOG_FILTER_LFG, "LFGScripts::OnAddMember [" UI64FMTD "]: added [" UI64FMTD "] leader " UI64FMTD "] gstate: %u, state: %u", gguid, guid, leader, gstate, state); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_LFG, "LFGScripts::OnAddMember [" UI64FMTD "]: added [" UI64FMTD "] leader " UI64FMTD "] gstate: %u, state: %u", gguid, guid, leader, gstate, state);
#endif
if (state == LFG_STATE_QUEUED) if (state == LFG_STATE_QUEUED)
sLFGMgr->LeaveLfg(guid); sLFGMgr->LeaveLfg(guid);
@@ -175,7 +181,9 @@ void LFGGroupScript::OnRemoveMember(Group* group, uint64 guid, RemoveMethod meth
return; return;
uint64 gguid = group->GetGUID(); uint64 gguid = group->GetGUID();
;//sLog->outDebug(LOG_FILTER_LFG, "LFGScripts::OnRemoveMember [" UI64FMTD "]: remove [" UI64FMTD "] Method: %d Kicker: [" UI64FMTD "] Reason: %s", gguid, guid, method, kicker, (reason ? reason : "")); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_LFG, "LFGScripts::OnRemoveMember [" UI64FMTD "]: remove [" UI64FMTD "] Method: %d Kicker: [" UI64FMTD "] Reason: %s", gguid, guid, method, kicker, (reason ? reason : ""));
#endif
bool isLFG = group->isLFGGroup(); bool isLFG = group->isLFGGroup();
LfgState state = sLFGMgr->GetState(gguid); LfgState state = sLFGMgr->GetState(gguid);
@@ -234,7 +242,9 @@ void LFGGroupScript::OnDisband(Group* group)
return; return;
uint64 gguid = group->GetGUID(); uint64 gguid = group->GetGUID();
;//sLog->outDebug(LOG_FILTER_LFG, "LFGScripts::OnDisband [" UI64FMTD "]", gguid); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_LFG, "LFGScripts::OnDisband [" UI64FMTD "]", gguid);
#endif
// pussywizard: after all necessary actions handle raid browser // pussywizard: after all necessary actions handle raid browser
if (sLFGMgr->GetState(group->GetLeaderGUID()) == LFG_STATE_RAIDBROWSER) if (sLFGMgr->GetState(group->GetLeaderGUID()) == LFG_STATE_RAIDBROWSER)
@@ -250,7 +260,9 @@ void LFGGroupScript::OnChangeLeader(Group* group, uint64 newLeaderGuid, uint64 o
uint64 gguid = group->GetGUID(); uint64 gguid = group->GetGUID();
;//sLog->outDebug(LOG_FILTER_LFG, "LFGScripts::OnChangeLeader [" UI64FMTD "]: old [" UI64FMTD "] new [" UI64FMTD "]", gguid, newLeaderGuid, oldLeaderGuid); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_LFG, "LFGScripts::OnChangeLeader [" UI64FMTD "]: old [" UI64FMTD "] new [" UI64FMTD "]", gguid, newLeaderGuid, oldLeaderGuid);
#endif
sLFGMgr->SetLeader(gguid, newLeaderGuid); sLFGMgr->SetLeader(gguid, newLeaderGuid);
// pussywizard: after all necessary actions handle raid browser // pussywizard: after all necessary actions handle raid browser
@@ -265,7 +277,9 @@ void LFGGroupScript::OnInviteMember(Group* group, uint64 guid)
uint64 gguid = group->GetGUID(); uint64 gguid = group->GetGUID();
uint64 leader = group->GetLeaderGUID(); uint64 leader = group->GetLeaderGUID();
;//sLog->outDebug(LOG_FILTER_LFG, "LFGScripts::OnInviteMember [" UI64FMTD "]: invite [" UI64FMTD "] leader [" UI64FMTD "]", gguid, guid, leader); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_LFG, "LFGScripts::OnInviteMember [" UI64FMTD "]: invite [" UI64FMTD "] leader [" UI64FMTD "]", gguid, guid, leader);
#endif
// No gguid == new group being formed // No gguid == new group being formed
// No leader == after group creation first invite is new leader // No leader == after group creation first invite is new leader
// leader and no gguid == first invite after leader is added to new group (this is the real invite) // leader and no gguid == first invite after leader is added to new group (this is the real invite)
src/game/Entities/Creature/Creature.cpp
+15 -5
View File
@@ -542,7 +542,9 @@ void Creature::Update(uint32 diff)
else if (m_corpseRemoveTime <= time(NULL)) else if (m_corpseRemoveTime <= time(NULL))
{ {
RemoveCorpse(false); RemoveCorpse(false);
;//sLog->outStaticDebug("Removing corpse... %u ", GetUInt32Value(OBJECT_FIELD_ENTRY)); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug("Removing corpse... %u ", GetUInt32Value(OBJECT_FIELD_ENTRY));
#endif
} }
break; break;
} }
@@ -768,7 +770,9 @@ bool Creature::AIM_Initialize(CreatureAI* ai)
// make sure nothing can change the AI during AI update // make sure nothing can change the AI during AI update
if (m_AI_locked) if (m_AI_locked)
{ {
;//sLog->outDebug(LOG_FILTER_TSCR, "AIM_Initialize: failed to init, locked."); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_TSCR, "AIM_Initialize: failed to init, locked.");
#endif
return false; return false;
} }
@@ -1604,7 +1608,9 @@ void Creature::Respawn(bool force)
if (m_DBTableGuid) if (m_DBTableGuid)
GetMap()->RemoveCreatureRespawnTime(m_DBTableGuid); GetMap()->RemoveCreatureRespawnTime(m_DBTableGuid);
;//sLog->outStaticDebug("Respawning creature %s (GuidLow: %u, Full GUID: " UI64FMTD " Entry: %u)", GetName().c_str(), GetGUIDLow(), GetGUID(), GetEntry()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug("Respawning creature %s (GuidLow: %u, Full GUID: " UI64FMTD " Entry: %u)", GetName().c_str(), GetGUIDLow(), GetGUID(), GetEntry());
#endif
m_respawnTime = 0; m_respawnTime = 0;
ResetPickPocketLootTime(); ResetPickPocketLootTime();
@@ -1882,7 +1888,9 @@ void Creature::SendAIReaction(AiReaction reactionType)
((WorldObject*)this)->SendMessageToSet(&data, true); ((WorldObject*)this)->SendMessageToSet(&data, true);
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Sent SMSG_AI_REACTION, type %u.", reactionType); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Sent SMSG_AI_REACTION, type %u.", reactionType);
#endif
} }
void Creature::CallAssistance() void Creature::CallAssistance()
@@ -2210,7 +2218,9 @@ bool Creature::LoadCreaturesAddon(bool reload)
} }
AddAura(*itr, this); AddAura(*itr, this);
;//sLog->outDebug(LOG_FILTER_UNITS, "Spell: %u added to creature (GUID: %u Entry: %u)", *itr, GetGUIDLow(), GetEntry()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_UNITS, "Spell: %u added to creature (GUID: %u Entry: %u)", *itr, GetGUIDLow(), GetEntry());
#endif
} }
} }
src/game/Entities/Creature/CreatureGroups.cpp
+24 -8
View File
@@ -28,13 +28,17 @@ void FormationMgr::AddCreatureToGroup(uint32 groupId, Creature* member)
//Add member to an existing group //Add member to an existing group
if (itr != map->CreatureGroupHolder.end()) if (itr != map->CreatureGroupHolder.end())
{ {
;//sLog->outDebug(LOG_FILTER_UNITS, "Group found: %u, inserting creature GUID: %u, Group InstanceID %u", groupId, member->GetGUIDLow(), member->GetInstanceId()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_UNITS, "Group found: %u, inserting creature GUID: %u, Group InstanceID %u", groupId, member->GetGUIDLow(), member->GetInstanceId());
#endif
itr->second->AddMember(member); itr->second->AddMember(member);
} }
//Create new group //Create new group
else else
{ {
;//sLog->outDebug(LOG_FILTER_UNITS, "Group not found: %u. Creating new group.", groupId); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_UNITS, "Group not found: %u. Creating new group.", groupId);
#endif
CreatureGroup* group = new CreatureGroup(groupId); CreatureGroup* group = new CreatureGroup(groupId);
map->CreatureGroupHolder[groupId] = group; map->CreatureGroupHolder[groupId] = group;
group->AddMember(member); group->AddMember(member);
@@ -43,7 +47,9 @@ void FormationMgr::AddCreatureToGroup(uint32 groupId, Creature* member)
void FormationMgr::RemoveCreatureFromGroup(CreatureGroup* group, Creature* member) void FormationMgr::RemoveCreatureFromGroup(CreatureGroup* group, Creature* member)
{ {
;//sLog->outDebug(LOG_FILTER_UNITS, "Deleting member pointer to GUID: %u from group %u", group->GetId(), member->GetDBTableGUIDLow()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_UNITS, "Deleting member pointer to GUID: %u from group %u", group->GetId(), member->GetDBTableGUIDLow());
#endif
group->RemoveMember(member); group->RemoveMember(member);
if (group->isEmpty()) if (group->isEmpty())
@@ -52,7 +58,9 @@ void FormationMgr::RemoveCreatureFromGroup(CreatureGroup* group, Creature* membe
if (!map) if (!map)
return; return;
;//sLog->outDebug(LOG_FILTER_UNITS, "Deleting group with InstanceID %u", member->GetInstanceId()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_UNITS, "Deleting group with InstanceID %u", member->GetInstanceId());
#endif
map->CreatureGroupHolder.erase(group->GetId()); map->CreatureGroupHolder.erase(group->GetId());
delete group; delete group;
} }
@@ -131,12 +139,16 @@ void FormationMgr::LoadCreatureFormations()
void CreatureGroup::AddMember(Creature* member) void CreatureGroup::AddMember(Creature* member)
{ {
;//sLog->outDebug(LOG_FILTER_UNITS, "CreatureGroup::AddMember: Adding unit GUID: %u.", member->GetGUIDLow()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_UNITS, "CreatureGroup::AddMember: Adding unit GUID: %u.", member->GetGUIDLow());
#endif
//Check if it is a leader //Check if it is a leader
if (member->GetDBTableGUIDLow() == m_groupID) if (member->GetDBTableGUIDLow() == m_groupID)
{ {
;//sLog->outDebug(LOG_FILTER_UNITS, "Unit GUID: %u is formation leader. Adding group.", member->GetGUIDLow()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_UNITS, "Unit GUID: %u is formation leader. Adding group.", member->GetGUIDLow());
#endif
m_leader = member; m_leader = member;
} }
@@ -165,7 +177,9 @@ void CreatureGroup::MemberAttackStart(Creature* member, Unit* target)
for (CreatureGroupMemberType::iterator itr = m_members.begin(); itr != m_members.end(); ++itr) for (CreatureGroupMemberType::iterator itr = m_members.begin(); itr != m_members.end(); ++itr)
{ {
//if (m_leader) // avoid crash if leader was killed and reset. //if (m_leader) // avoid crash if leader was killed and reset.
;//sLog->outDebug(LOG_FILTER_UNITS, "GROUP ATTACK: group instance id %u calls member instid %u", m_leader->GetInstanceId(), member->GetInstanceId()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_UNITS, "GROUP ATTACK: group instance id %u calls member instid %u", m_leader->GetInstanceId(), member->GetInstanceId());
#endif
//Skip one check //Skip one check
if (itr->first == member) if (itr->first == member)
@@ -195,7 +209,9 @@ void CreatureGroup::FormationReset(bool dismiss)
itr->first->GetMotionMaster()->Initialize(); itr->first->GetMotionMaster()->Initialize();
else else
itr->first->GetMotionMaster()->MoveIdle(); itr->first->GetMotionMaster()->MoveIdle();
;//sLog->outDebug(LOG_FILTER_UNITS, "Set %s movement for member GUID: %u", dismiss ? "default" : "idle", itr->first->GetGUIDLow()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_UNITS, "Set %s movement for member GUID: %u", dismiss ? "default" : "idle", itr->first->GetGUIDLow());
#endif
} }
} }
m_Formed = !dismiss; m_Formed = !dismiss;
src/game/Entities/Creature/GossipDef.cpp
+18 -6
View File
@@ -326,7 +326,9 @@ void PlayerMenu::SendQuestGiverQuestList(QEmote const& eEmote, const std::string
data.put<uint8>(count_pos, count); data.put<uint8>(count_pos, count);
_session->SendPacket(&data); _session->SendPacket(&data);
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Sent SMSG_QUESTGIVER_QUEST_LIST NPC Guid=%u", GUID_LOPART(npcGUID)); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Sent SMSG_QUESTGIVER_QUEST_LIST NPC Guid=%u", GUID_LOPART(npcGUID));
#endif
} }
void PlayerMenu::SendQuestGiverStatus(uint8 questStatus, uint64 npcGUID) const void PlayerMenu::SendQuestGiverStatus(uint8 questStatus, uint64 npcGUID) const
@@ -336,7 +338,9 @@ void PlayerMenu::SendQuestGiverStatus(uint8 questStatus, uint64 npcGUID) const
data << uint8(questStatus); data << uint8(questStatus);
_session->SendPacket(&data); _session->SendPacket(&data);
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Sent SMSG_QUESTGIVER_STATUS NPC Guid=%u, status=%u", GUID_LOPART(npcGUID), questStatus); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Sent SMSG_QUESTGIVER_STATUS NPC Guid=%u, status=%u", GUID_LOPART(npcGUID), questStatus);
#endif
} }
void PlayerMenu::SendQuestGiverQuestDetails(Quest const* quest, uint64 npcGUID, bool activateAccept) const void PlayerMenu::SendQuestGiverQuestDetails(Quest const* quest, uint64 npcGUID, bool activateAccept) const
@@ -441,7 +445,9 @@ void PlayerMenu::SendQuestGiverQuestDetails(Quest const* quest, uint64 npcGUID,
} }
_session->SendPacket(&data); _session->SendPacket(&data);
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Sent SMSG_QUESTGIVER_QUEST_DETAILS NPCGuid=%u, questid=%u", GUID_LOPART(npcGUID), quest->GetQuestId()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Sent SMSG_QUESTGIVER_QUEST_DETAILS NPCGuid=%u, questid=%u", GUID_LOPART(npcGUID), quest->GetQuestId());
#endif
} }
void PlayerMenu::SendQuestQueryResponse(Quest const* quest) const void PlayerMenu::SendQuestQueryResponse(Quest const* quest) const
@@ -575,7 +581,9 @@ void PlayerMenu::SendQuestQueryResponse(Quest const* quest) const
data << questObjectiveText[i]; data << questObjectiveText[i];
_session->SendPacket(&data); _session->SendPacket(&data);
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Sent SMSG_QUEST_QUERY_RESPONSE questid=%u", quest->GetQuestId()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Sent SMSG_QUEST_QUERY_RESPONSE questid=%u", quest->GetQuestId());
#endif
} }
void PlayerMenu::SendQuestGiverOfferReward(Quest const* quest, uint64 npcGUID, bool enableNext) const void PlayerMenu::SendQuestGiverOfferReward(Quest const* quest, uint64 npcGUID, bool enableNext) const
@@ -666,7 +674,9 @@ void PlayerMenu::SendQuestGiverOfferReward(Quest const* quest, uint64 npcGUID, b
data << uint32(quest->RewardFactionValueIdOverride[i]); data << uint32(quest->RewardFactionValueIdOverride[i]);
_session->SendPacket(&data); _session->SendPacket(&data);
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Sent SMSG_QUESTGIVER_OFFER_REWARD NPCGuid=%u, questid=%u", GUID_LOPART(npcGUID), quest->GetQuestId()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Sent SMSG_QUESTGIVER_OFFER_REWARD NPCGuid=%u, questid=%u", GUID_LOPART(npcGUID), quest->GetQuestId());
#endif
} }
void PlayerMenu::SendQuestGiverRequestItems(Quest const* quest, uint64 npcGUID, bool canComplete, bool closeOnCancel) const void PlayerMenu::SendQuestGiverRequestItems(Quest const* quest, uint64 npcGUID, bool canComplete, bool closeOnCancel) const
@@ -760,5 +770,7 @@ void PlayerMenu::SendQuestGiverRequestItems(Quest const* quest, uint64 npcGUID,
data << uint32(0x10); data << uint32(0x10);
_session->SendPacket(&data); _session->SendPacket(&data);
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Sent SMSG_QUESTGIVER_REQUEST_ITEMS NPCGuid=%u, questid=%u", GUID_LOPART(npcGUID), quest->GetQuestId()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Sent SMSG_QUESTGIVER_REQUEST_ITEMS NPCGuid=%u, questid=%u", GUID_LOPART(npcGUID), quest->GetQuestId());
#endif
} }
src/game/Entities/GameObject/GameObject.cpp
+9 -3
View File
@@ -1389,7 +1389,9 @@ void GameObject::Use(Unit* user)
if (info->goober.eventId) if (info->goober.eventId)
{ {
;//sLog->outDebug(LOG_FILTER_MAPSCRIPTS, "Goober ScriptStart id %u for GO entry %u (GUID %u).", info->goober.eventId, GetEntry(), GetDBTableGUIDLow()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_MAPSCRIPTS, "Goober ScriptStart id %u for GO entry %u (GUID %u).", info->goober.eventId, GetEntry(), GetDBTableGUIDLow());
#endif
GetMap()->ScriptsStart(sEventScripts, info->goober.eventId, player, this); GetMap()->ScriptsStart(sEventScripts, info->goober.eventId, player, this);
EventInform(info->goober.eventId); EventInform(info->goober.eventId);
} }
@@ -1489,7 +1491,9 @@ void GameObject::Use(Unit* user)
int32 roll = irand(1, 100); int32 roll = irand(1, 100);
;//sLog->outStaticDebug("Fishing check (skill: %i zone min skill: %i chance %i roll: %i", skill, zone_skill, chance, roll); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug("Fishing check (skill: %i zone min skill: %i chance %i roll: %i", skill, zone_skill, chance, roll);
#endif
// but you will likely cause junk in areas that require a high fishing skill (not yet implemented) // but you will likely cause junk in areas that require a high fishing skill (not yet implemented)
if (chance >= roll) if (chance >= roll)
@@ -1771,7 +1775,9 @@ void GameObject::Use(Unit* user)
if (user->GetTypeId() != TYPEID_PLAYER || !sOutdoorPvPMgr->HandleCustomSpell(user->ToPlayer(), spellId, this)) if (user->GetTypeId() != TYPEID_PLAYER || !sOutdoorPvPMgr->HandleCustomSpell(user->ToPlayer(), spellId, this))
sLog->outError("WORLD: unknown spell id %u at use action for gameobject (Entry: %u GoType: %u)", spellId, GetEntry(), GetGoType()); sLog->outError("WORLD: unknown spell id %u at use action for gameobject (Entry: %u GoType: %u)", spellId, GetEntry(), GetGoType());
else else
;//sLog->outDebug(LOG_FILTER_OUTDOORPVP, "WORLD: %u non-dbc spell was handled by OutdoorPvP", spellId); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_OUTDOORPVP, "WORLD: %u non-dbc spell was handled by OutdoorPvP", spellId);
#endif
return; return;
} }
src/game/Entities/Item/Item.cpp
+9 -3
View File
@@ -283,7 +283,9 @@ void Item::UpdateDuration(Player* owner, uint32 diff)
if (!GetUInt32Value(ITEM_FIELD_DURATION)) if (!GetUInt32Value(ITEM_FIELD_DURATION))
return; return;
;//sLog->outDebug(LOG_FILTER_PLAYER_ITEMS, "Item::UpdateDuration Item (Entry: %u Duration %u Diff %u)", GetEntry(), GetUInt32Value(ITEM_FIELD_DURATION), diff); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_PLAYER_ITEMS, "Item::UpdateDuration Item (Entry: %u Duration %u Diff %u)", GetEntry(), GetUInt32Value(ITEM_FIELD_DURATION), diff);
#endif
if (GetUInt32Value(ITEM_FIELD_DURATION) <= diff) if (GetUInt32Value(ITEM_FIELD_DURATION) <= diff)
{ {
@@ -676,7 +678,9 @@ void Item::AddToUpdateQueueOf(Player* player)
if (player->GetGUID() != GetOwnerGUID()) if (player->GetGUID() != GetOwnerGUID())
{ {
;//sLog->outDebug(LOG_FILTER_PLAYER_ITEMS, "Item::AddToUpdateQueueOf - Owner's guid (%u) and player's guid (%u) don't match!", GUID_LOPART(GetOwnerGUID()), player->GetGUIDLow()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_PLAYER_ITEMS, "Item::AddToUpdateQueueOf - Owner's guid (%u) and player's guid (%u) don't match!", GUID_LOPART(GetOwnerGUID()), player->GetGUIDLow());
#endif
return; return;
} }
@@ -696,7 +700,9 @@ void Item::RemoveFromUpdateQueueOf(Player* player)
if (player->GetGUID() != GetOwnerGUID()) if (player->GetGUID() != GetOwnerGUID())
{ {
;//sLog->outDebug(LOG_FILTER_PLAYER_ITEMS, "Item::RemoveFromUpdateQueueOf - Owner's guid (%u) and player's guid (%u) don't match!", GUID_LOPART(GetOwnerGUID()), player->GetGUIDLow()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_PLAYER_ITEMS, "Item::RemoveFromUpdateQueueOf - Owner's guid (%u) and player's guid (%u) don't match!", GUID_LOPART(GetOwnerGUID()), player->GetGUIDLow());
#endif
return; return;
} }
src/game/Entities/Pet/Pet.cpp
+12 -4
View File
@@ -625,7 +625,9 @@ bool Pet::CreateBaseAtCreatureInfo(CreatureTemplate const* cinfo, Unit* owner)
bool Pet::CreateBaseAtTamed(CreatureTemplate const* cinfo, Map* map, uint32 phaseMask) bool Pet::CreateBaseAtTamed(CreatureTemplate const* cinfo, Map* map, uint32 phaseMask)
{ {
;//sLog->outDebug(LOG_FILTER_PETS, "Pet::CreateBaseForTamed"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_PETS, "Pet::CreateBaseForTamed");
#endif
uint32 guid=sObjectMgr->GenerateLowGuid(HIGHGUID_PET); uint32 guid=sObjectMgr->GenerateLowGuid(HIGHGUID_PET);
uint32 pet_number = sObjectMgr->GeneratePetNumber(); uint32 pet_number = sObjectMgr->GeneratePetNumber();
if (!Create(guid, map, phaseMask, cinfo->Entry, pet_number)) if (!Create(guid, map, phaseMask, cinfo->Entry, pet_number))
@@ -1080,7 +1082,9 @@ void Pet::_LoadSpellCooldowns(PreparedQueryResult result)
cooldowns[spell_id] = cooldown; cooldowns[spell_id] = cooldown;
_AddCreatureSpellCooldown(spell_id, cooldown); _AddCreatureSpellCooldown(spell_id, cooldown);
;//sLog->outDebug(LOG_FILTER_PETS, "Pet (Number: %u) spell %u cooldown loaded (%u secs).", m_charmInfo->GetPetNumber(), spell_id, uint32(db_time-curTime)); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_PETS, "Pet (Number: %u) spell %u cooldown loaded (%u secs).", m_charmInfo->GetPetNumber(), spell_id, uint32(db_time-curTime));
#endif
} }
while (result->NextRow()); while (result->NextRow());
@@ -1187,7 +1191,9 @@ void Pet::_SaveSpells(SQLTransaction& trans)
void Pet::_LoadAuras(PreparedQueryResult result, uint32 timediff) void Pet::_LoadAuras(PreparedQueryResult result, uint32 timediff)
{ {
;//sLog->outDebug(LOG_FILTER_PETS, "Loading auras for pet %u", GetGUIDLow()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_PETS, "Loading auras for pet %u", GetGUIDLow());
#endif
if (result) if (result)
{ {
@@ -1257,7 +1263,9 @@ void Pet::_LoadAuras(PreparedQueryResult result, uint32 timediff)
} }
aura->SetLoadedState(maxduration, remaintime, remaincharges, stackcount, recalculatemask, &damage[0]); aura->SetLoadedState(maxduration, remaintime, remaincharges, stackcount, recalculatemask, &damage[0]);
aura->ApplyForTargets(); aura->ApplyForTargets();
;//sLog->outDetail("Added aura spellid %u, effectmask %u", spellInfo->Id, effmask); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("Added aura spellid %u, effectmask %u", spellInfo->Id, effmask);
#endif
} }
} }
while (result->NextRow()); while (result->NextRow());
src/game/Entities/Player/Player.cpp
+447 -149
View File
File diff suppressed because it is too large Load Diff
src/game/Entities/Player/SocialMgr.cpp
+3 -1
View File
@@ -167,7 +167,9 @@ void PlayerSocial::SendSocialList(Player* player)
} }
player->GetSession()->SendPacket(&data); player->GetSession()->SendPacket(&data);
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Sent SMSG_CONTACT_LIST"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Sent SMSG_CONTACT_LIST");
#endif
} }
bool PlayerSocial::HasFriend(uint32 friend_guid) const bool PlayerSocial::HasFriend(uint32 friend_guid) const
src/game/Entities/Unit/Unit.cpp
+132 -44
View File
@@ -789,10 +789,14 @@ uint32 Unit::DealDamage(Unit* attacker, Unit* victim, uint32 damage, CleanDamage
return 0; return 0;
} }
;//sLog->outStaticDebug("DealDamageStart"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug("DealDamageStart");
#endif
uint32 health = victim->GetHealth(); uint32 health = victim->GetHealth();
;//sLog->outDetail("deal dmg:%d to health:%d ", damage, health); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("deal dmg:%d to health:%d ", damage, health);
#endif
// duel ends when player has 1 or less hp // duel ends when player has 1 or less hp
bool duel_hasEnded = false; bool duel_hasEnded = false;
@@ -856,7 +860,9 @@ uint32 Unit::DealDamage(Unit* attacker, Unit* victim, uint32 damage, CleanDamage
if (health <= damage) if (health <= damage)
{ {
;//sLog->outStaticDebug("DealDamage: victim just died"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug("DealDamage: victim just died");
#endif
//if (attacker && victim->GetTypeId() == TYPEID_PLAYER && victim != attacker) //if (attacker && victim->GetTypeId() == TYPEID_PLAYER && victim != attacker)
//victim->ToPlayer()->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_TOTAL_DAMAGE_RECEIVED, health); // pussywizard: optimization //victim->ToPlayer()->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_TOTAL_DAMAGE_RECEIVED, health); // pussywizard: optimization
@@ -865,7 +871,9 @@ uint32 Unit::DealDamage(Unit* attacker, Unit* victim, uint32 damage, CleanDamage
} }
else else
{ {
;//sLog->outStaticDebug("DealDamageAlive"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug("DealDamageAlive");
#endif
//if (victim->GetTypeId() == TYPEID_PLAYER) //if (victim->GetTypeId() == TYPEID_PLAYER)
// victim->ToPlayer()->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_TOTAL_DAMAGE_RECEIVED, damage); // pussywizard: optimization // victim->ToPlayer()->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_TOTAL_DAMAGE_RECEIVED, damage); // pussywizard: optimization
@@ -956,7 +964,9 @@ uint32 Unit::DealDamage(Unit* attacker, Unit* victim, uint32 damage, CleanDamage
} }
} }
;//sLog->outStaticDebug("DealDamageEnd returned %d damage", damage); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug("DealDamageEnd returned %d damage", damage);
#endif
return damage; return damage;
} }
@@ -1216,7 +1226,9 @@ void Unit::DealSpellDamage(SpellNonMeleeDamage* damageInfo, bool durabilityLoss)
SpellInfo const* spellProto = sSpellMgr->GetSpellInfo(damageInfo->SpellID); SpellInfo const* spellProto = sSpellMgr->GetSpellInfo(damageInfo->SpellID);
if (spellProto == NULL) if (spellProto == NULL)
{ {
;//sLog->outDebug(LOG_FILTER_UNITS, "Unit::DealSpellDamage has wrong damageInfo->SpellID: %u", damageInfo->SpellID); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_UNITS, "Unit::DealSpellDamage has wrong damageInfo->SpellID: %u", damageInfo->SpellID);
#endif
return; return;
} }
@@ -2149,10 +2161,14 @@ void Unit::AttackerStateUpdate (Unit* victim, WeaponAttackType attType, bool ext
ProcDamageAndSpell(damageInfo.target, damageInfo.procAttacker, damageInfo.procVictim, damageInfo.procEx, damageInfo.damage, damageInfo.attackType); ProcDamageAndSpell(damageInfo.target, damageInfo.procAttacker, damageInfo.procVictim, damageInfo.procEx, damageInfo.damage, damageInfo.attackType);
/*if (GetTypeId() == TYPEID_PLAYER) /*if (GetTypeId() == TYPEID_PLAYER)
;//sLog->outStaticDebug("AttackerStateUpdate: (Player) %u attacked %u (TypeId: %u) for %u dmg, absorbed %u, blocked %u, resisted %u.", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug("AttackerStateUpdate: (Player) %u attacked %u (TypeId: %u) for %u dmg, absorbed %u, blocked %u, resisted %u.",
#endif
GetGUIDLow(), victim->GetGUIDLow(), victim->GetTypeId(), damageInfo.damage, damageInfo.absorb, damageInfo.blocked_amount, damageInfo.resist); GetGUIDLow(), victim->GetGUIDLow(), victim->GetTypeId(), damageInfo.damage, damageInfo.absorb, damageInfo.blocked_amount, damageInfo.resist);
else else
;//sLog->outStaticDebug("AttackerStateUpdate: (NPC) %u attacked %u (TypeId: %u) for %u dmg, absorbed %u, blocked %u, resisted %u.", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug("AttackerStateUpdate: (NPC) %u attacked %u (TypeId: %u) for %u dmg, absorbed %u, blocked %u, resisted %u.",
#endif
GetGUIDLow(), victim->GetGUIDLow(), victim->GetTypeId(), damageInfo.damage, damageInfo.absorb, damageInfo.blocked_amount, damageInfo.resist);*/ GetGUIDLow(), victim->GetGUIDLow(), victim->GetTypeId(), damageInfo.damage, damageInfo.absorb, damageInfo.blocked_amount, damageInfo.resist);*/
} }
} }
@@ -2223,7 +2239,9 @@ MeleeHitOutcome Unit::RollMeleeOutcomeAgainst(const Unit* victim, WeaponAttackTy
// always crit against a sitting target (except 0 crit chance) // always crit against a sitting target (except 0 crit chance)
if (victim->GetTypeId() == TYPEID_PLAYER && crit_chance > 0 && !victim->IsStandState()) if (victim->GetTypeId() == TYPEID_PLAYER && crit_chance > 0 && !victim->IsStandState())
{ {
;//sLog->outStaticDebug ("RollMeleeOutcomeAgainst: CRIT (sitting victim)"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug ("RollMeleeOutcomeAgainst: CRIT (sitting victim)");
#endif
return MELEE_HIT_CRIT; return MELEE_HIT_CRIT;
} }
@@ -2257,7 +2275,9 @@ MeleeHitOutcome Unit::RollMeleeOutcomeAgainst(const Unit* victim, WeaponAttackTy
&& ((tmp -= skillBonus) > 0) && ((tmp -= skillBonus) > 0)
&& roll < (sum += tmp)) && roll < (sum += tmp))
{ {
;//sLog->outStaticDebug ("RollMeleeOutcomeAgainst: DODGE <%d, %d)", sum-tmp, sum); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug ("RollMeleeOutcomeAgainst: DODGE <%d, %d)", sum-tmp, sum);
#endif
return MELEE_HIT_DODGE; return MELEE_HIT_DODGE;
} }
} }
@@ -2266,7 +2286,9 @@ MeleeHitOutcome Unit::RollMeleeOutcomeAgainst(const Unit* victim, WeaponAttackTy
// check if attack comes from behind, nobody can parry or block if attacker is behind // check if attack comes from behind, nobody can parry or block if attacker is behind
if (!victim->HasInArc(M_PI, this) && !victim->HasAuraType(SPELL_AURA_IGNORE_HIT_DIRECTION)) if (!victim->HasInArc(M_PI, this) && !victim->HasAuraType(SPELL_AURA_IGNORE_HIT_DIRECTION))
;//sLog->outStaticDebug ("RollMeleeOutcomeAgainst: attack came from behind."); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug ("RollMeleeOutcomeAgainst: attack came from behind.");
#endif
else else
{ {
// Reduce parry chance by attacker expertise rating // Reduce parry chance by attacker expertise rating
@@ -2287,7 +2309,9 @@ MeleeHitOutcome Unit::RollMeleeOutcomeAgainst(const Unit* victim, WeaponAttackTy
&& (tmp -= skillBonus) > 0 && (tmp -= skillBonus) > 0
&& roll < (sum += tmp)) && roll < (sum += tmp))
{ {
;//sLog->outStaticDebug ("RollMeleeOutcomeAgainst: PARRY <%d, %d)", sum-tmp2, sum); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug ("RollMeleeOutcomeAgainst: PARRY <%d, %d)", sum-tmp2, sum);
#endif
return MELEE_HIT_PARRY; return MELEE_HIT_PARRY;
} }
} }
@@ -2304,7 +2328,9 @@ MeleeHitOutcome Unit::RollMeleeOutcomeAgainst(const Unit* victim, WeaponAttackTy
&& (tmp -= skillBonus) > 0 && (tmp -= skillBonus) > 0
&& roll < (sum += tmp)) && roll < (sum += tmp))
{ {
;//sLog->outStaticDebug ("RollMeleeOutcomeAgainst: BLOCK <%d, %d)", sum-tmp, sum); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug ("RollMeleeOutcomeAgainst: BLOCK <%d, %d)", sum-tmp, sum);
#endif
return MELEE_HIT_BLOCK; return MELEE_HIT_BLOCK;
} }
} }
@@ -2325,7 +2351,9 @@ MeleeHitOutcome Unit::RollMeleeOutcomeAgainst(const Unit* victim, WeaponAttackTy
tmp = tmp > 4000 ? 4000 : tmp; tmp = tmp > 4000 ? 4000 : tmp;
if (roll < (sum += tmp)) if (roll < (sum += tmp))
{ {
;//sLog->outStaticDebug ("RollMeleeOutcomeAgainst: GLANCING <%d, %d)", sum-4000, sum); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug ("RollMeleeOutcomeAgainst: GLANCING <%d, %d)", sum-4000, sum);
#endif
return MELEE_HIT_GLANCING; return MELEE_HIT_GLANCING;
} }
} }
@@ -2349,7 +2377,9 @@ MeleeHitOutcome Unit::RollMeleeOutcomeAgainst(const Unit* victim, WeaponAttackTy
tmp = tmp * 200 - 1500; tmp = tmp * 200 - 1500;
if (roll < (sum += tmp)) if (roll < (sum += tmp))
{ {
;//sLog->outStaticDebug ("RollMeleeOutcomeAgainst: CRUSHING <%d, %d)", sum-tmp, sum); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug ("RollMeleeOutcomeAgainst: CRUSHING <%d, %d)", sum-tmp, sum);
#endif
return MELEE_HIT_CRUSHING; return MELEE_HIT_CRUSHING;
} }
} }
@@ -2360,14 +2390,20 @@ MeleeHitOutcome Unit::RollMeleeOutcomeAgainst(const Unit* victim, WeaponAttackTy
if (tmp > 0 && roll < (sum += tmp)) if (tmp > 0 && roll < (sum += tmp))
{ {
;//sLog->outStaticDebug ("RollMeleeOutcomeAgainst: CRIT <%d, %d)", sum-tmp, sum); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug ("RollMeleeOutcomeAgainst: CRIT <%d, %d)", sum-tmp, sum);
#endif
if (GetTypeId() == TYPEID_UNIT && (ToCreature()->GetCreatureTemplate()->flags_extra & CREATURE_FLAG_EXTRA_NO_CRIT)) if (GetTypeId() == TYPEID_UNIT && (ToCreature()->GetCreatureTemplate()->flags_extra & CREATURE_FLAG_EXTRA_NO_CRIT))
;//sLog->outStaticDebug ("RollMeleeOutcomeAgainst: CRIT DISABLED)"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug ("RollMeleeOutcomeAgainst: CRIT DISABLED)");
#endif
else else
return MELEE_HIT_CRIT; return MELEE_HIT_CRIT;
} }
;//sLog->outStaticDebug ("RollMeleeOutcomeAgainst: NORMAL"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug ("RollMeleeOutcomeAgainst: NORMAL");
#endif
return MELEE_HIT_NORMAL; return MELEE_HIT_NORMAL;
} }
@@ -2439,7 +2475,9 @@ void Unit::SendMeleeAttackStart(Unit* victim, Player* sendTo)
sendTo->SendDirectMessage(&data); sendTo->SendDirectMessage(&data);
else else
SendMessageToSet(&data, true); SendMessageToSet(&data, true);
;//sLog->outStaticDebug("WORLD: Sent SMSG_ATTACKSTART"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug("WORLD: Sent SMSG_ATTACKSTART");
#endif
} }
void Unit::SendMeleeAttackStop(Unit* victim) void Unit::SendMeleeAttackStop(Unit* victim)
@@ -2453,12 +2491,18 @@ void Unit::SendMeleeAttackStop(Unit* victim)
data.append(victim ? victim->GetPackGUID() : 0); data.append(victim ? victim->GetPackGUID() : 0);
data << uint32(0); //! Can also take the value 0x01, which seems related to updating rotation data << uint32(0); //! Can also take the value 0x01, which seems related to updating rotation
SendMessageToSet(&data, true); SendMessageToSet(&data, true);
;//sLog->outStaticDebug("WORLD: Sent SMSG_ATTACKSTOP"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug("WORLD: Sent SMSG_ATTACKSTOP");
#endif
/*if (victim) /*if (victim)
;//sLog->outDetail("%s %u stopped attacking %s %u", (GetTypeId() == TYPEID_PLAYER ? "Player" : "Creature"), GetGUIDLow(), (victim->GetTypeId() == TYPEID_PLAYER ? "player" : "creature"), victim->GetGUIDLow()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("%s %u stopped attacking %s %u", (GetTypeId() == TYPEID_PLAYER ? "Player" : "Creature"), GetGUIDLow(), (victim->GetTypeId() == TYPEID_PLAYER ? "player" : "creature"), victim->GetGUIDLow());
#endif
else else
;//sLog->outDetail("%s %u stopped attacking", (GetTypeId() == TYPEID_PLAYER ? "Player" : "Creature"), GetGUIDLow());*/ #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("%s %u stopped attacking", (GetTypeId() == TYPEID_PLAYER ? "Player" : "Creature"), GetGUIDLow());*/
#endif
} }
bool Unit::isSpellBlocked(Unit* victim, SpellInfo const* spellProto, WeaponAttackType attackType) bool Unit::isSpellBlocked(Unit* victim, SpellInfo const* spellProto, WeaponAttackType attackType)
@@ -2617,7 +2661,9 @@ SpellMissInfo Unit::MeleeSpellHitResult(Unit* victim, SpellInfo const* spell)
case MELEE_HIT_BLOCK: canBlock = false; break; case MELEE_HIT_BLOCK: canBlock = false; break;
case MELEE_HIT_PARRY: canParry = false; break; case MELEE_HIT_PARRY: canParry = false; break;
default: default:
;//sLog->outStaticDebug("Spell %u SPELL_AURA_IGNORE_COMBAT_RESULT has unhandled state %d", (*i)->GetId(), (*i)->GetMiscValue()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug("Spell %u SPELL_AURA_IGNORE_COMBAT_RESULT has unhandled state %d", (*i)->GetId(), (*i)->GetMiscValue());
#endif
break; break;
} }
} }
@@ -3899,7 +3945,9 @@ void Unit::_UnapplyAura(AuraApplicationMap::iterator &i, AuraRemoveMode removeMo
aurApp->SetRemoveMode(removeMode); aurApp->SetRemoveMode(removeMode);
Aura* aura = aurApp->GetBase(); Aura* aura = aurApp->GetBase();
;//sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "Aura %u now is remove mode %d", aura->GetId(), removeMode); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "Aura %u now is remove mode %d", aura->GetId(), removeMode);
#endif
// dead loop is killing the server probably // dead loop is killing the server probably
ASSERT(m_removedAurasCount < 0xFFFFFFFF); ASSERT(m_removedAurasCount < 0xFFFFFFFF);
@@ -4734,7 +4782,9 @@ void Unit::DelayOwnedAuras(uint32 spellId, uint64 caster, int32 delaytime)
// update for out of range group members (on 1 slot use) // update for out of range group members (on 1 slot use)
aura->SetNeedClientUpdateForTargets(); aura->SetNeedClientUpdateForTargets();
;//sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "Aura %u partially interrupted on unit %u, new duration: %u ms", aura->GetId(), GetGUIDLow(), aura->GetDuration()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "Aura %u partially interrupted on unit %u, new duration: %u ms", aura->GetId(), GetGUIDLow(), aura->GetDuration());
#endif
} }
} }
} }
@@ -5642,7 +5692,9 @@ void Unit::SendSpellDamageImmune(Unit* target, uint32 spellId)
void Unit::SendAttackStateUpdate(CalcDamageInfo* damageInfo) void Unit::SendAttackStateUpdate(CalcDamageInfo* damageInfo)
{ {
;//sLog->outDebug(LOG_FILTER_UNITS, "WORLD: Sending SMSG_ATTACKERSTATEUPDATE"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_UNITS, "WORLD: Sending SMSG_ATTACKERSTATEUPDATE");
#endif
uint32 count = 1; uint32 count = 1;
size_t maxsize = 4+5+5+4+4+1+4+4+4+4+4+1+4+4+4+4+4*12; size_t maxsize = 4+5+5+4+4+1+4+4+4+4+4+1+4+4+4+4+4*12;
@@ -9686,7 +9738,9 @@ Unit* Unit::GetCharm() const
void Unit::SetMinion(Minion *minion, bool apply) void Unit::SetMinion(Minion *minion, bool apply)
{ {
;//sLog->outDebug(LOG_FILTER_UNITS, "SetMinion %u for %u, apply %u", minion->GetEntry(), GetEntry(), apply); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_UNITS, "SetMinion %u for %u, apply %u", minion->GetEntry(), GetEntry(), apply);
#endif
if (apply) if (apply)
{ {
@@ -15026,7 +15080,9 @@ void Unit::ProcDamageAndSpellFor(bool isVictim, Unit* target, uint32 procFlag, u
// "handled" is needed as long as proc can be handled in multiple places // "handled" is needed as long as proc can be handled in multiple places
if (!handled && HandleAuraProc(target, damage, i->aura, procSpell, procFlag, procExtra, cooldown, &handled)) if (!handled && HandleAuraProc(target, damage, i->aura, procSpell, procFlag, procExtra, cooldown, &handled))
{ {
;//sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "ProcDamageAndSpell: casting spell %u (triggered with value by %s aura of spell %u)", spellInfo->Id, (isVictim?"a victim's":"an attacker's"), Id); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "ProcDamageAndSpell: casting spell %u (triggered with value by %s aura of spell %u)", spellInfo->Id, (isVictim?"a victim's":"an attacker's"), Id);
#endif
takeCharges = true; takeCharges = true;
} }
@@ -15050,7 +15106,9 @@ void Unit::ProcDamageAndSpellFor(bool isVictim, Unit* target, uint32 procFlag, u
{ {
case SPELL_AURA_PROC_TRIGGER_SPELL: case SPELL_AURA_PROC_TRIGGER_SPELL:
{ {
;//sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "ProcDamageAndSpell: casting spell %u (triggered by %s aura of spell %u)", spellInfo->Id, (isVictim?"a victim's":"an attacker's"), triggeredByAura->GetId()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "ProcDamageAndSpell: casting spell %u (triggered by %s aura of spell %u)", spellInfo->Id, (isVictim?"a victim's":"an attacker's"), triggeredByAura->GetId());
#endif
// Don`t drop charge or add cooldown for not started trigger // Don`t drop charge or add cooldown for not started trigger
if (HandleProcTriggerSpell(target, damage, triggeredByAura, procSpell, procFlag, procExtra, cooldown)) if (HandleProcTriggerSpell(target, damage, triggeredByAura, procSpell, procFlag, procExtra, cooldown))
takeCharges = true; takeCharges = true;
@@ -15069,7 +15127,9 @@ void Unit::ProcDamageAndSpellFor(bool isVictim, Unit* target, uint32 procFlag, u
case SPELL_AURA_MANA_SHIELD: case SPELL_AURA_MANA_SHIELD:
case SPELL_AURA_DUMMY: case SPELL_AURA_DUMMY:
{ {
;//sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "ProcDamageAndSpell: casting spell id %u (triggered by %s dummy aura of spell %u)", spellInfo->Id, (isVictim?"a victim's":"an attacker's"), triggeredByAura->GetId()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "ProcDamageAndSpell: casting spell id %u (triggered by %s dummy aura of spell %u)", spellInfo->Id, (isVictim?"a victim's":"an attacker's"), triggeredByAura->GetId());
#endif
if (HandleDummyAuraProc(target, damage, triggeredByAura, procSpell, procFlag, procExtra, cooldown)) if (HandleDummyAuraProc(target, damage, triggeredByAura, procSpell, procFlag, procExtra, cooldown))
takeCharges = true; takeCharges = true;
break; break;
@@ -15083,14 +15143,18 @@ void Unit::ProcDamageAndSpellFor(bool isVictim, Unit* target, uint32 procFlag, u
break; break;
case SPELL_AURA_OVERRIDE_CLASS_SCRIPTS: case SPELL_AURA_OVERRIDE_CLASS_SCRIPTS:
{ {
;//sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "ProcDamageAndSpell: casting spell id %u (triggered by %s aura of spell %u)", spellInfo->Id, (isVictim?"a victim's":"an attacker's"), triggeredByAura->GetId()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "ProcDamageAndSpell: casting spell id %u (triggered by %s aura of spell %u)", spellInfo->Id, (isVictim?"a victim's":"an attacker's"), triggeredByAura->GetId());
#endif
if (HandleOverrideClassScriptAuraProc(target, damage, triggeredByAura, procSpell, cooldown)) if (HandleOverrideClassScriptAuraProc(target, damage, triggeredByAura, procSpell, cooldown))
takeCharges = true; takeCharges = true;
break; break;
} }
case SPELL_AURA_RAID_PROC_FROM_CHARGE_WITH_VALUE: case SPELL_AURA_RAID_PROC_FROM_CHARGE_WITH_VALUE:
{ {
;//sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "ProcDamageAndSpell: casting mending (triggered by %s dummy aura of spell %u)", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "ProcDamageAndSpell: casting mending (triggered by %s dummy aura of spell %u)",
#endif
// (isVictim?"a victim's":"an attacker's"), triggeredByAura->GetId()); // (isVictim?"a victim's":"an attacker's"), triggeredByAura->GetId());
if (damage > 0) if (damage > 0)
@@ -15102,7 +15166,9 @@ void Unit::ProcDamageAndSpellFor(bool isVictim, Unit* target, uint32 procFlag, u
} }
case SPELL_AURA_RAID_PROC_FROM_CHARGE: case SPELL_AURA_RAID_PROC_FROM_CHARGE:
{ {
;//sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "ProcDamageAndSpell: casting mending (triggered by %s dummy aura of spell %u)", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "ProcDamageAndSpell: casting mending (triggered by %s dummy aura of spell %u)",
#endif
// (isVictim?"a victim's":"an attacker's"), triggeredByAura->GetId()); // (isVictim?"a victim's":"an attacker's"), triggeredByAura->GetId());
HandleAuraRaidProcFromCharge(triggeredByAura); HandleAuraRaidProcFromCharge(triggeredByAura);
@@ -15111,7 +15177,9 @@ void Unit::ProcDamageAndSpellFor(bool isVictim, Unit* target, uint32 procFlag, u
} }
case SPELL_AURA_PROC_TRIGGER_SPELL_WITH_VALUE: case SPELL_AURA_PROC_TRIGGER_SPELL_WITH_VALUE:
{ {
;//sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "ProcDamageAndSpell: casting spell %u (triggered with value by %s aura of spell %u)", spellInfo->Id, (isVictim?"a victim's":"an attacker's"), triggeredByAura->GetId()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "ProcDamageAndSpell: casting spell %u (triggered with value by %s aura of spell %u)", spellInfo->Id, (isVictim?"a victim's":"an attacker's"), triggeredByAura->GetId());
#endif
if (HandleProcTriggerSpell(target, damage, triggeredByAura, procSpell, procFlag, procExtra, cooldown)) if (HandleProcTriggerSpell(target, damage, triggeredByAura, procSpell, procFlag, procExtra, cooldown))
takeCharges = true; takeCharges = true;
@@ -16085,7 +16153,9 @@ bool Unit::HandleAuraRaidProcFromChargeWithValue(AuraEffect* triggeredByAura)
// Currently only Prayer of Mending // Currently only Prayer of Mending
if (!(spellProto->SpellFamilyName == SPELLFAMILY_PRIEST && spellProto->SpellFamilyFlags[1] & 0x20)) if (!(spellProto->SpellFamilyName == SPELLFAMILY_PRIEST && spellProto->SpellFamilyFlags[1] & 0x20))
{ {
;//sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "Unit::HandleAuraRaidProcFromChargeWithValue, received not handled spell: %u", spellProto->Id); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "Unit::HandleAuraRaidProcFromChargeWithValue, received not handled spell: %u", spellProto->Id);
#endif
return false; return false;
} }
@@ -16389,7 +16459,9 @@ void Unit::Kill(Unit* killer, Unit* victim, bool durabilityLoss, WeaponAttackTyp
if (!spiritOfRedemption) if (!spiritOfRedemption)
{ {
;//sLog->outStaticDebug("SET JUST_DIED"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug("SET JUST_DIED");
#endif
victim->setDeathState(JUST_DIED); victim->setDeathState(JUST_DIED);
} }
@@ -16414,7 +16486,9 @@ void Unit::Kill(Unit* killer, Unit* victim, bool durabilityLoss, WeaponAttackTyp
// only if not player and not controlled by player pet. And not at BG // only if not player and not controlled by player pet. And not at BG
if ((durabilityLoss && !player && !plrVictim->InBattleground()) || (player && sWorld->getBoolConfig(CONFIG_DURABILITY_LOSS_IN_PVP))) if ((durabilityLoss && !player && !plrVictim->InBattleground()) || (player && sWorld->getBoolConfig(CONFIG_DURABILITY_LOSS_IN_PVP)))
{ {
;//sLog->outStaticDebug("We are dead, losing %f percent durability", sWorld->getRate(RATE_DURABILITY_LOSS_ON_DEATH)); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug("We are dead, losing %f percent durability", sWorld->getRate(RATE_DURABILITY_LOSS_ON_DEATH));
#endif
plrVictim->DurabilityLossAll(sWorld->getRate(RATE_DURABILITY_LOSS_ON_DEATH), false); plrVictim->DurabilityLossAll(sWorld->getRate(RATE_DURABILITY_LOSS_ON_DEATH), false);
// durability lost message // durability lost message
WorldPacket data(SMSG_DURABILITY_DAMAGE_DEATH, 0); WorldPacket data(SMSG_DURABILITY_DAMAGE_DEATH, 0);
@@ -16434,7 +16508,9 @@ void Unit::Kill(Unit* killer, Unit* victim, bool durabilityLoss, WeaponAttackTyp
} }
else // creature died else // creature died
{ {
;//sLog->outStaticDebug("DealDamageNotPlayer"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug("DealDamageNotPlayer");
#endif
if (!creature->IsPet() && creature->GetLootMode() > 0) if (!creature->IsPet() && creature->GetLootMode() > 0)
{ {
@@ -16835,7 +16911,9 @@ bool Unit::SetCharmedBy(Unit* charmer, CharmType type, AuraApplication const* au
throw 1; throw 1;
ASSERT((type == CHARM_TYPE_VEHICLE) == IsVehicle()); ASSERT((type == CHARM_TYPE_VEHICLE) == IsVehicle());
;//sLog->outDebug(LOG_FILTER_UNITS, "SetCharmedBy: charmer %u (GUID %u), charmed %u (GUID %u), type %u.", charmer->GetEntry(), charmer->GetGUIDLow(), GetEntry(), GetGUIDLow(), uint32(type)); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_UNITS, "SetCharmedBy: charmer %u (GUID %u), charmed %u (GUID %u), type %u.", charmer->GetEntry(), charmer->GetGUIDLow(), GetEntry(), GetGUIDLow(), uint32(type));
#endif
if (this == charmer) if (this == charmer)
{ {
@@ -18043,7 +18121,9 @@ void Unit::_EnterVehicle(Vehicle* vehicle, int8 seatId, AuraApplication const* a
{ {
if (seatId >= 0 && seatId != GetTransSeat()) if (seatId >= 0 && seatId != GetTransSeat())
{ {
;//sLog->outDebug(LOG_FILTER_VEHICLES, "EnterVehicle: %u leave vehicle %u seat %d and enter %d.", GetEntry(), m_vehicle->GetBase()->GetEntry(), GetTransSeat(), seatId); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_VEHICLES, "EnterVehicle: %u leave vehicle %u seat %d and enter %d.", GetEntry(), m_vehicle->GetBase()->GetEntry(), GetTransSeat(), seatId);
#endif
ChangeSeat(seatId); ChangeSeat(seatId);
} }
@@ -18051,7 +18131,9 @@ void Unit::_EnterVehicle(Vehicle* vehicle, int8 seatId, AuraApplication const* a
} }
else else
{ {
;//sLog->outDebug(LOG_FILTER_VEHICLES, "EnterVehicle: %u exit %u and enter %u.", GetEntry(), m_vehicle->GetBase()->GetEntry(), vehicle->GetBase()->GetEntry()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_VEHICLES, "EnterVehicle: %u exit %u and enter %u.", GetEntry(), m_vehicle->GetBase()->GetEntry(), vehicle->GetBase()->GetEntry());
#endif
ExitVehicle(); ExitVehicle();
} }
} }
@@ -18421,7 +18503,9 @@ void Unit::SendChangeCurrentVictimOpcode(HostileReference* pHostileReference)
{ {
uint32 count = getThreatManager().getThreatList().size(); uint32 count = getThreatManager().getThreatList().size();
;//sLog->outDebug(LOG_FILTER_UNITS, "WORLD: Send SMSG_HIGHEST_THREAT_UPDATE Message"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_UNITS, "WORLD: Send SMSG_HIGHEST_THREAT_UPDATE Message");
#endif
WorldPacket data(SMSG_HIGHEST_THREAT_UPDATE, 8 + 8 + count * 8); WorldPacket data(SMSG_HIGHEST_THREAT_UPDATE, 8 + 8 + count * 8);
data.append(GetPackGUID()); data.append(GetPackGUID());
data.appendPackGUID(pHostileReference->getUnitGuid()); data.appendPackGUID(pHostileReference->getUnitGuid());
@@ -18438,7 +18522,9 @@ void Unit::SendChangeCurrentVictimOpcode(HostileReference* pHostileReference)
void Unit::SendClearThreatListOpcode() void Unit::SendClearThreatListOpcode()
{ {
;//sLog->outDebug(LOG_FILTER_UNITS, "WORLD: Send SMSG_THREAT_CLEAR Message"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_UNITS, "WORLD: Send SMSG_THREAT_CLEAR Message");
#endif
WorldPacket data(SMSG_THREAT_CLEAR, 8); WorldPacket data(SMSG_THREAT_CLEAR, 8);
data.append(GetPackGUID()); data.append(GetPackGUID());
SendMessageToSet(&data, false); SendMessageToSet(&data, false);
@@ -18446,7 +18532,9 @@ void Unit::SendClearThreatListOpcode()
void Unit::SendRemoveFromThreatListOpcode(HostileReference* pHostileReference) void Unit::SendRemoveFromThreatListOpcode(HostileReference* pHostileReference)
{ {
;//sLog->outDebug(LOG_FILTER_UNITS, "WORLD: Send SMSG_THREAT_REMOVE Message"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_UNITS, "WORLD: Send SMSG_THREAT_REMOVE Message");
#endif
WorldPacket data(SMSG_THREAT_REMOVE, 8 + 8); WorldPacket data(SMSG_THREAT_REMOVE, 8 + 8);
data.append(GetPackGUID()); data.append(GetPackGUID());
data.appendPackGUID(pHostileReference->getUnitGuid()); data.appendPackGUID(pHostileReference->getUnitGuid());
src/game/Entities/Vehicle/Vehicle.cpp
+24 -8
View File
@@ -100,7 +100,9 @@ void Vehicle::Uninstall()
return; return;
} }
_status = STATUS_UNINSTALLING; _status = STATUS_UNINSTALLING;
;//sLog->outDebug(LOG_FILTER_VEHICLES, "Vehicle::Uninstall Entry: %u, GuidLow: %u", _creatureEntry, _me->GetGUIDLow()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_VEHICLES, "Vehicle::Uninstall Entry: %u, GuidLow: %u", _creatureEntry, _me->GetGUIDLow());
#endif
RemoveAllPassengers(); RemoveAllPassengers();
if (GetBase()->GetTypeId() == TYPEID_UNIT) if (GetBase()->GetTypeId() == TYPEID_UNIT)
@@ -109,7 +111,9 @@ void Vehicle::Uninstall()
void Vehicle::Reset(bool evading /*= false*/) void Vehicle::Reset(bool evading /*= false*/)
{ {
;//sLog->outDebug(LOG_FILTER_VEHICLES, "Vehicle::Reset Entry: %u, GuidLow: %u", _creatureEntry, _me->GetGUIDLow()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_VEHICLES, "Vehicle::Reset Entry: %u, GuidLow: %u", _creatureEntry, _me->GetGUIDLow());
#endif
if (_me->GetTypeId() == TYPEID_PLAYER) if (_me->GetTypeId() == TYPEID_PLAYER)
{ {
if (_usableSeatNum) if (_usableSeatNum)
@@ -193,7 +197,9 @@ void Vehicle::ApplyAllImmunities()
void Vehicle::RemoveAllPassengers() void Vehicle::RemoveAllPassengers()
{ {
;//sLog->outDebug(LOG_FILTER_VEHICLES, "Vehicle::RemoveAllPassengers. Entry: %u, GuidLow: %u", _creatureEntry, _me->GetGUIDLow()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_VEHICLES, "Vehicle::RemoveAllPassengers. Entry: %u, GuidLow: %u", _creatureEntry, _me->GetGUIDLow());
#endif
// Passengers always cast an aura with SPELL_AURA_CONTROL_VEHICLE on the vehicle // Passengers always cast an aura with SPELL_AURA_CONTROL_VEHICLE on the vehicle
// We just remove the aura and the unapply handler will make the target leave the vehicle. // We just remove the aura and the unapply handler will make the target leave the vehicle.
@@ -262,7 +268,9 @@ void Vehicle::InstallAccessory(uint32 entry, int8 seatId, bool minion, uint8 typ
return; return;
} }
;//sLog->outDebug(LOG_FILTER_VEHICLES, "Vehicle: Installing accessory entry %u on vehicle entry %u (seat:%i)", entry, GetCreatureEntry(), seatId); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_VEHICLES, "Vehicle: Installing accessory entry %u on vehicle entry %u (seat:%i)", entry, GetCreatureEntry(), seatId);
#endif
if (Unit* passenger = GetPassenger(seatId)) if (Unit* passenger = GetPassenger(seatId))
{ {
// already installed // already installed
@@ -301,7 +309,9 @@ bool Vehicle::AddPassenger(Unit* unit, int8 seatId)
/// @Prevent adding passengers when vehicle is uninstalling. (Bad script in OnUninstall/OnRemovePassenger/PassengerBoarded hook.) /// @Prevent adding passengers when vehicle is uninstalling. (Bad script in OnUninstall/OnRemovePassenger/PassengerBoarded hook.)
if (_status == STATUS_UNINSTALLING) if (_status == STATUS_UNINSTALLING)
{ {
;//sLog->outError(LOG_FILTER_VEHICLES, "Passenger GuidLow: %u, Entry: %u, attempting to board vehicle GuidLow: %u, Entry: %u during uninstall! SeatId: %i", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outError(LOG_FILTER_VEHICLES, "Passenger GuidLow: %u, Entry: %u, attempting to board vehicle GuidLow: %u, Entry: %u during uninstall! SeatId: %i",
#endif
// unit->GetGUIDLow(), unit->GetEntry(), _me->GetGUIDLow(), _me->GetEntry(), (int32)seatId); // unit->GetGUIDLow(), unit->GetEntry(), _me->GetGUIDLow(), _me->GetEntry(), (int32)seatId);
return false; return false;
} }
@@ -336,7 +346,9 @@ bool Vehicle::AddPassenger(Unit* unit, int8 seatId)
ASSERT(seat->second.IsEmpty()); ASSERT(seat->second.IsEmpty());
} }
;//sLog->outDebug(LOG_FILTER_VEHICLES, "Unit %s enter vehicle entry %u id %u dbguid %u seat %d", unit->GetName().c_str(), _me->GetEntry(), _vehicleInfo->m_ID, _me->GetGUIDLow(), (int32)seat->first); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_VEHICLES, "Unit %s enter vehicle entry %u id %u dbguid %u seat %d", unit->GetName().c_str(), _me->GetEntry(), _vehicleInfo->m_ID, _me->GetGUIDLow(), (int32)seat->first);
#endif
seat->second.Passenger.Guid = unit->GetGUID(); seat->second.Passenger.Guid = unit->GetGUID();
seat->second.Passenger.IsUnselectable = unit->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); seat->second.Passenger.IsUnselectable = unit->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
@@ -445,7 +457,9 @@ void Vehicle::RemovePassenger(Unit* unit)
if (seat == Seats.end()) if (seat == Seats.end())
return; return;
;//sLog->outDebug(LOG_FILTER_VEHICLES, "Unit %s exit vehicle entry %u id %u dbguid %u seat %d", unit->GetName().c_str(), _me->GetEntry(), _vehicleInfo->m_ID, _me->GetGUIDLow(), (int32)seat->first); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_VEHICLES, "Unit %s exit vehicle entry %u id %u dbguid %u seat %d", unit->GetName().c_str(), _me->GetEntry(), _vehicleInfo->m_ID, _me->GetGUIDLow(), (int32)seat->first);
#endif
if (seat->second.SeatInfo->CanEnterOrExit() && ++_usableSeatNum) if (seat->second.SeatInfo->CanEnterOrExit() && ++_usableSeatNum)
_me->SetFlag(UNIT_NPC_FLAGS, (_me->GetTypeId() == TYPEID_PLAYER ? UNIT_NPC_FLAG_PLAYER_VEHICLE : UNIT_NPC_FLAG_SPELLCLICK)); _me->SetFlag(UNIT_NPC_FLAGS, (_me->GetTypeId() == TYPEID_PLAYER ? UNIT_NPC_FLAG_PLAYER_VEHICLE : UNIT_NPC_FLAG_SPELLCLICK));
@@ -505,7 +519,9 @@ void Vehicle::Dismiss()
if (GetBase()->GetTypeId() != TYPEID_UNIT) if (GetBase()->GetTypeId() != TYPEID_UNIT)
return; return;
;//sLog->outDebug(LOG_FILTER_VEHICLES, "Vehicle::Dismiss Entry: %u, GuidLow %u", _creatureEntry, _me->GetGUIDLow()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_VEHICLES, "Vehicle::Dismiss Entry: %u, GuidLow %u", _creatureEntry, _me->GetGUIDLow());
#endif
Uninstall(); Uninstall();
GetBase()->ToCreature()->DespawnOrUnsummon(); GetBase()->ToCreature()->DespawnOrUnsummon();
} }
src/game/Events/GameEventMgr.cpp
+9 -3
View File
@@ -1096,13 +1096,17 @@ uint32 GameEventMgr::Update() // return the next e
nextEventDelay = 0; nextEventDelay = 0;
for (std::set<uint16>::iterator itr = deactivate.begin(); itr != deactivate.end(); ++itr) for (std::set<uint16>::iterator itr = deactivate.begin(); itr != deactivate.end(); ++itr)
StopEvent(*itr); StopEvent(*itr);
;//sLog->outDetail("Next game event check in %u seconds.", nextEventDelay + 1); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("Next game event check in %u seconds.", nextEventDelay + 1);
#endif
return (nextEventDelay + 1) * IN_MILLISECONDS; // Add 1 second to be sure event has started/stopped at next call return (nextEventDelay + 1) * IN_MILLISECONDS; // Add 1 second to be sure event has started/stopped at next call
} }
void GameEventMgr::UnApplyEvent(uint16 event_id) void GameEventMgr::UnApplyEvent(uint16 event_id)
{ {
;//sLog->outDetail("GameEvent %u \"%s\" removed.", event_id, mGameEvent[event_id].description.c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("GameEvent %u \"%s\" removed.", event_id, mGameEvent[event_id].description.c_str());
#endif
//! Run SAI scripts with SMART_EVENT_GAME_EVENT_END //! Run SAI scripts with SMART_EVENT_GAME_EVENT_END
RunSmartAIScripts(event_id, false); RunSmartAIScripts(event_id, false);
// un-spawn positive event tagged objects // un-spawn positive event tagged objects
@@ -1136,7 +1140,9 @@ void GameEventMgr::ApplyNewEvent(uint16 event_id)
break; break;
} }
;//sLog->outDetail("GameEvent %u \"%s\" started.", event_id, mGameEvent[event_id].description.c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("GameEvent %u \"%s\" started.", event_id, mGameEvent[event_id].description.c_str());
#endif
//! Run SAI scripts with SMART_EVENT_GAME_EVENT_END //! Run SAI scripts with SMART_EVENT_GAME_EVENT_END
RunSmartAIScripts(event_id, true); RunSmartAIScripts(event_id, true);
src/game/Globals/ObjectAccessor.cpp
+3 -1
View File
@@ -313,7 +313,9 @@ Corpse* ObjectAccessor::ConvertCorpseForPlayer(uint64 player_guid, bool insignia
return NULL; return NULL;
} }
;//sLog->outStaticDebug("Deleting Corpse and spawned bones."); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug("Deleting Corpse and spawned bones.");
#endif
// Map can be NULL // Map can be NULL
Map* map = corpse->FindMap(); Map* map = corpse->FindMap();
src/game/Globals/ObjectMgr.cpp
+12 -4
View File
@@ -1865,7 +1865,9 @@ uint32 ObjectMgr::AddGOData(uint32 entry, uint32 mapId, float x, float y, float
} }
} }
;//sLog->outDebug(LOG_FILTER_MAPS, "AddGOData: dbguid %u entry %u map %u x %f y %f z %f o %f", guid, entry, mapId, x, y, z, o); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_MAPS, "AddGOData: dbguid %u entry %u map %u x %f y %f z %f o %f", guid, entry, mapId, x, y, z, o);
#endif
return guid; return guid;
} }
@@ -3108,7 +3110,9 @@ void ObjectMgr::LoadPetLevelInfo()
sLog->outErrorDb("Wrong (> %u) level %u in `pet_levelstats` table, ignoring.", STRONG_MAX_LEVEL, current_level); sLog->outErrorDb("Wrong (> %u) level %u in `pet_levelstats` table, ignoring.", STRONG_MAX_LEVEL, current_level);
else else
{ {
;//sLog->outDetail("Unused (> MaxPlayerLevel in worldserver.conf) level %u in `pet_levelstats` table, ignoring.", current_level); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("Unused (> MaxPlayerLevel in worldserver.conf) level %u in `pet_levelstats` table, ignoring.", current_level);
#endif
++count; // make result loading percent "expected" correct in case disabled detail mode for example. ++count; // make result loading percent "expected" correct in case disabled detail mode for example.
} }
continue; continue;
@@ -3609,7 +3613,9 @@ void ObjectMgr::LoadPlayerInfo()
sLog->outErrorDb("Wrong (> %u) level %u in `player_levelstats` table, ignoring.", STRONG_MAX_LEVEL, current_level); sLog->outErrorDb("Wrong (> %u) level %u in `player_levelstats` table, ignoring.", STRONG_MAX_LEVEL, current_level);
else else
{ {
;//sLog->outDetail("Unused (> MaxPlayerLevel in worldserver.conf) level %u in `player_levelstats` table, ignoring.", current_level); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("Unused (> MaxPlayerLevel in worldserver.conf) level %u in `player_levelstats` table, ignoring.", current_level);
#endif
++count; // make result loading percent "expected" correct in case disabled detail mode for example. ++count; // make result loading percent "expected" correct in case disabled detail mode for example.
} }
continue; continue;
@@ -3711,7 +3717,9 @@ void ObjectMgr::LoadPlayerInfo()
sLog->outErrorDb("Wrong (> %u) level %u in `player_xp_for_level` table, ignoring.", STRONG_MAX_LEVEL, current_level); sLog->outErrorDb("Wrong (> %u) level %u in `player_xp_for_level` table, ignoring.", STRONG_MAX_LEVEL, current_level);
else else
{ {
;//sLog->outDetail("Unused (> MaxPlayerLevel in worldserver.conf) level %u in `player_xp_for_levels` table, ignoring.", current_level); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("Unused (> MaxPlayerLevel in worldserver.conf) level %u in `player_xp_for_levels` table, ignoring.", current_level);
#endif
++count; // make result loading percent "expected" correct in case disabled detail mode for example. ++count; // make result loading percent "expected" correct in case disabled detail mode for example.
} }
continue; continue;
src/game/Grids/ObjectGridLoader.cpp
+3 -1
View File
@@ -204,7 +204,9 @@ void ObjectGridLoader::LoadN(void)
} }
} }
} }
;//sLog->outDebug(LOG_FILTER_MAPS, "%u GameObjects, %u Creatures, and %u Corpses/Bones loaded for grid %u on map %u", i_gameObjects, i_creatures, i_corpses, i_grid.GetGridId(), i_map->GetId()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_MAPS, "%u GameObjects, %u Creatures, and %u Corpses/Bones loaded for grid %u on map %u", i_gameObjects, i_creatures, i_corpses, i_grid.GetGridId(), i_map->GetId());
#endif
} }
template<class T> template<class T>
src/game/Groups/Group.cpp
+9 -3
View File
@@ -65,7 +65,9 @@ Group::~Group()
{ {
if (m_bgGroup) if (m_bgGroup)
{ {
;//sLog->outDebug(LOG_FILTER_BATTLEGROUND, "Group::~Group: battleground group being deleted."); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_BATTLEGROUND, "Group::~Group: battleground group being deleted.");
#endif
if (m_bgGroup->GetBgRaid(TEAM_ALLIANCE) == this) m_bgGroup->SetBgRaid(TEAM_ALLIANCE, NULL); if (m_bgGroup->GetBgRaid(TEAM_ALLIANCE) == this) m_bgGroup->SetBgRaid(TEAM_ALLIANCE, NULL);
else if (m_bgGroup->GetBgRaid(TEAM_HORDE) == this) m_bgGroup->SetBgRaid(TEAM_HORDE, NULL); else if (m_bgGroup->GetBgRaid(TEAM_HORDE) == this) m_bgGroup->SetBgRaid(TEAM_HORDE, NULL);
else sLog->outError("Group::~Group: battleground group is not linked to the correct battleground."); else sLog->outError("Group::~Group: battleground group is not linked to the correct battleground.");
@@ -1215,7 +1217,9 @@ void Group::NeedBeforeGreed(Loot* loot, WorldObject* lootedObject)
void Group::MasterLoot(Loot* loot, WorldObject* pLootedObject) void Group::MasterLoot(Loot* loot, WorldObject* pLootedObject)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "Group::MasterLoot (SMSG_LOOT_MASTER_LIST, 330)"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "Group::MasterLoot (SMSG_LOOT_MASTER_LIST, 330)");
#endif
for (std::vector<LootItem>::iterator i = loot->items.begin(); i != loot->items.end(); ++i) for (std::vector<LootItem>::iterator i = loot->items.begin(); i != loot->items.end(); ++i)
{ {
@@ -2009,7 +2013,9 @@ void Group::BroadcastGroupUpdate(void)
{ {
pp->ForceValuesUpdateAtIndex(UNIT_FIELD_BYTES_2); pp->ForceValuesUpdateAtIndex(UNIT_FIELD_BYTES_2);
pp->ForceValuesUpdateAtIndex(UNIT_FIELD_FACTIONTEMPLATE); pp->ForceValuesUpdateAtIndex(UNIT_FIELD_FACTIONTEMPLATE);
;//sLog->outStaticDebug("-- Forced group value update for '%s'", pp->GetName().c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug("-- Forced group value update for '%s'", pp->GetName().c_str());
#endif
} }
} }
} }
src/game/Guilds/Guild.cpp
+66 -22
View File
@@ -92,7 +92,9 @@ void Guild::SendCommandResult(WorldSession* session, GuildCommandType type, Guil
data << uint32(errCode); data << uint32(errCode);
session->SendPacket(&data); session->SendPacket(&data);
;//sLog->outDebug(LOG_FILTER_GUILD, "SMSG_GUILD_COMMAND_RESULT [%s]: Type: %u, code: %u, param: %s" #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_GUILD, "SMSG_GUILD_COMMAND_RESULT [%s]: Type: %u, code: %u, param: %s"
#endif
// , session->GetPlayerInfo().c_str(), type, errCode, param.c_str()); // , session->GetPlayerInfo().c_str(), type, errCode, param.c_str());
} }
@@ -102,7 +104,9 @@ void Guild::SendSaveEmblemResult(WorldSession* session, GuildEmblemError errCode
data << uint32(errCode); data << uint32(errCode);
session->SendPacket(&data); session->SendPacket(&data);
;//sLog->outDebug(LOG_FILTER_GUILD, "MSG_SAVE_GUILD_EMBLEM [%s] Code: %u", session->GetPlayerInfo().c_str(), errCode); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_GUILD, "MSG_SAVE_GUILD_EMBLEM [%s] Code: %u", session->GetPlayerInfo().c_str(), errCode);
#endif
} }
// LogHolder // LogHolder
@@ -561,13 +565,17 @@ void Guild::BankTab::SendText(Guild const* guild, WorldSession* session) const
if (session) if (session)
{ {
;//sLog->outDebug(LOG_FILTER_GUILD, "MSG_QUERY_GUILD_BANK_TEXT [%s]: Tabid: %u, Text: %s" #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_GUILD, "MSG_QUERY_GUILD_BANK_TEXT [%s]: Tabid: %u, Text: %s"
#endif
// , session->GetPlayerInfo().c_str(), m_tabId, m_text.c_str()); // , session->GetPlayerInfo().c_str(), m_tabId, m_text.c_str());
session->SendPacket(&data); session->SendPacket(&data);
} }
else else
{ {
;//sLog->outDebug(LOG_FILTER_GUILD, "MSG_QUERY_GUILD_BANK_TEXT [Broadcast]: Tabid: %u, Text: %s", m_tabId, m_text.c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_GUILD, "MSG_QUERY_GUILD_BANK_TEXT [Broadcast]: Tabid: %u, Text: %s", m_tabId, m_text.c_str());
#endif
guild->BroadcastPacket(&data); guild->BroadcastPacket(&data);
} }
} }
@@ -953,7 +961,9 @@ Item* Guild::BankMoveItemData::StoreItem(SQLTransaction& trans, Item* pItem)
ItemPosCount pos(*itr); ItemPosCount pos(*itr);
++itr; ++itr;
;//sLog->outDebug(LOG_FILTER_GUILD, "GUILD STORAGE: StoreItem tab = %u, slot = %u, item = %u, count = %u", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_GUILD, "GUILD STORAGE: StoreItem tab = %u, slot = %u, item = %u, count = %u",
#endif
// m_container, m_slotId, pItem->GetEntry(), pItem->GetCount()); // m_container, m_slotId, pItem->GetEntry(), pItem->GetCount());
pLastItem = _StoreItem(trans, pTab, pItem, pos, itr != m_vec.end()); pLastItem = _StoreItem(trans, pTab, pItem, pos, itr != m_vec.end());
} }
@@ -1056,7 +1066,9 @@ void Guild::BankMoveItemData::CanStoreItemInTab(Item* pItem, uint8 skipSlotId, b
InventoryResult Guild::BankMoveItemData::CanStore(Item* pItem, bool swap) InventoryResult Guild::BankMoveItemData::CanStore(Item* pItem, bool swap)
{ {
;//sLog->outDebug(LOG_FILTER_GUILD, "GUILD STORAGE: CanStore() tab = %u, slot = %u, item = %u, count = %u", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_GUILD, "GUILD STORAGE: CanStore() tab = %u, slot = %u, item = %u, count = %u",
#endif
// m_container, m_slotId, pItem->GetEntry(), pItem->GetCount()); // m_container, m_slotId, pItem->GetEntry(), pItem->GetCount());
uint32 count = pItem->GetCount(); uint32 count = pItem->GetCount();
@@ -1154,7 +1166,9 @@ bool Guild::Create(Player* pLeader, std::string const& name)
m_createdDate = ::time(NULL); m_createdDate = ::time(NULL);
_CreateLogHolders(); _CreateLogHolders();
;//sLog->outDebug(LOG_FILTER_GUILD, "GUILD: creating guild [%s] for leader %s (%u)", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_GUILD, "GUILD: creating guild [%s] for leader %s (%u)",
#endif
// name.c_str(), pLeader->GetName().c_str(), GUID_LOPART(m_leaderGuid)); // name.c_str(), pLeader->GetName().c_str(), GUID_LOPART(m_leaderGuid));
SQLTransaction trans = CharacterDatabase.BeginTransaction(); SQLTransaction trans = CharacterDatabase.BeginTransaction();
@@ -1286,7 +1300,9 @@ void Guild::HandleRoster(WorldSession* session)
itr->second->WritePacket(data, _HasRankRight(session->GetPlayer(), GR_RIGHT_VIEWOFFNOTE)); itr->second->WritePacket(data, _HasRankRight(session->GetPlayer(), GR_RIGHT_VIEWOFFNOTE));
;//sLog->outDebug(LOG_FILTER_GUILD, "SMSG_GUILD_ROSTER [%s]", session->GetPlayerInfo().c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_GUILD, "SMSG_GUILD_ROSTER [%s]", session->GetPlayerInfo().c_str());
#endif
session->SendPacket(&data); session->SendPacket(&data);
} }
@@ -1309,7 +1325,9 @@ void Guild::HandleQuery(WorldSession* session)
data << uint32(_GetRanksSize()); // Number of ranks used data << uint32(_GetRanksSize()); // Number of ranks used
session->SendPacket(&data); session->SendPacket(&data);
;//sLog->outDebug(LOG_FILTER_GUILD, "SMSG_GUILD_QUERY_RESPONSE [%s]", session->GetPlayerInfo().c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_GUILD, "SMSG_GUILD_QUERY_RESPONSE [%s]", session->GetPlayerInfo().c_str());
#endif
} }
void Guild::HandleSetMOTD(WorldSession* session, std::string const& motd) void Guild::HandleSetMOTD(WorldSession* session, std::string const& motd)
@@ -1433,7 +1451,9 @@ void Guild::HandleSetRankInfo(WorldSession* session, uint8 rankId, std::string c
SendCommandResult(session, GUILD_COMMAND_CHANGE_RANK, ERR_GUILD_PERMISSIONS); SendCommandResult(session, GUILD_COMMAND_CHANGE_RANK, ERR_GUILD_PERMISSIONS);
else if (RankInfo* rankInfo = GetRankInfo(rankId)) else if (RankInfo* rankInfo = GetRankInfo(rankId))
{ {
;//sLog->outDebug(LOG_FILTER_GUILD, "Changed RankName to '%s', rights to 0x%08X", name.c_str(), rights); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_GUILD, "Changed RankName to '%s', rights to 0x%08X", name.c_str(), rights);
#endif
rankInfo->SetName(name); rankInfo->SetName(name);
rankInfo->SetRights(rights); rankInfo->SetRights(rights);
@@ -1519,7 +1539,9 @@ void Guild::HandleInviteMember(WorldSession* session, std::string const& name)
SendCommandResult(session, GUILD_COMMAND_INVITE, ERR_GUILD_COMMAND_SUCCESS, name); SendCommandResult(session, GUILD_COMMAND_INVITE, ERR_GUILD_COMMAND_SUCCESS, name);
;//sLog->outDebug(LOG_FILTER_GUILD, "Player %s invited %s to join his Guild", player->GetName().c_str(), name.c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_GUILD, "Player %s invited %s to join his Guild", player->GetName().c_str(), name.c_str());
#endif
pInvitee->SetGuildIdInvited(m_id); pInvitee->SetGuildIdInvited(m_id);
_LogEvent(GUILD_EVENT_LOG_INVITE_PLAYER, player->GetGUIDLow(), pInvitee->GetGUIDLow()); _LogEvent(GUILD_EVENT_LOG_INVITE_PLAYER, player->GetGUIDLow(), pInvitee->GetGUIDLow());
@@ -1528,7 +1550,9 @@ void Guild::HandleInviteMember(WorldSession* session, std::string const& name)
data << player->GetName(); data << player->GetName();
data << m_name; data << m_name;
pInvitee->GetSession()->SendPacket(&data); pInvitee->GetSession()->SendPacket(&data);
;//sLog->outDebug(LOG_FILTER_GUILD, "SMSG_GUILD_INVITE [%s]", pInvitee->GetName().c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_GUILD, "SMSG_GUILD_INVITE [%s]", pInvitee->GetName().c_str());
#endif
} }
void Guild::HandleAcceptMember(WorldSession* session) void Guild::HandleAcceptMember(WorldSession* session)
@@ -1787,7 +1811,9 @@ void Guild::HandleDisband(WorldSession* session)
if (_IsLeader(session->GetPlayer())) if (_IsLeader(session->GetPlayer()))
{ {
Disband(); Disband();
;//sLog->outDebug(LOG_FILTER_GUILD, "Guild Successfully Disbanded"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_GUILD, "Guild Successfully Disbanded");
#endif
delete this; delete this;
} }
} }
@@ -1802,7 +1828,9 @@ void Guild::SendInfo(WorldSession* session) const
data << m_accountsNumber; // Number of accounts data << m_accountsNumber; // Number of accounts
session->SendPacket(&data); session->SendPacket(&data);
;//sLog->outDebug(LOG_FILTER_GUILD, "SMSG_GUILD_INFO [%s]", session->GetPlayerInfo().c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_GUILD, "SMSG_GUILD_INFO [%s]", session->GetPlayerInfo().c_str());
#endif
} }
void Guild::SendEventLog(WorldSession* session) const void Guild::SendEventLog(WorldSession* session) const
@@ -1810,7 +1838,9 @@ void Guild::SendEventLog(WorldSession* session) const
WorldPacket data(MSG_GUILD_EVENT_LOG_QUERY, 1 + m_eventLog->GetSize() * (1 + 8 + 4)); WorldPacket data(MSG_GUILD_EVENT_LOG_QUERY, 1 + m_eventLog->GetSize() * (1 + 8 + 4));
m_eventLog->WritePacket(data); m_eventLog->WritePacket(data);
session->SendPacket(&data); session->SendPacket(&data);
;//sLog->outDebug(LOG_FILTER_GUILD, "MSG_GUILD_EVENT_LOG_QUERY [%s]", session->GetPlayerInfo().c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_GUILD, "MSG_GUILD_EVENT_LOG_QUERY [%s]", session->GetPlayerInfo().c_str());
#endif
} }
void Guild::SendBankLog(WorldSession* session, uint8 tabId) const void Guild::SendBankLog(WorldSession* session, uint8 tabId) const
@@ -1823,7 +1853,9 @@ void Guild::SendBankLog(WorldSession* session, uint8 tabId) const
data << uint8(tabId); data << uint8(tabId);
pLog->WritePacket(data); pLog->WritePacket(data);
session->SendPacket(&data); session->SendPacket(&data);
;//sLog->outDebug(LOG_FILTER_GUILD, "MSG_GUILD_BANK_LOG_QUERY [%s]", session->GetPlayerInfo().c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_GUILD, "MSG_GUILD_BANK_LOG_QUERY [%s]", session->GetPlayerInfo().c_str());
#endif
} }
} }
@@ -1864,7 +1896,9 @@ void Guild::SendPermissions(WorldSession* session) const
} }
session->SendPacket(&data); session->SendPacket(&data);
;//sLog->outDebug(LOG_FILTER_GUILD, "MSG_GUILD_PERMISSIONS [%s] Rank: %u", session->GetPlayerInfo().c_str(), rankId); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_GUILD, "MSG_GUILD_PERMISSIONS [%s] Rank: %u", session->GetPlayerInfo().c_str(), rankId);
#endif
} }
void Guild::SendMoneyInfo(WorldSession* session) const void Guild::SendMoneyInfo(WorldSession* session) const
@@ -1877,7 +1911,9 @@ void Guild::SendMoneyInfo(WorldSession* session) const
WorldPacket data(MSG_GUILD_BANK_MONEY_WITHDRAWN, 4); WorldPacket data(MSG_GUILD_BANK_MONEY_WITHDRAWN, 4);
data << int32(amount); data << int32(amount);
session->SendPacket(&data); session->SendPacket(&data);
;//sLog->outDebug(LOG_FILTER_GUILD, "MSG_GUILD_BANK_MONEY_WITHDRAWN [%s] Money: %u", session->GetPlayerInfo().c_str(), amount); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_GUILD, "MSG_GUILD_BANK_MONEY_WITHDRAWN [%s] Money: %u", session->GetPlayerInfo().c_str(), amount);
#endif
} }
void Guild::SendLoginInfo(WorldSession* session) void Guild::SendLoginInfo(WorldSession* session)
@@ -1888,7 +1924,9 @@ void Guild::SendLoginInfo(WorldSession* session)
data << m_motd; data << m_motd;
session->SendPacket(&data); session->SendPacket(&data);
;//sLog->outDebug(LOG_FILTER_GUILD, "SMSG_GUILD_EVENT [%s] MOTD", session->GetPlayerInfo().c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_GUILD, "SMSG_GUILD_EVENT [%s] MOTD", session->GetPlayerInfo().c_str());
#endif
SendBankTabsInfo(session); SendBankTabsInfo(session);
@@ -2825,7 +2863,9 @@ void Guild::_BroadcastEvent(GuildEvents guildEvent, uint64 guid, const char* par
data << uint64(guid); data << uint64(guid);
BroadcastPacket(&data); BroadcastPacket(&data);
;//sLog->outDebug(LOG_FILTER_GUILD, "SMSG_GUILD_EVENT [Broadcast] Event: %u", guildEvent); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_GUILD, "SMSG_GUILD_EVENT [Broadcast] Event: %u", guildEvent);
#endif
} }
void Guild::_SendBankList(WorldSession* session /* = NULL*/, uint8 tabId /*= 0*/, bool sendAllSlots /*= false*/, SlotIds *slots /*= NULL*/) const void Guild::_SendBankList(WorldSession* session /* = NULL*/, uint8 tabId /*= 0*/, bool sendAllSlots /*= false*/, SlotIds *slots /*= NULL*/) const
@@ -2865,7 +2905,9 @@ void Guild::_SendBankList(WorldSession* session /* = NULL*/, uint8 tabId /*= 0*/
numSlots = _GetMemberRemainingSlots(member, tabId); numSlots = _GetMemberRemainingSlots(member, tabId);
data.put<uint32>(rempos, numSlots); data.put<uint32>(rempos, numSlots);
session->SendPacket(&data); session->SendPacket(&data);
;//sLog->outDebug(LOG_FILTER_GUILD, "SMSG_GUILD_BANK_LIST [%s]: TabId: %u, FullSlots: %u, slots: %d", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_GUILD, "SMSG_GUILD_BANK_LIST [%s]: TabId: %u, FullSlots: %u, slots: %d",
#endif
// session->GetPlayerInfo().c_str(), tabId, sendAllSlots, numSlots); // session->GetPlayerInfo().c_str(), tabId, sendAllSlots, numSlots);
} }
else // TODO - Probably this is just sent to session + those that have sent CMSG_GUILD_BANKER_ACTIVATE else // TODO - Probably this is just sent to session + those that have sent CMSG_GUILD_BANKER_ACTIVATE
@@ -2881,7 +2923,9 @@ void Guild::_SendBankList(WorldSession* session /* = NULL*/, uint8 tabId /*= 0*/
uint32 numSlots = _GetMemberRemainingSlots(itr->second, tabId); uint32 numSlots = _GetMemberRemainingSlots(itr->second, tabId);
data.put<uint32>(rempos, numSlots); data.put<uint32>(rempos, numSlots);
player->GetSession()->SendPacket(&data); player->GetSession()->SendPacket(&data);
;//sLog->outDebug(LOG_FILTER_GUILD, "SMSG_GUILD_BANK_LIST [%s]: TabId: %u, FullSlots: %u, slots: %u" #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_GUILD, "SMSG_GUILD_BANK_LIST [%s]: TabId: %u, FullSlots: %u, slots: %u"
#endif
// , player->GetName().c_str(), tabId, sendAllSlots, numSlots); // , player->GetName().c_str(), tabId, sendAllSlots, numSlots);
} }
} }
src/game/Handlers/AddonHandler.cpp
+6 -2
View File
@@ -66,7 +66,9 @@ bool AddonHandler::BuildAddonPacket(WorldPacket* Source, WorldPacket* Target)
AddOnPacked >> enabled >> crc >> unk2; AddOnPacked >> enabled >> crc >> unk2;
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "ADDON: Name: %s, Enabled: 0x%x, CRC: 0x%x, Unknown2: 0x%x", addonName.c_str(), enabled, crc, unk2); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "ADDON: Name: %s, Enabled: 0x%x, CRC: 0x%x, Unknown2: 0x%x", addonName.c_str(), enabled, crc, unk2);
#endif
uint8 state = (enabled ? 2 : 1); uint8 state = (enabled ? 2 : 1);
*Target << uint8(state); *Target << uint8(state);
@@ -120,7 +122,9 @@ bool AddonHandler::BuildAddonPacket(WorldPacket* Source, WorldPacket* Target)
*Target << uint32(count); *Target << uint32(count);
//if (AddOnPacked.rpos() != AddOnPacked.size()) //if (AddOnPacked.rpos() != AddOnPacked.size())
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "packet under read!"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "packet under read!");
#endif
} }
else else
{ {
src/game/Handlers/ArenaTeamHandler.cpp
+39 -13
View File
@@ -19,11 +19,15 @@
void WorldSession::HandleInspectArenaTeamsOpcode(WorldPacket & recvData) void WorldSession::HandleInspectArenaTeamsOpcode(WorldPacket & recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "MSG_INSPECT_ARENA_TEAMS"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "MSG_INSPECT_ARENA_TEAMS");
#endif
uint64 guid; uint64 guid;
recvData >> guid; recvData >> guid;
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "Inspect Arena stats (GUID: %u TypeId: %u)", GUID_LOPART(guid), GuidHigh2TypeId(GUID_HIPART(guid))); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "Inspect Arena stats (GUID: %u TypeId: %u)", GUID_LOPART(guid), GuidHigh2TypeId(GUID_HIPART(guid)));
#endif
if (Player* player = ObjectAccessor::FindPlayer(guid)) if (Player* player = ObjectAccessor::FindPlayer(guid))
{ {
@@ -40,7 +44,9 @@ void WorldSession::HandleInspectArenaTeamsOpcode(WorldPacket & recvData)
void WorldSession::HandleArenaTeamQueryOpcode(WorldPacket & recvData) void WorldSession::HandleArenaTeamQueryOpcode(WorldPacket & recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_ARENA_TEAM_QUERY"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_ARENA_TEAM_QUERY");
#endif
uint32 arenaTeamId; uint32 arenaTeamId;
recvData >> arenaTeamId; recvData >> arenaTeamId;
@@ -54,7 +60,9 @@ void WorldSession::HandleArenaTeamQueryOpcode(WorldPacket & recvData)
void WorldSession::HandleArenaTeamRosterOpcode(WorldPacket & recvData) void WorldSession::HandleArenaTeamRosterOpcode(WorldPacket & recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_ARENA_TEAM_ROSTER"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_ARENA_TEAM_ROSTER");
#endif
uint32 arenaTeamId; // arena team id uint32 arenaTeamId; // arena team id
recvData >> arenaTeamId; recvData >> arenaTeamId;
@@ -65,7 +73,9 @@ void WorldSession::HandleArenaTeamRosterOpcode(WorldPacket & recvData)
void WorldSession::HandleArenaTeamInviteOpcode(WorldPacket & recvData) void WorldSession::HandleArenaTeamInviteOpcode(WorldPacket & recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_ARENA_TEAM_INVITE"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_ARENA_TEAM_INVITE");
#endif
uint32 arenaTeamId; // arena team id uint32 arenaTeamId; // arena team id
std::string invitedName; std::string invitedName;
@@ -135,7 +145,9 @@ void WorldSession::HandleArenaTeamInviteOpcode(WorldPacket & recvData)
return; return;
} }
;//sLog->outDebug(LOG_FILTER_BATTLEGROUND, "Player %s Invited %s to Join his ArenaTeam", GetPlayer()->GetName().c_str(), invitedName.c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_BATTLEGROUND, "Player %s Invited %s to Join his ArenaTeam", GetPlayer()->GetName().c_str(), invitedName.c_str());
#endif
player->SetArenaTeamIdInvited(arenaTeam->GetId()); player->SetArenaTeamIdInvited(arenaTeam->GetId());
@@ -144,12 +156,16 @@ void WorldSession::HandleArenaTeamInviteOpcode(WorldPacket & recvData)
data << arenaTeam->GetName(); data << arenaTeam->GetName();
player->GetSession()->SendPacket(&data); player->GetSession()->SendPacket(&data);
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Sent SMSG_ARENA_TEAM_INVITE"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Sent SMSG_ARENA_TEAM_INVITE");
#endif
} }
void WorldSession::HandleArenaTeamAcceptOpcode(WorldPacket & /*recvData*/) void WorldSession::HandleArenaTeamAcceptOpcode(WorldPacket & /*recvData*/)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_ARENA_TEAM_ACCEPT"); // empty opcode #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_ARENA_TEAM_ACCEPT"); // empty opcode
#endif
ArenaTeam* arenaTeam = sArenaTeamMgr->GetArenaTeamById(_player->GetArenaTeamIdInvited()); ArenaTeam* arenaTeam = sArenaTeamMgr->GetArenaTeamById(_player->GetArenaTeamIdInvited());
if (!arenaTeam) if (!arenaTeam)
@@ -182,7 +198,9 @@ void WorldSession::HandleArenaTeamAcceptOpcode(WorldPacket & /*recvData*/)
void WorldSession::HandleArenaTeamDeclineOpcode(WorldPacket & /*recvData*/) void WorldSession::HandleArenaTeamDeclineOpcode(WorldPacket & /*recvData*/)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_ARENA_TEAM_DECLINE"); // empty opcode #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_ARENA_TEAM_DECLINE"); // empty opcode
#endif
// Remove invite from player // Remove invite from player
_player->SetArenaTeamIdInvited(0); _player->SetArenaTeamIdInvited(0);
@@ -190,7 +208,9 @@ void WorldSession::HandleArenaTeamDeclineOpcode(WorldPacket & /*recvData*/)
void WorldSession::HandleArenaTeamLeaveOpcode(WorldPacket & recvData) void WorldSession::HandleArenaTeamLeaveOpcode(WorldPacket & recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_ARENA_TEAM_LEAVE"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_ARENA_TEAM_LEAVE");
#endif
uint32 arenaTeamId; uint32 arenaTeamId;
recvData >> arenaTeamId; recvData >> arenaTeamId;
@@ -232,7 +252,9 @@ void WorldSession::HandleArenaTeamLeaveOpcode(WorldPacket & recvData)
void WorldSession::HandleArenaTeamDisbandOpcode(WorldPacket & recvData) void WorldSession::HandleArenaTeamDisbandOpcode(WorldPacket & recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_ARENA_TEAM_DISBAND"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_ARENA_TEAM_DISBAND");
#endif
uint32 arenaTeamId; uint32 arenaTeamId;
recvData >> arenaTeamId; recvData >> arenaTeamId;
@@ -254,7 +276,9 @@ void WorldSession::HandleArenaTeamDisbandOpcode(WorldPacket & recvData)
void WorldSession::HandleArenaTeamRemoveOpcode(WorldPacket & recvData) void WorldSession::HandleArenaTeamRemoveOpcode(WorldPacket & recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_ARENA_TEAM_REMOVE"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_ARENA_TEAM_REMOVE");
#endif
uint32 arenaTeamId; uint32 arenaTeamId;
std::string name; std::string name;
@@ -304,7 +328,9 @@ void WorldSession::HandleArenaTeamRemoveOpcode(WorldPacket & recvData)
void WorldSession::HandleArenaTeamLeaderOpcode(WorldPacket & recvData) void WorldSession::HandleArenaTeamLeaderOpcode(WorldPacket & recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_ARENA_TEAM_LEADER"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_ARENA_TEAM_LEADER");
#endif
uint32 arenaTeamId; uint32 arenaTeamId;
std::string name; std::string name;
src/game/Handlers/AuctionHouseHandler.cpp
+48 -16
View File
@@ -29,7 +29,9 @@ void WorldSession::HandleAuctionHelloOpcode(WorldPacket & recvData)
Creature* unit = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_AUCTIONEER); Creature* unit = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_AUCTIONEER);
if (!unit) if (!unit)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandleAuctionHelloOpcode - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(guid))); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandleAuctionHelloOpcode - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(guid)));
#endif
return; return;
} }
@@ -141,7 +143,9 @@ void WorldSession::HandleAuctionSellItem(WorldPacket & recvData)
if (bid > MAX_MONEY_AMOUNT || buyout > MAX_MONEY_AMOUNT) if (bid > MAX_MONEY_AMOUNT || buyout > MAX_MONEY_AMOUNT)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandleAuctionSellItem - Player %s (GUID %u) attempted to sell item with higher price than max gold amount.", _player->GetName().c_str(), _player->GetGUIDLow()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandleAuctionSellItem - Player %s (GUID %u) attempted to sell item with higher price than max gold amount.", _player->GetName().c_str(), _player->GetGUIDLow());
#endif
SendAuctionCommandResult(0, AUCTION_SELL_ITEM, ERR_AUCTION_DATABASE_ERROR); SendAuctionCommandResult(0, AUCTION_SELL_ITEM, ERR_AUCTION_DATABASE_ERROR);
return; return;
} }
@@ -149,14 +153,18 @@ void WorldSession::HandleAuctionSellItem(WorldPacket & recvData)
Creature* creature = GetPlayer()->GetNPCIfCanInteractWith(auctioneer, UNIT_NPC_FLAG_AUCTIONEER); Creature* creature = GetPlayer()->GetNPCIfCanInteractWith(auctioneer, UNIT_NPC_FLAG_AUCTIONEER);
if (!creature) if (!creature)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandleAuctionSellItem - Unit (GUID: %u) not found or you can't interact with him.", GUID_LOPART(auctioneer)); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandleAuctionSellItem - Unit (GUID: %u) not found or you can't interact with him.", GUID_LOPART(auctioneer));
#endif
return; return;
} }
AuctionHouseEntry const* auctionHouseEntry = AuctionHouseMgr::GetAuctionHouseEntry(creature->getFaction()); AuctionHouseEntry const* auctionHouseEntry = AuctionHouseMgr::GetAuctionHouseEntry(creature->getFaction());
if (!auctionHouseEntry) if (!auctionHouseEntry)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandleAuctionSellItem - Unit (GUID: %u) has wrong faction.", GUID_LOPART(auctioneer)); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandleAuctionSellItem - Unit (GUID: %u) has wrong faction.", GUID_LOPART(auctioneer));
#endif
return; return;
} }
@@ -274,7 +282,9 @@ void WorldSession::HandleAuctionSellItem(WorldPacket & recvData)
AH->deposit = deposit; AH->deposit = deposit;
AH->auctionHouseEntry = auctionHouseEntry; AH->auctionHouseEntry = auctionHouseEntry;
;//sLog->outDetail("CMSG_AUCTION_SELL_ITEM: Player %s (guid %d) is selling item %s entry %u (guid %d) to auctioneer %u with count %u with initial bid %u with buyout %u and with time %u (in sec) in auctionhouse %u", _player->GetName().c_str(), _player->GetGUIDLow(), item->GetTemplate()->Name1.c_str(), item->GetEntry(), item->GetGUIDLow(), AH->auctioneer, item->GetCount(), bid, buyout, auctionTime, AH->GetHouseId()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("CMSG_AUCTION_SELL_ITEM: Player %s (guid %d) is selling item %s entry %u (guid %d) to auctioneer %u with count %u with initial bid %u with buyout %u and with time %u (in sec) in auctionhouse %u", _player->GetName().c_str(), _player->GetGUIDLow(), item->GetTemplate()->Name1.c_str(), item->GetEntry(), item->GetGUIDLow(), AH->auctioneer, item->GetCount(), bid, buyout, auctionTime, AH->GetHouseId());
#endif
sAuctionMgr->AddAItem(item); sAuctionMgr->AddAItem(item);
auctionHouse->AddAuction(AH); auctionHouse->AddAuction(AH);
@@ -314,7 +324,9 @@ void WorldSession::HandleAuctionSellItem(WorldPacket & recvData)
AH->deposit = deposit; AH->deposit = deposit;
AH->auctionHouseEntry = auctionHouseEntry; AH->auctionHouseEntry = auctionHouseEntry;
;//sLog->outDetail("CMSG_AUCTION_SELL_ITEM: Player %s (guid %d) is selling item %s entry %u (guid %d) to auctioneer %u with count %u with initial bid %u with buyout %u and with time %u (in sec) in auctionhouse %u", _player->GetName().c_str(), _player->GetGUIDLow(), newItem->GetTemplate()->Name1.c_str(), newItem->GetEntry(), newItem->GetGUIDLow(), AH->auctioneer, newItem->GetCount(), bid, buyout, auctionTime, AH->GetHouseId()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("CMSG_AUCTION_SELL_ITEM: Player %s (guid %d) is selling item %s entry %u (guid %d) to auctioneer %u with count %u with initial bid %u with buyout %u and with time %u (in sec) in auctionhouse %u", _player->GetName().c_str(), _player->GetGUIDLow(), newItem->GetTemplate()->Name1.c_str(), newItem->GetEntry(), newItem->GetGUIDLow(), AH->auctioneer, newItem->GetCount(), bid, buyout, auctionTime, AH->GetHouseId());
#endif
sAuctionMgr->AddAItem(newItem); sAuctionMgr->AddAItem(newItem);
auctionHouse->AddAuction(AH); auctionHouse->AddAuction(AH);
@@ -363,7 +375,9 @@ void WorldSession::HandleAuctionSellItem(WorldPacket & recvData)
//this function is called when client bids or buys out auction //this function is called when client bids or buys out auction
void WorldSession::HandleAuctionPlaceBid(WorldPacket & recvData) void WorldSession::HandleAuctionPlaceBid(WorldPacket & recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_AUCTION_PLACE_BID"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_AUCTION_PLACE_BID");
#endif
uint64 auctioneer; uint64 auctioneer;
uint32 auctionId; uint32 auctionId;
@@ -377,7 +391,9 @@ void WorldSession::HandleAuctionPlaceBid(WorldPacket & recvData)
Creature* creature = GetPlayer()->GetNPCIfCanInteractWith(auctioneer, UNIT_NPC_FLAG_AUCTIONEER); Creature* creature = GetPlayer()->GetNPCIfCanInteractWith(auctioneer, UNIT_NPC_FLAG_AUCTIONEER);
if (!creature) if (!creature)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandleAuctionPlaceBid - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(auctioneer))); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandleAuctionPlaceBid - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(auctioneer)));
#endif
return; return;
} }
@@ -489,7 +505,9 @@ void WorldSession::HandleAuctionPlaceBid(WorldPacket & recvData)
//this void is called when auction_owner cancels his auction //this void is called when auction_owner cancels his auction
void WorldSession::HandleAuctionRemoveItem(WorldPacket & recvData) void WorldSession::HandleAuctionRemoveItem(WorldPacket & recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_AUCTION_REMOVE_ITEM"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_AUCTION_REMOVE_ITEM");
#endif
uint64 auctioneer; uint64 auctioneer;
uint32 auctionId; uint32 auctionId;
@@ -500,7 +518,9 @@ void WorldSession::HandleAuctionRemoveItem(WorldPacket & recvData)
Creature* creature = GetPlayer()->GetNPCIfCanInteractWith(auctioneer, UNIT_NPC_FLAG_AUCTIONEER); Creature* creature = GetPlayer()->GetNPCIfCanInteractWith(auctioneer, UNIT_NPC_FLAG_AUCTIONEER);
if (!creature) if (!creature)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandleAuctionRemoveItem - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(auctioneer))); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandleAuctionRemoveItem - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(auctioneer)));
#endif
return; return;
} }
@@ -566,7 +586,9 @@ void WorldSession::HandleAuctionRemoveItem(WorldPacket & recvData)
//called when player lists his bids //called when player lists his bids
void WorldSession::HandleAuctionListBidderItems(WorldPacket & recvData) void WorldSession::HandleAuctionListBidderItems(WorldPacket & recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_AUCTION_LIST_BIDDER_ITEMS"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_AUCTION_LIST_BIDDER_ITEMS");
#endif
uint64 guid; //NPC guid uint64 guid; //NPC guid
uint32 listfrom; //page of auctions uint32 listfrom; //page of auctions
@@ -584,7 +606,9 @@ void WorldSession::HandleAuctionListBidderItems(WorldPacket & recvData)
Creature* creature = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_AUCTIONEER); Creature* creature = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_AUCTIONEER);
if (!creature) if (!creature)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandleAuctionListBidderItems - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(guid))); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandleAuctionListBidderItems - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(guid)));
#endif
recvData.rfinish(); recvData.rfinish();
return; return;
} }
@@ -638,7 +662,9 @@ void WorldSession::HandleAuctionListOwnerItems(WorldPacket & recvData)
void WorldSession::HandleAuctionListOwnerItemsEvent(WorldPacket & recvData) void WorldSession::HandleAuctionListOwnerItemsEvent(WorldPacket & recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_AUCTION_LIST_OWNER_ITEMS"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_AUCTION_LIST_OWNER_ITEMS");
#endif
_lastAuctionListOwnerItemsMSTime = World::GetGameTimeMS(); // pussywizard _lastAuctionListOwnerItemsMSTime = World::GetGameTimeMS(); // pussywizard
@@ -651,7 +677,9 @@ void WorldSession::HandleAuctionListOwnerItemsEvent(WorldPacket & recvData)
Creature* creature = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_AUCTIONEER); Creature* creature = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_AUCTIONEER);
if (!creature) if (!creature)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandleAuctionListOwnerItems - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(guid))); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandleAuctionListOwnerItems - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(guid)));
#endif
return; return;
} }
@@ -677,7 +705,9 @@ void WorldSession::HandleAuctionListOwnerItemsEvent(WorldPacket & recvData)
//this void is called when player clicks on search button //this void is called when player clicks on search button
void WorldSession::HandleAuctionListItems(WorldPacket & recvData) void WorldSession::HandleAuctionListItems(WorldPacket & recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_AUCTION_LIST_ITEMS"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_AUCTION_LIST_ITEMS");
#endif
std::string searchedname; std::string searchedname;
uint8 levelmin, levelmax, usable; uint8 levelmin, levelmax, usable;
@@ -722,7 +752,9 @@ void WorldSession::HandleAuctionListItems(WorldPacket & recvData)
void WorldSession::HandleAuctionListPendingSales(WorldPacket & recvData) void WorldSession::HandleAuctionListPendingSales(WorldPacket & recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_AUCTION_LIST_PENDING_SALES"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_AUCTION_LIST_PENDING_SALES");
#endif
recvData.read_skip<uint64>(); recvData.read_skip<uint64>();
src/game/Handlers/BattleGroundHandler.cpp
+24 -8
View File
@@ -28,7 +28,9 @@ void WorldSession::HandleBattlemasterHelloOpcode(WorldPacket & recvData)
{ {
uint64 guid; uint64 guid;
recvData >> guid; recvData >> guid;
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Recvd CMSG_BATTLEMASTER_HELLO Message from (GUID: %u TypeId:%u)", GUID_LOPART(guid), GuidHigh2TypeId(GUID_HIPART(guid))); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Recvd CMSG_BATTLEMASTER_HELLO Message from (GUID: %u TypeId:%u)", GUID_LOPART(guid), GuidHigh2TypeId(GUID_HIPART(guid)));
#endif
Creature* unit = GetPlayer()->GetMap()->GetCreature(guid); Creature* unit = GetPlayer()->GetMap()->GetCreature(guid);
if (!unit) if (!unit)
@@ -256,7 +258,9 @@ void WorldSession::HandleBattlemasterJoinOpcode(WorldPacket & recvData)
void WorldSession::HandleBattlegroundPlayerPositionsOpcode(WorldPacket& /*recvData*/) void WorldSession::HandleBattlegroundPlayerPositionsOpcode(WorldPacket& /*recvData*/)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Recvd MSG_BATTLEGROUND_PLAYER_POSITIONS Message"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Recvd MSG_BATTLEGROUND_PLAYER_POSITIONS Message");
#endif
Battleground* bg = _player->GetBattleground(); Battleground* bg = _player->GetBattleground();
if (!bg) // can't be received if player not in battleground if (!bg) // can't be received if player not in battleground
@@ -307,7 +311,9 @@ void WorldSession::HandleBattlegroundPlayerPositionsOpcode(WorldPacket& /*recvDa
void WorldSession::HandlePVPLogDataOpcode(WorldPacket & /*recvData*/) void WorldSession::HandlePVPLogDataOpcode(WorldPacket & /*recvData*/)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Recvd MSG_PVP_LOG_DATA Message"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Recvd MSG_PVP_LOG_DATA Message");
#endif
Battleground* bg = _player->GetBattleground(); Battleground* bg = _player->GetBattleground();
if (!bg) if (!bg)
@@ -321,12 +327,16 @@ void WorldSession::HandlePVPLogDataOpcode(WorldPacket & /*recvData*/)
sBattlegroundMgr->BuildPvpLogDataPacket(&data, bg); sBattlegroundMgr->BuildPvpLogDataPacket(&data, bg);
SendPacket(&data); SendPacket(&data);
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Sent MSG_PVP_LOG_DATA Message"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Sent MSG_PVP_LOG_DATA Message");
#endif
} }
void WorldSession::HandleBattlefieldListOpcode(WorldPacket &recvData) void WorldSession::HandleBattlefieldListOpcode(WorldPacket &recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Recvd CMSG_BATTLEFIELD_LIST Message"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Recvd CMSG_BATTLEFIELD_LIST Message");
#endif
uint32 bgTypeId; uint32 bgTypeId;
recvData >> bgTypeId; // id from DBC recvData >> bgTypeId; // id from DBC
@@ -469,7 +479,9 @@ void WorldSession::HandleBattleFieldPortOpcode(WorldPacket &recvData)
void WorldSession::HandleBattlefieldLeaveOpcode(WorldPacket& recvData) void WorldSession::HandleBattlefieldLeaveOpcode(WorldPacket& recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Recvd CMSG_LEAVE_BATTLEFIELD Message"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Recvd CMSG_LEAVE_BATTLEFIELD Message");
#endif
recvData.read_skip<uint8>(); // unk1 recvData.read_skip<uint8>(); // unk1
recvData.read_skip<uint8>(); // unk2 recvData.read_skip<uint8>(); // unk2
@@ -772,11 +784,15 @@ void WorldSession::HandleReportPvPAFK(WorldPacket & recvData)
if (!reportedPlayer) if (!reportedPlayer)
{ {
;//sLog->outDebug(LOG_FILTER_BATTLEGROUND, "WorldSession::HandleReportPvPAFK: player not found"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_BATTLEGROUND, "WorldSession::HandleReportPvPAFK: player not found");
#endif
return; return;
} }
;//sLog->outDebug(LOG_FILTER_BATTLEGROUND, "WorldSession::HandleReportPvPAFK: %s reported %s", _player->GetName().c_str(), reportedPlayer->GetName().c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_BATTLEGROUND, "WorldSession::HandleReportPvPAFK: %s reported %s", _player->GetName().c_str(), reportedPlayer->GetName().c_str());
#endif
reportedPlayer->ReportedAfkBy(_player); reportedPlayer->ReportedAfkBy(_player);
} }
src/game/Handlers/ChannelHandler.cpp
+48 -16
View File
@@ -18,7 +18,9 @@ void WorldSession::HandleJoinChannel(WorldPacket& recvPacket)
recvPacket >> channelId >> unknown1 >> unknown2 >> channelName >> password; recvPacket >> channelId >> unknown1 >> unknown2 >> channelName >> password;
;//sLog->outDebug(LOG_FILTER_CHATSYS, "CMSG_JOIN_CHANNEL %s Channel: %u, unk1: %u, unk2: %u, channel: %s, password: %s", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_CHATSYS, "CMSG_JOIN_CHANNEL %s Channel: %u, unk1: %u, unk2: %u, channel: %s, password: %s",
#endif
// GetPlayerInfo().c_str(), channelId, unknown1, unknown2, channelName.c_str(), password.c_str()); // GetPlayerInfo().c_str(), channelId, unknown1, unknown2, channelName.c_str(), password.c_str());
if (channelId) if (channelId)
@@ -56,7 +58,9 @@ void WorldSession::HandleLeaveChannel(WorldPacket& recvPacket)
std::string channelName; std::string channelName;
recvPacket >> unk >> channelName; recvPacket >> unk >> channelName;
;//sLog->outDebug(LOG_FILTER_CHATSYS, "CMSG_LEAVE_CHANNEL %s Channel: %s, unk1: %u", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_CHATSYS, "CMSG_LEAVE_CHANNEL %s Channel: %s, unk1: %u",
#endif
// GetPlayerInfo().c_str(), channelName.c_str(), unk); // GetPlayerInfo().c_str(), channelName.c_str(), unk);
if (channelName.empty()) if (channelName.empty())
@@ -74,7 +78,9 @@ void WorldSession::HandleChannelList(WorldPacket& recvPacket)
std::string channelName; std::string channelName;
recvPacket >> channelName; recvPacket >> channelName;
;//sLog->outDebug(LOG_FILTER_CHATSYS, "%s %s Channel: %s", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_CHATSYS, "%s %s Channel: %s",
#endif
// recvPacket.GetOpcode() == CMSG_CHANNEL_DISPLAY_LIST ? "CMSG_CHANNEL_DISPLAY_LIST" : "CMSG_CHANNEL_LIST", // recvPacket.GetOpcode() == CMSG_CHANNEL_DISPLAY_LIST ? "CMSG_CHANNEL_DISPLAY_LIST" : "CMSG_CHANNEL_LIST",
// GetPlayerInfo().c_str(), channelName.c_str()); // GetPlayerInfo().c_str(), channelName.c_str());
@@ -88,7 +94,9 @@ void WorldSession::HandleChannelPassword(WorldPacket& recvPacket)
std::string channelName, password; std::string channelName, password;
recvPacket >> channelName >> password; recvPacket >> channelName >> password;
;//sLog->outDebug(LOG_FILTER_CHATSYS, "CMSG_CHANNEL_PASSWORD %s Channel: %s, Password: %s", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_CHATSYS, "CMSG_CHANNEL_PASSWORD %s Channel: %s, Password: %s",
#endif
// GetPlayerInfo().c_str(), channelName.c_str(), password.c_str()); // GetPlayerInfo().c_str(), channelName.c_str(), password.c_str());
if (password.length() > MAX_CHANNEL_PASS_STR) if (password.length() > MAX_CHANNEL_PASS_STR)
@@ -104,7 +112,9 @@ void WorldSession::HandleChannelSetOwner(WorldPacket& recvPacket)
std::string channelName, targetName; std::string channelName, targetName;
recvPacket >> channelName >> targetName; recvPacket >> channelName >> targetName;
;//sLog->outDebug(LOG_FILTER_CHATSYS, "CMSG_CHANNEL_SET_OWNER %s Channel: %s, Target: %s", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_CHATSYS, "CMSG_CHANNEL_SET_OWNER %s Channel: %s, Target: %s",
#endif
// GetPlayerInfo().c_str(), channelName.c_str(), targetName.c_str()); // GetPlayerInfo().c_str(), channelName.c_str(), targetName.c_str());
if (!normalizePlayerName(targetName)) if (!normalizePlayerName(targetName))
@@ -120,7 +130,9 @@ void WorldSession::HandleChannelOwner(WorldPacket& recvPacket)
std::string channelName; std::string channelName;
recvPacket >> channelName; recvPacket >> channelName;
;//sLog->outDebug(LOG_FILTER_CHATSYS, "CMSG_CHANNEL_OWNER %s Channel: %s", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_CHATSYS, "CMSG_CHANNEL_OWNER %s Channel: %s",
#endif
// GetPlayerInfo().c_str(), channelName.c_str()); // GetPlayerInfo().c_str(), channelName.c_str());
if (ChannelMgr* cMgr = ChannelMgr::forTeam(GetPlayer()->GetTeamId())) if (ChannelMgr* cMgr = ChannelMgr::forTeam(GetPlayer()->GetTeamId()))
@@ -133,7 +145,9 @@ void WorldSession::HandleChannelModerator(WorldPacket& recvPacket)
std::string channelName, targetName; std::string channelName, targetName;
recvPacket >> channelName >> targetName; recvPacket >> channelName >> targetName;
;//sLog->outDebug(LOG_FILTER_CHATSYS, "CMSG_CHANNEL_MODERATOR %s Channel: %s, Target: %s", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_CHATSYS, "CMSG_CHANNEL_MODERATOR %s Channel: %s, Target: %s",
#endif
// GetPlayerInfo().c_str(), channelName.c_str(), targetName.c_str()); // GetPlayerInfo().c_str(), channelName.c_str(), targetName.c_str());
if (!normalizePlayerName(targetName)) if (!normalizePlayerName(targetName))
@@ -149,7 +163,9 @@ void WorldSession::HandleChannelUnmoderator(WorldPacket& recvPacket)
std::string channelName, targetName; std::string channelName, targetName;
recvPacket >> channelName >> targetName; recvPacket >> channelName >> targetName;
;//sLog->outDebug(LOG_FILTER_CHATSYS, "CMSG_CHANNEL_UNMODERATOR %s Channel: %s, Target: %s", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_CHATSYS, "CMSG_CHANNEL_UNMODERATOR %s Channel: %s, Target: %s",
#endif
// GetPlayerInfo().c_str(), channelName.c_str(), targetName.c_str()); // GetPlayerInfo().c_str(), channelName.c_str(), targetName.c_str());
if (!normalizePlayerName(targetName)) if (!normalizePlayerName(targetName))
@@ -165,7 +181,9 @@ void WorldSession::HandleChannelMute(WorldPacket& recvPacket)
std::string channelName, targetName; std::string channelName, targetName;
recvPacket >> channelName >> targetName; recvPacket >> channelName >> targetName;
;//sLog->outDebug(LOG_FILTER_CHATSYS, "CMSG_CHANNEL_MUTE %s Channel: %s, Target: %s", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_CHATSYS, "CMSG_CHANNEL_MUTE %s Channel: %s, Target: %s",
#endif
// GetPlayerInfo().c_str(), channelName.c_str(), targetName.c_str()); // GetPlayerInfo().c_str(), channelName.c_str(), targetName.c_str());
if (!normalizePlayerName(targetName)) if (!normalizePlayerName(targetName))
@@ -181,7 +199,9 @@ void WorldSession::HandleChannelUnmute(WorldPacket& recvPacket)
std::string channelName, targetName; std::string channelName, targetName;
recvPacket >> channelName >> targetName; recvPacket >> channelName >> targetName;
;//sLog->outDebug(LOG_FILTER_CHATSYS, "CMSG_CHANNEL_UNMUTE %s Channel: %s, Target: %s", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_CHATSYS, "CMSG_CHANNEL_UNMUTE %s Channel: %s, Target: %s",
#endif
// GetPlayerInfo().c_str(), channelName.c_str(), targetName.c_str()); // GetPlayerInfo().c_str(), channelName.c_str(), targetName.c_str());
if (!normalizePlayerName(targetName)) if (!normalizePlayerName(targetName))
@@ -197,7 +217,9 @@ void WorldSession::HandleChannelInvite(WorldPacket& recvPacket)
std::string channelName, targetName; std::string channelName, targetName;
recvPacket >> channelName >> targetName; recvPacket >> channelName >> targetName;
;//sLog->outDebug(LOG_FILTER_CHATSYS, "CMSG_CHANNEL_INVITE %s Channel: %s, Target: %s", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_CHATSYS, "CMSG_CHANNEL_INVITE %s Channel: %s, Target: %s",
#endif
// GetPlayerInfo().c_str(), channelName.c_str(), targetName.c_str()); // GetPlayerInfo().c_str(), channelName.c_str(), targetName.c_str());
if (!normalizePlayerName(targetName)) if (!normalizePlayerName(targetName))
@@ -213,7 +235,9 @@ void WorldSession::HandleChannelKick(WorldPacket& recvPacket)
std::string channelName, targetName; std::string channelName, targetName;
recvPacket >> channelName >> targetName; recvPacket >> channelName >> targetName;
;//sLog->outDebug(LOG_FILTER_CHATSYS, "CMSG_CHANNEL_KICK %s Channel: %s, Target: %s", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_CHATSYS, "CMSG_CHANNEL_KICK %s Channel: %s, Target: %s",
#endif
// GetPlayerInfo().c_str(), channelName.c_str(), targetName.c_str()); // GetPlayerInfo().c_str(), channelName.c_str(), targetName.c_str());
if (!normalizePlayerName(targetName)) if (!normalizePlayerName(targetName))
@@ -229,7 +253,9 @@ void WorldSession::HandleChannelBan(WorldPacket& recvPacket)
std::string channelName, targetName; std::string channelName, targetName;
recvPacket >> channelName >> targetName; recvPacket >> channelName >> targetName;
;//sLog->outDebug(LOG_FILTER_CHATSYS, "CMSG_CHANNEL_BAN %s Channel: %s, Target: %s", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_CHATSYS, "CMSG_CHANNEL_BAN %s Channel: %s, Target: %s",
#endif
// GetPlayerInfo().c_str(), channelName.c_str(), targetName.c_str()); // GetPlayerInfo().c_str(), channelName.c_str(), targetName.c_str());
if (!normalizePlayerName(targetName)) if (!normalizePlayerName(targetName))
@@ -245,7 +271,9 @@ void WorldSession::HandleChannelUnban(WorldPacket& recvPacket)
std::string channelName, targetName; std::string channelName, targetName;
recvPacket >> channelName >> targetName; recvPacket >> channelName >> targetName;
;//sLog->outDebug(LOG_FILTER_CHATSYS, "CMSG_CHANNEL_UNBAN %s Channel: %s, Target: %s", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_CHATSYS, "CMSG_CHANNEL_UNBAN %s Channel: %s, Target: %s",
#endif
// GetPlayerInfo().c_str(), channelName.c_str(), targetName.c_str()); // GetPlayerInfo().c_str(), channelName.c_str(), targetName.c_str());
if (!normalizePlayerName(targetName)) if (!normalizePlayerName(targetName))
@@ -261,7 +289,9 @@ void WorldSession::HandleChannelAnnouncements(WorldPacket& recvPacket)
std::string channelName; std::string channelName;
recvPacket >> channelName; recvPacket >> channelName;
;//sLog->outDebug(LOG_FILTER_CHATSYS, "CMSG_CHANNEL_ANNOUNCEMENTS %s Channel: %s", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_CHATSYS, "CMSG_CHANNEL_ANNOUNCEMENTS %s Channel: %s",
#endif
// GetPlayerInfo().c_str(), channelName.c_str()); // GetPlayerInfo().c_str(), channelName.c_str());
if (ChannelMgr* cMgr = ChannelMgr::forTeam(GetPlayer()->GetTeamId())) if (ChannelMgr* cMgr = ChannelMgr::forTeam(GetPlayer()->GetTeamId()))
@@ -280,7 +310,9 @@ void WorldSession::HandleGetChannelMemberCount(WorldPacket &recvPacket)
std::string channelName; std::string channelName;
recvPacket >> channelName; recvPacket >> channelName;
;//sLog->outDebug(LOG_FILTER_CHATSYS, "CMSG_GET_CHANNEL_MEMBER_COUNT %s Channel: %s", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_CHATSYS, "CMSG_GET_CHANNEL_MEMBER_COUNT %s Channel: %s",
#endif
// GetPlayerInfo().c_str(), channelName.c_str()); // GetPlayerInfo().c_str(), channelName.c_str());
if (ChannelMgr* cMgr = ChannelMgr::forTeam(GetPlayer()->GetTeamId())) if (ChannelMgr* cMgr = ChannelMgr::forTeam(GetPlayer()->GetTeamId()))
src/game/Handlers/CharacterHandler.cpp
+57 -19
View File
@@ -204,7 +204,9 @@ void WorldSession::HandleCharEnum(PreparedQueryResult result)
do do
{ {
uint32 guidlow = (*result)[0].GetUInt32(); uint32 guidlow = (*result)[0].GetUInt32();
;//sLog->outDetail("Loading char guid %u from account %u.", guidlow, GetAccountId()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("Loading char guid %u from account %u.", guidlow, GetAccountId());
#endif
if (Player::BuildEnumData(result, &data)) if (Player::BuildEnumData(result, &data))
{ {
_legitCharacters.insert(guidlow); _legitCharacters.insert(guidlow);
@@ -593,7 +595,9 @@ void WorldSession::HandleCharCreateCallback(PreparedQueryResult result, Characte
{ {
uint8 unk; uint8 unk;
createInfo->Data >> unk; createInfo->Data >> unk;
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "Character creation %s (account %u) has unhandled tail data: [%u]", createInfo->Name.c_str(), GetAccountId(), unk); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "Character creation %s (account %u) has unhandled tail data: [%u]", createInfo->Name.c_str(), GetAccountId(), unk);
#endif
} }
// pussywizard: // pussywizard:
@@ -651,7 +655,9 @@ void WorldSession::HandleCharCreateCallback(PreparedQueryResult result, Characte
SendPacket(&data); SendPacket(&data);
std::string IP_str = GetRemoteAddress(); std::string IP_str = GetRemoteAddress();
;//sLog->outDetail("Account: %d (IP: %s) Create Character:[%s] (GUID: %u)", GetAccountId(), IP_str.c_str(), createInfo->Name.c_str(), newChar.GetGUIDLow()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("Account: %d (IP: %s) Create Character:[%s] (GUID: %u)", GetAccountId(), IP_str.c_str(), createInfo->Name.c_str(), newChar.GetGUIDLow());
#endif
sLog->outChar("Account: %d (IP: %s) Create Character:[%s] (GUID: %u)", GetAccountId(), IP_str.c_str(), createInfo->Name.c_str(), newChar.GetGUIDLow()); sLog->outChar("Account: %d (IP: %s) Create Character:[%s] (GUID: %u)", GetAccountId(), IP_str.c_str(), createInfo->Name.c_str(), newChar.GetGUIDLow());
sScriptMgr->OnPlayerCreate(&newChar); sScriptMgr->OnPlayerCreate(&newChar);
sWorld->AddGlobalPlayerData(newChar.GetGUIDLow(), GetAccountId(), newChar.GetName(), newChar.getGender(), newChar.getRace(), newChar.getClass(), newChar.getLevel(), 0, 0); sWorld->AddGlobalPlayerData(newChar.GetGUIDLow(), GetAccountId(), newChar.GetName(), newChar.getGender(), newChar.getRace(), newChar.getClass(), newChar.getLevel(), 0, 0);
@@ -710,7 +716,9 @@ void WorldSession::HandleCharDeleteOpcode(WorldPacket& recvData)
return; return;
std::string IP_str = GetRemoteAddress(); std::string IP_str = GetRemoteAddress();
;//sLog->outDetail("Account: %d (IP: %s) Delete Character:[%s] (GUID: %u)", GetAccountId(), IP_str.c_str(), name.c_str(), GUID_LOPART(guid)); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("Account: %d (IP: %s) Delete Character:[%s] (GUID: %u)", GetAccountId(), IP_str.c_str(), name.c_str(), GUID_LOPART(guid));
#endif
sLog->outChar("Account: %d (IP: %s) Delete Character:[%s] (GUID: %u)", GetAccountId(), IP_str.c_str(), name.c_str(), GUID_LOPART(guid)); sLog->outChar("Account: %d (IP: %s) Delete Character:[%s] (GUID: %u)", GetAccountId(), IP_str.c_str(), name.c_str(), GUID_LOPART(guid));
sScriptMgr->OnPlayerDelete(guid); sScriptMgr->OnPlayerDelete(guid);
@@ -916,13 +924,17 @@ void WorldSession::HandlePlayerLoginFromDB(LoginQueryHolder* holder)
data.put(0, linecount); data.put(0, linecount);
SendPacket(&data); SendPacket(&data);
;//sLog->outStaticDebug("WORLD: Sent motd (SMSG_MOTD)"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug("WORLD: Sent motd (SMSG_MOTD)");
#endif
// send server info // send server info
if (sWorld->getIntConfig(CONFIG_ENABLE_SINFO_LOGIN) == 1) if (sWorld->getIntConfig(CONFIG_ENABLE_SINFO_LOGIN) == 1)
chH.PSendSysMessage(_FULLVERSION); chH.PSendSysMessage(_FULLVERSION);
;//sLog->outStaticDebug("WORLD: Sent server info"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug("WORLD: Sent server info");
#endif
} }
if (uint32 guildId = Player::GetGuildIdFromStorage(pCurrChar->GetGUIDLow())) if (uint32 guildId = Player::GetGuildIdFromStorage(pCurrChar->GetGUIDLow()))
@@ -1214,13 +1226,17 @@ void WorldSession::HandlePlayerLoginToCharInWorld(Player* pCurrChar)
data.put(0, linecount); data.put(0, linecount);
SendPacket(&data); SendPacket(&data);
;//sLog->outStaticDebug("WORLD: Sent motd (SMSG_MOTD)"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug("WORLD: Sent motd (SMSG_MOTD)");
#endif
// send server info // send server info
if (sWorld->getIntConfig(CONFIG_ENABLE_SINFO_LOGIN) == 1) if (sWorld->getIntConfig(CONFIG_ENABLE_SINFO_LOGIN) == 1)
chH.PSendSysMessage(_FULLVERSION); chH.PSendSysMessage(_FULLVERSION);
;//sLog->outStaticDebug("WORLD: Sent server info"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug("WORLD: Sent server info");
#endif
} }
data.Initialize(SMSG_LEARNED_DANCE_MOVES, 4+4); data.Initialize(SMSG_LEARNED_DANCE_MOVES, 4+4);
@@ -1319,7 +1335,9 @@ void WorldSession::HandlePlayerLoginToCharOutOfWorld(Player* pCurrChar)
void WorldSession::HandleSetFactionAtWar(WorldPacket& recvData) void WorldSession::HandleSetFactionAtWar(WorldPacket& recvData)
{ {
;//sLog->outStaticDebug("WORLD: Received CMSG_SET_FACTION_ATWAR"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug("WORLD: Received CMSG_SET_FACTION_ATWAR");
#endif
uint32 repListID; uint32 repListID;
uint8 flag; uint8 flag;
@@ -1367,7 +1385,9 @@ void WorldSession::HandleTutorialReset(WorldPacket & /*recvData*/)
void WorldSession::HandleSetWatchedFactionOpcode(WorldPacket& recvData) void WorldSession::HandleSetWatchedFactionOpcode(WorldPacket& recvData)
{ {
;//sLog->outStaticDebug("WORLD: Received CMSG_SET_WATCHED_FACTION"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug("WORLD: Received CMSG_SET_WATCHED_FACTION");
#endif
uint32 fact; uint32 fact;
recvData >> fact; recvData >> fact;
GetPlayer()->SetUInt32Value(PLAYER_FIELD_WATCHED_FACTION_INDEX, fact); GetPlayer()->SetUInt32Value(PLAYER_FIELD_WATCHED_FACTION_INDEX, fact);
@@ -1375,7 +1395,9 @@ void WorldSession::HandleSetWatchedFactionOpcode(WorldPacket& recvData)
void WorldSession::HandleSetFactionInactiveOpcode(WorldPacket & recvData) void WorldSession::HandleSetFactionInactiveOpcode(WorldPacket & recvData)
{ {
;//sLog->outStaticDebug("WORLD: Received CMSG_SET_FACTION_INACTIVE"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug("WORLD: Received CMSG_SET_FACTION_INACTIVE");
#endif
uint32 replistid; uint32 replistid;
uint8 inactive; uint8 inactive;
recvData >> replistid >> inactive; recvData >> replistid >> inactive;
@@ -1385,14 +1407,18 @@ void WorldSession::HandleSetFactionInactiveOpcode(WorldPacket & recvData)
void WorldSession::HandleShowingHelmOpcode(WorldPacket& recvData) void WorldSession::HandleShowingHelmOpcode(WorldPacket& recvData)
{ {
;//sLog->outStaticDebug("CMSG_SHOWING_HELM for %s", _player->GetName().c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug("CMSG_SHOWING_HELM for %s", _player->GetName().c_str());
#endif
recvData.read_skip<uint8>(); // unknown, bool? recvData.read_skip<uint8>(); // unknown, bool?
_player->ToggleFlag(PLAYER_FLAGS, PLAYER_FLAGS_HIDE_HELM); _player->ToggleFlag(PLAYER_FLAGS, PLAYER_FLAGS_HIDE_HELM);
} }
void WorldSession::HandleShowingCloakOpcode(WorldPacket& recvData) void WorldSession::HandleShowingCloakOpcode(WorldPacket& recvData)
{ {
;//sLog->outStaticDebug("CMSG_SHOWING_CLOAK for %s", _player->GetName().c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug("CMSG_SHOWING_CLOAK for %s", _player->GetName().c_str());
#endif
recvData.read_skip<uint8>(); // unknown, bool? recvData.read_skip<uint8>(); // unknown, bool?
_player->ToggleFlag(PLAYER_FLAGS, PLAYER_FLAGS_HIDE_CLOAK); _player->ToggleFlag(PLAYER_FLAGS, PLAYER_FLAGS_HIDE_CLOAK);
} }
@@ -1610,7 +1636,9 @@ void WorldSession::HandleSetPlayerDeclinedNames(WorldPacket& recvData)
void WorldSession::HandleAlterAppearance(WorldPacket& recvData) void WorldSession::HandleAlterAppearance(WorldPacket& recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_ALTER_APPEARANCE"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_ALTER_APPEARANCE");
#endif
uint32 Hair, Color, FacialHair, SkinColor; uint32 Hair, Color, FacialHair, SkinColor;
recvData >> Hair >> Color >> FacialHair >> SkinColor; recvData >> Hair >> Color >> FacialHair >> SkinColor;
@@ -1687,7 +1715,9 @@ void WorldSession::HandleRemoveGlyph(WorldPacket& recvData)
if (slot >= MAX_GLYPH_SLOT_INDEX) if (slot >= MAX_GLYPH_SLOT_INDEX)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "Client sent wrong glyph slot number in opcode CMSG_REMOVE_GLYPH %u", slot); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "Client sent wrong glyph slot number in opcode CMSG_REMOVE_GLYPH %u", slot);
#endif
return; return;
} }
@@ -1847,7 +1877,9 @@ void WorldSession::HandleCharCustomize(WorldPacket& recvData)
void WorldSession::HandleEquipmentSetSave(WorldPacket &recvData) void WorldSession::HandleEquipmentSetSave(WorldPacket &recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_EQUIPMENT_SET_SAVE"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_EQUIPMENT_SET_SAVE");
#endif
uint64 setGuid; uint64 setGuid;
recvData.readPackGUID(setGuid); recvData.readPackGUID(setGuid);
@@ -1906,7 +1938,9 @@ void WorldSession::HandleEquipmentSetSave(WorldPacket &recvData)
void WorldSession::HandleEquipmentSetDelete(WorldPacket &recvData) void WorldSession::HandleEquipmentSetDelete(WorldPacket &recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_EQUIPMENT_SET_DELETE"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_EQUIPMENT_SET_DELETE");
#endif
uint64 setGuid; uint64 setGuid;
recvData.readPackGUID(setGuid); recvData.readPackGUID(setGuid);
@@ -1916,7 +1950,9 @@ void WorldSession::HandleEquipmentSetDelete(WorldPacket &recvData)
void WorldSession::HandleEquipmentSetUse(WorldPacket &recvData) void WorldSession::HandleEquipmentSetUse(WorldPacket &recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_EQUIPMENT_SET_USE"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_EQUIPMENT_SET_USE");
#endif
for (uint32 i = 0; i < EQUIPMENT_SLOT_END; ++i) for (uint32 i = 0; i < EQUIPMENT_SLOT_END; ++i)
{ {
@@ -1926,7 +1962,9 @@ void WorldSession::HandleEquipmentSetUse(WorldPacket &recvData)
uint8 srcbag, srcslot; uint8 srcbag, srcslot;
recvData >> srcbag >> srcslot; recvData >> srcbag >> srcslot;
;//sLog->outDebug(LOG_FILTER_PLAYER_ITEMS, "Item " UI64FMTD ": srcbag %u, srcslot %u", itemGuid, srcbag, srcslot); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_PLAYER_ITEMS, "Item " UI64FMTD ": srcbag %u, srcslot %u", itemGuid, srcbag, srcslot);
#endif
// check if item slot is set to "ignored" (raw value == 1), must not be unequipped then // check if item slot is set to "ignored" (raw value == 1), must not be unequipped then
if (itemGuid == 1) if (itemGuid == 1)
src/game/Handlers/ChatHandler.cpp
+3 -1
View File
@@ -699,7 +699,9 @@ void WorldSession::HandleChatIgnoredOpcode(WorldPacket& recvData)
void WorldSession::HandleChannelDeclineInvite(WorldPacket &recvPacket) void WorldSession::HandleChannelDeclineInvite(WorldPacket &recvPacket)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "Opcode %u", recvPacket.GetOpcode()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "Opcode %u", recvPacket.GetOpcode());
#endif
} }
void WorldSession::SendPlayerNotFoundNotice(std::string const& name) void WorldSession::SendPlayerNotFoundNotice(std::string const& name)
src/game/Handlers/CombatHandler.cpp
+3 -1
View File
@@ -21,7 +21,9 @@ void WorldSession::HandleAttackSwingOpcode(WorldPacket& recvData)
uint64 guid; uint64 guid;
recvData >> guid; recvData >> guid;
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Recvd CMSG_ATTACKSWING Message guidlow:%u guidhigh:%u", GUID_LOPART(guid), GUID_HIPART(guid)); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Recvd CMSG_ATTACKSWING Message guidlow:%u guidhigh:%u", GUID_LOPART(guid), GUID_HIPART(guid));
#endif
Unit* pEnemy = ObjectAccessor::GetUnit(*_player, guid); Unit* pEnemy = ObjectAccessor::GetUnit(*_player, guid);
src/game/Handlers/DuelHandler.cpp
+9 -3
View File
@@ -30,8 +30,12 @@ void WorldSession::HandleDuelAcceptedOpcode(WorldPacket& recvPacket)
return; return;
//sLog->outDebug(LOG_FILTER_PACKETIO, "WORLD: Received CMSG_DUEL_ACCEPTED"); //sLog->outDebug(LOG_FILTER_PACKETIO, "WORLD: Received CMSG_DUEL_ACCEPTED");
;//sLog->outStaticDebug("Player 1 is: %u (%s)", player->GetGUIDLow(), player->GetName().c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
;//sLog->outStaticDebug("Player 2 is: %u (%s)", plTarget->GetGUIDLow(), plTarget->GetName().c_str()); sLog->outStaticDebug("Player 1 is: %u (%s)", player->GetGUIDLow(), player->GetName().c_str());
#endif
#ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug("Player 2 is: %u (%s)", plTarget->GetGUIDLow(), plTarget->GetName().c_str());
#endif
time_t now = time(NULL); time_t now = time(NULL);
player->duel->startTimer = now; player->duel->startTimer = now;
@@ -43,7 +47,9 @@ void WorldSession::HandleDuelAcceptedOpcode(WorldPacket& recvPacket)
void WorldSession::HandleDuelCancelledOpcode(WorldPacket& recvPacket) void WorldSession::HandleDuelCancelledOpcode(WorldPacket& recvPacket)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_DUEL_CANCELLED"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_DUEL_CANCELLED");
#endif
uint64 guid; uint64 guid;
recvPacket >> guid; recvPacket >> guid;
src/game/Handlers/GroupHandler.cpp
+54 -18
View File
@@ -47,7 +47,9 @@ void WorldSession::SendPartyResult(PartyOperation operation, const std::string&
void WorldSession::HandleGroupInviteOpcode(WorldPacket& recvData) void WorldSession::HandleGroupInviteOpcode(WorldPacket& recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_GROUP_INVITE"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_GROUP_INVITE");
#endif
std::string membername; std::string membername;
recvData >> membername; recvData >> membername;
@@ -196,7 +198,9 @@ void WorldSession::HandleGroupInviteOpcode(WorldPacket& recvData)
void WorldSession::HandleGroupAcceptOpcode(WorldPacket& recvData) void WorldSession::HandleGroupAcceptOpcode(WorldPacket& recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_GROUP_ACCEPT"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_GROUP_ACCEPT");
#endif
recvData.read_skip<uint32>(); recvData.read_skip<uint32>();
Group* group = GetPlayer()->GetGroupInvite(); Group* group = GetPlayer()->GetGroupInvite();
@@ -254,7 +258,9 @@ void WorldSession::HandleGroupAcceptOpcode(WorldPacket& recvData)
void WorldSession::HandleGroupDeclineOpcode(WorldPacket & /*recvData*/) void WorldSession::HandleGroupDeclineOpcode(WorldPacket & /*recvData*/)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_GROUP_DECLINE"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_GROUP_DECLINE");
#endif
Group* group = GetPlayer()->GetGroupInvite(); Group* group = GetPlayer()->GetGroupInvite();
if (!group) if (!group)
@@ -277,7 +283,9 @@ void WorldSession::HandleGroupDeclineOpcode(WorldPacket & /*recvData*/)
void WorldSession::HandleGroupUninviteGuidOpcode(WorldPacket& recvData) void WorldSession::HandleGroupUninviteGuidOpcode(WorldPacket& recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_GROUP_UNINVITE_GUID"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_GROUP_UNINVITE_GUID");
#endif
uint64 guid; uint64 guid;
std::string reason, name; std::string reason, name;
@@ -335,7 +343,9 @@ void WorldSession::HandleGroupUninviteGuidOpcode(WorldPacket& recvData)
void WorldSession::HandleGroupUninviteOpcode(WorldPacket& recvData) void WorldSession::HandleGroupUninviteOpcode(WorldPacket& recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_GROUP_UNINVITE"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_GROUP_UNINVITE");
#endif
std::string membername; std::string membername;
recvData >> membername; recvData >> membername;
@@ -379,7 +389,9 @@ void WorldSession::HandleGroupUninviteOpcode(WorldPacket& recvData)
void WorldSession::HandleGroupSetLeaderOpcode(WorldPacket& recvData) void WorldSession::HandleGroupSetLeaderOpcode(WorldPacket& recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_GROUP_SET_LEADER"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_GROUP_SET_LEADER");
#endif
uint64 guid; uint64 guid;
recvData >> guid; recvData >> guid;
@@ -400,7 +412,9 @@ void WorldSession::HandleGroupSetLeaderOpcode(WorldPacket& recvData)
void WorldSession::HandleGroupDisbandOpcode(WorldPacket & /*recvData*/) void WorldSession::HandleGroupDisbandOpcode(WorldPacket & /*recvData*/)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_GROUP_DISBAND"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_GROUP_DISBAND");
#endif
Group* grp = GetPlayer()->GetGroup(); Group* grp = GetPlayer()->GetGroup();
if (!grp) if (!grp)
@@ -423,7 +437,9 @@ void WorldSession::HandleGroupDisbandOpcode(WorldPacket & /*recvData*/)
void WorldSession::HandleLootMethodOpcode(WorldPacket& recvData) void WorldSession::HandleLootMethodOpcode(WorldPacket& recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_LOOT_METHOD"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_LOOT_METHOD");
#endif
uint32 lootMethod; uint32 lootMethod;
uint64 lootMaster; uint64 lootMaster;
@@ -484,7 +500,9 @@ void WorldSession::HandleLootRoll(WorldPacket& recvData)
void WorldSession::HandleMinimapPingOpcode(WorldPacket& recvData) void WorldSession::HandleMinimapPingOpcode(WorldPacket& recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received MSG_MINIMAP_PING"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received MSG_MINIMAP_PING");
#endif
if (!GetPlayer()->GetGroup()) if (!GetPlayer()->GetGroup())
return; return;
@@ -508,7 +526,9 @@ void WorldSession::HandleMinimapPingOpcode(WorldPacket& recvData)
void WorldSession::HandleRandomRollOpcode(WorldPacket& recvData) void WorldSession::HandleRandomRollOpcode(WorldPacket& recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received MSG_RANDOM_ROLL"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received MSG_RANDOM_ROLL");
#endif
uint32 minimum, maximum, roll; uint32 minimum, maximum, roll;
recvData >> minimum; recvData >> minimum;
@@ -537,7 +557,9 @@ void WorldSession::HandleRandomRollOpcode(WorldPacket& recvData)
void WorldSession::HandleRaidTargetUpdateOpcode(WorldPacket& recvData) void WorldSession::HandleRaidTargetUpdateOpcode(WorldPacket& recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received MSG_RAID_TARGET_UPDATE"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received MSG_RAID_TARGET_UPDATE");
#endif
Group* group = GetPlayer()->GetGroup(); Group* group = GetPlayer()->GetGroup();
if (!group) if (!group)
@@ -576,7 +598,9 @@ void WorldSession::HandleRaidTargetUpdateOpcode(WorldPacket& recvData)
void WorldSession::HandleGroupRaidConvertOpcode(WorldPacket & /*recvData*/) void WorldSession::HandleGroupRaidConvertOpcode(WorldPacket & /*recvData*/)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_GROUP_RAID_CONVERT"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_GROUP_RAID_CONVERT");
#endif
Group* group = GetPlayer()->GetGroup(); Group* group = GetPlayer()->GetGroup();
if (!group) if (!group)
@@ -597,7 +621,9 @@ void WorldSession::HandleGroupRaidConvertOpcode(WorldPacket & /*recvData*/)
void WorldSession::HandleGroupChangeSubGroupOpcode(WorldPacket& recvData) void WorldSession::HandleGroupChangeSubGroupOpcode(WorldPacket& recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_GROUP_CHANGE_SUB_GROUP"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_GROUP_CHANGE_SUB_GROUP");
#endif
// we will get correct pointer for group here, so we don't have to check if group is BG raid // we will get correct pointer for group here, so we don't have to check if group is BG raid
Group* group = GetPlayer()->GetGroup(); Group* group = GetPlayer()->GetGroup();
@@ -636,7 +662,9 @@ void WorldSession::HandleGroupChangeSubGroupOpcode(WorldPacket& recvData)
void WorldSession::HandleGroupAssistantLeaderOpcode(WorldPacket& recvData) void WorldSession::HandleGroupAssistantLeaderOpcode(WorldPacket& recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_GROUP_ASSISTANT_LEADER"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_GROUP_ASSISTANT_LEADER");
#endif
Group* group = GetPlayer()->GetGroup(); Group* group = GetPlayer()->GetGroup();
if (!group) if (!group)
@@ -657,7 +685,9 @@ void WorldSession::HandleGroupAssistantLeaderOpcode(WorldPacket& recvData)
void WorldSession::HandlePartyAssignmentOpcode(WorldPacket& recvData) void WorldSession::HandlePartyAssignmentOpcode(WorldPacket& recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received MSG_PARTY_ASSIGNMENT"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received MSG_PARTY_ASSIGNMENT");
#endif
Group* group = GetPlayer()->GetGroup(); Group* group = GetPlayer()->GetGroup();
if (!group) if (!group)
@@ -691,7 +721,9 @@ void WorldSession::HandlePartyAssignmentOpcode(WorldPacket& recvData)
void WorldSession::HandleRaidReadyCheckOpcode(WorldPacket& recvData) void WorldSession::HandleRaidReadyCheckOpcode(WorldPacket& recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received MSG_RAID_READY_CHECK"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received MSG_RAID_READY_CHECK");
#endif
Group* group = GetPlayer()->GetGroup(); Group* group = GetPlayer()->GetGroup();
if (!group) if (!group)
@@ -1065,12 +1097,16 @@ void WorldSession::HandleRequestPartyMemberStatsOpcode(WorldPacket &recvData)
/*void WorldSession::HandleGroupCancelOpcode(WorldPacket & recvData) /*void WorldSession::HandleGroupCancelOpcode(WorldPacket & recvData)
{ {
;//sLog->outDebug("WORLD: got CMSG_GROUP_CANCEL."); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug("WORLD: got CMSG_GROUP_CANCEL.");
#endif
}*/ }*/
void WorldSession::HandleOptOutOfLootOpcode(WorldPacket & recvData) void WorldSession::HandleOptOutOfLootOpcode(WorldPacket & recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_OPT_OUT_OF_LOOT"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_OPT_OUT_OF_LOOT");
#endif
uint32 passOnLoot; uint32 passOnLoot;
recvData >> passOnLoot; // 1 always pass, 0 do not pass recvData >> passOnLoot; // 1 always pass, 0 do not pass
src/game/Handlers/GuildHandler.cpp
+99 -33
View File
@@ -21,7 +21,9 @@ void WorldSession::HandleGuildQueryOpcode(WorldPacket& recvPacket)
uint32 guildId; uint32 guildId;
recvPacket >> guildId; recvPacket >> guildId;
;//sLog->outDebug(LOG_FILTER_GUILD, "CMSG_GUILD_QUERY [%s]: Guild: %u", GetPlayerInfo().c_str(), guildId); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_GUILD, "CMSG_GUILD_QUERY [%s]: Guild: %u", GetPlayerInfo().c_str(), guildId);
#endif
if (!guildId) if (!guildId)
return; return;
@@ -42,7 +44,9 @@ void WorldSession::HandleGuildInviteOpcode(WorldPacket& recvPacket)
std::string invitedName; std::string invitedName;
recvPacket >> invitedName; recvPacket >> invitedName;
;//sLog->outDebug(LOG_FILTER_GUILD, "CMSG_GUILD_INVITE [%s]: Invited: %s", GetPlayerInfo().c_str(), invitedName.c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_GUILD, "CMSG_GUILD_INVITE [%s]: Invited: %s", GetPlayerInfo().c_str(), invitedName.c_str());
#endif
if (normalizePlayerName(invitedName)) if (normalizePlayerName(invitedName))
if (Guild* guild = GetPlayer()->GetGuild()) if (Guild* guild = GetPlayer()->GetGuild())
guild->HandleInviteMember(this, invitedName); guild->HandleInviteMember(this, invitedName);
@@ -53,7 +57,9 @@ void WorldSession::HandleGuildRemoveOpcode(WorldPacket& recvPacket)
std::string playerName; std::string playerName;
recvPacket >> playerName; recvPacket >> playerName;
;//sLog->outDebug(LOG_FILTER_GUILD, "CMSG_GUILD_REMOVE [%s]: Target: %s", GetPlayerInfo().c_str(), playerName.c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_GUILD, "CMSG_GUILD_REMOVE [%s]: Target: %s", GetPlayerInfo().c_str(), playerName.c_str());
#endif
if (normalizePlayerName(playerName)) if (normalizePlayerName(playerName))
if (Guild* guild = GetPlayer()->GetGuild()) if (Guild* guild = GetPlayer()->GetGuild())
@@ -62,7 +68,9 @@ void WorldSession::HandleGuildRemoveOpcode(WorldPacket& recvPacket)
void WorldSession::HandleGuildAcceptOpcode(WorldPacket& /*recvPacket*/) void WorldSession::HandleGuildAcceptOpcode(WorldPacket& /*recvPacket*/)
{ {
;//sLog->outDebug(LOG_FILTER_GUILD, "CMSG_GUILD_ACCEPT [%s]", GetPlayer()->GetName().c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_GUILD, "CMSG_GUILD_ACCEPT [%s]", GetPlayer()->GetName().c_str());
#endif
if (!GetPlayer()->GetGuildId()) if (!GetPlayer()->GetGuildId())
if (Guild* guild = sGuildMgr->GetGuildById(GetPlayer()->GetGuildIdInvited())) if (Guild* guild = sGuildMgr->GetGuildById(GetPlayer()->GetGuildIdInvited()))
@@ -71,7 +79,9 @@ void WorldSession::HandleGuildAcceptOpcode(WorldPacket& /*recvPacket*/)
void WorldSession::HandleGuildDeclineOpcode(WorldPacket& /*recvPacket*/) void WorldSession::HandleGuildDeclineOpcode(WorldPacket& /*recvPacket*/)
{ {
;//sLog->outDebug(LOG_FILTER_GUILD, "CMSG_GUILD_DECLINE [%s]", GetPlayerInfo().c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_GUILD, "CMSG_GUILD_DECLINE [%s]", GetPlayerInfo().c_str());
#endif
GetPlayer()->SetGuildIdInvited(0); GetPlayer()->SetGuildIdInvited(0);
GetPlayer()->SetInGuild(0); GetPlayer()->SetInGuild(0);
@@ -79,7 +89,9 @@ void WorldSession::HandleGuildDeclineOpcode(WorldPacket& /*recvPacket*/)
void WorldSession::HandleGuildInfoOpcode(WorldPacket& /*recvPacket*/) void WorldSession::HandleGuildInfoOpcode(WorldPacket& /*recvPacket*/)
{ {
;//sLog->outDebug(LOG_FILTER_GUILD, "CMSG_GUILD_INFO [%s]", GetPlayerInfo().c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_GUILD, "CMSG_GUILD_INFO [%s]", GetPlayerInfo().c_str());
#endif
if (Guild* guild = GetPlayer()->GetGuild()) if (Guild* guild = GetPlayer()->GetGuild())
guild->SendInfo(this); guild->SendInfo(this);
@@ -87,7 +99,9 @@ void WorldSession::HandleGuildInfoOpcode(WorldPacket& /*recvPacket*/)
void WorldSession::HandleGuildRosterOpcode(WorldPacket& /*recvPacket*/) void WorldSession::HandleGuildRosterOpcode(WorldPacket& /*recvPacket*/)
{ {
;//sLog->outDebug(LOG_FILTER_GUILD, "CMSG_GUILD_ROSTER [%s]", GetPlayerInfo().c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_GUILD, "CMSG_GUILD_ROSTER [%s]", GetPlayerInfo().c_str());
#endif
if (Guild* guild = GetPlayer()->GetGuild()) if (Guild* guild = GetPlayer()->GetGuild())
guild->HandleRoster(this); guild->HandleRoster(this);
@@ -100,7 +114,9 @@ void WorldSession::HandleGuildPromoteOpcode(WorldPacket& recvPacket)
std::string playerName; std::string playerName;
recvPacket >> playerName; recvPacket >> playerName;
;//sLog->outDebug(LOG_FILTER_GUILD, "CMSG_GUILD_PROMOTE [%s]: Target: %s", GetPlayerInfo().c_str(), playerName.c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_GUILD, "CMSG_GUILD_PROMOTE [%s]: Target: %s", GetPlayerInfo().c_str(), playerName.c_str());
#endif
if (normalizePlayerName(playerName)) if (normalizePlayerName(playerName))
if (Guild* guild = GetPlayer()->GetGuild()) if (Guild* guild = GetPlayer()->GetGuild())
@@ -112,7 +128,9 @@ void WorldSession::HandleGuildDemoteOpcode(WorldPacket& recvPacket)
std::string playerName; std::string playerName;
recvPacket >> playerName; recvPacket >> playerName;
;//sLog->outDebug(LOG_FILTER_GUILD, "CMSG_GUILD_DEMOTE [%s]: Target: %s", GetPlayerInfo().c_str(), playerName.c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_GUILD, "CMSG_GUILD_DEMOTE [%s]: Target: %s", GetPlayerInfo().c_str(), playerName.c_str());
#endif
if (normalizePlayerName(playerName)) if (normalizePlayerName(playerName))
if (Guild* guild = GetPlayer()->GetGuild()) if (Guild* guild = GetPlayer()->GetGuild())
@@ -121,7 +139,9 @@ void WorldSession::HandleGuildDemoteOpcode(WorldPacket& recvPacket)
void WorldSession::HandleGuildLeaveOpcode(WorldPacket& /*recvPacket*/) void WorldSession::HandleGuildLeaveOpcode(WorldPacket& /*recvPacket*/)
{ {
;//sLog->outDebug(LOG_FILTER_GUILD, "CMSG_GUILD_LEAVE [%s]", GetPlayerInfo().c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_GUILD, "CMSG_GUILD_LEAVE [%s]", GetPlayerInfo().c_str());
#endif
if (Guild* guild = GetPlayer()->GetGuild()) if (Guild* guild = GetPlayer()->GetGuild())
guild->HandleLeaveMember(this); guild->HandleLeaveMember(this);
@@ -129,7 +149,9 @@ void WorldSession::HandleGuildLeaveOpcode(WorldPacket& /*recvPacket*/)
void WorldSession::HandleGuildDisbandOpcode(WorldPacket& /*recvPacket*/) void WorldSession::HandleGuildDisbandOpcode(WorldPacket& /*recvPacket*/)
{ {
;//sLog->outDebug(LOG_FILTER_GUILD, "CMSG_GUILD_DISBAND [%s]", GetPlayerInfo().c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_GUILD, "CMSG_GUILD_DISBAND [%s]", GetPlayerInfo().c_str());
#endif
if (Guild* guild = GetPlayer()->GetGuild()) if (Guild* guild = GetPlayer()->GetGuild())
guild->HandleDisband(this); guild->HandleDisband(this);
@@ -140,7 +162,9 @@ void WorldSession::HandleGuildLeaderOpcode(WorldPacket& recvPacket)
std::string name; std::string name;
recvPacket >> name; recvPacket >> name;
;//sLog->outDebug(LOG_FILTER_GUILD, "CMSG_GUILD_LEADER [%s]: Target: %s", GetPlayerInfo().c_str(), name.c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_GUILD, "CMSG_GUILD_LEADER [%s]: Target: %s", GetPlayerInfo().c_str(), name.c_str());
#endif
if (normalizePlayerName(name)) if (normalizePlayerName(name))
if (Guild* guild = GetPlayer()->GetGuild()) if (Guild* guild = GetPlayer()->GetGuild())
@@ -152,7 +176,9 @@ void WorldSession::HandleGuildMOTDOpcode(WorldPacket& recvPacket)
std::string motd; std::string motd;
recvPacket >> motd; recvPacket >> motd;
;//sLog->outDebug(LOG_FILTER_GUILD, "CMSG_GUILD_MOTD [%s]: MOTD: %s", GetPlayerInfo().c_str(), motd.c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_GUILD, "CMSG_GUILD_MOTD [%s]: MOTD: %s", GetPlayerInfo().c_str(), motd.c_str());
#endif
if (Guild* guild = GetPlayer()->GetGuild()) if (Guild* guild = GetPlayer()->GetGuild())
guild->HandleSetMOTD(this, motd); guild->HandleSetMOTD(this, motd);
@@ -164,7 +190,9 @@ void WorldSession::HandleGuildSetPublicNoteOpcode(WorldPacket& recvPacket)
std::string note; std::string note;
recvPacket >> playerName >> note; recvPacket >> playerName >> note;
;//sLog->outDebug(LOG_FILTER_GUILD, "CMSG_GUILD_SET_PUBLIC_NOTE [%s]: Target: %s, Note: %s", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_GUILD, "CMSG_GUILD_SET_PUBLIC_NOTE [%s]: Target: %s, Note: %s",
#endif
// GetPlayerInfo().c_str(), playerName.c_str(), note.c_str()); // GetPlayerInfo().c_str(), playerName.c_str(), note.c_str());
if (normalizePlayerName(playerName)) if (normalizePlayerName(playerName))
@@ -178,7 +206,9 @@ void WorldSession::HandleGuildSetOfficerNoteOpcode(WorldPacket& recvPacket)
std::string note; std::string note;
recvPacket >> playerName >> note; recvPacket >> playerName >> note;
;//sLog->outDebug(LOG_FILTER_GUILD, "CMSG_GUILD_SET_OFFICER_NOTE [%s]: Target: %s, Note: %s", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_GUILD, "CMSG_GUILD_SET_OFFICER_NOTE [%s]: Target: %s, Note: %s",
#endif
// GetPlayerInfo().c_str(), playerName.c_str(), note.c_str()); // GetPlayerInfo().c_str(), playerName.c_str(), note.c_str());
if (normalizePlayerName(playerName)) if (normalizePlayerName(playerName))
@@ -200,7 +230,9 @@ void WorldSession::HandleGuildRankOpcode(WorldPacket& recvPacket)
uint32 money; uint32 money;
recvPacket >> money; recvPacket >> money;
;//sLog->outDebug(LOG_FILTER_GUILD, "CMSG_GUILD_RANK [%s]: Rank: %s (%u)", GetPlayerInfo().c_str(), rankName.c_str(), rankId); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_GUILD, "CMSG_GUILD_RANK [%s]: Rank: %s (%u)", GetPlayerInfo().c_str(), rankName.c_str(), rankId);
#endif
Guild* guild = GetPlayer()->GetGuild(); Guild* guild = GetPlayer()->GetGuild();
if (!guild) if (!guild)
@@ -230,7 +262,9 @@ void WorldSession::HandleGuildAddRankOpcode(WorldPacket& recvPacket)
std::string rankName; std::string rankName;
recvPacket >> rankName; recvPacket >> rankName;
;//sLog->outDebug(LOG_FILTER_GUILD, "CMSG_GUILD_ADD_RANK [%s]: Rank: %s", GetPlayerInfo().c_str(), rankName.c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_GUILD, "CMSG_GUILD_ADD_RANK [%s]: Rank: %s", GetPlayerInfo().c_str(), rankName.c_str());
#endif
if (Guild* guild = GetPlayer()->GetGuild()) if (Guild* guild = GetPlayer()->GetGuild())
guild->HandleAddNewRank(this, rankName); guild->HandleAddNewRank(this, rankName);
@@ -238,7 +272,9 @@ void WorldSession::HandleGuildAddRankOpcode(WorldPacket& recvPacket)
void WorldSession::HandleGuildDelRankOpcode(WorldPacket& /*recvPacket*/) void WorldSession::HandleGuildDelRankOpcode(WorldPacket& /*recvPacket*/)
{ {
;//sLog->outDebug(LOG_FILTER_GUILD, "CMSG_GUILD_DEL_RANK [%s]", GetPlayerInfo().c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_GUILD, "CMSG_GUILD_DEL_RANK [%s]", GetPlayerInfo().c_str());
#endif
if (Guild* guild = GetPlayer()->GetGuild()) if (Guild* guild = GetPlayer()->GetGuild())
guild->HandleRemoveLowestRank(this); guild->HandleRemoveLowestRank(this);
@@ -249,7 +285,9 @@ void WorldSession::HandleGuildChangeInfoTextOpcode(WorldPacket& recvPacket)
std::string info; std::string info;
recvPacket >> info; recvPacket >> info;
;//sLog->outDebug(LOG_FILTER_GUILD, "CMSG_GUILD_INFO_TEXT [%s]: %s", GetPlayerInfo().c_str(), info.c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_GUILD, "CMSG_GUILD_INFO_TEXT [%s]: %s", GetPlayerInfo().c_str(), info.c_str());
#endif
if (Guild* guild = GetPlayer()->GetGuild()) if (Guild* guild = GetPlayer()->GetGuild())
guild->HandleSetInfo(this, info); guild->HandleSetInfo(this, info);
@@ -263,7 +301,9 @@ void WorldSession::HandleSaveGuildEmblemOpcode(WorldPacket& recvPacket)
EmblemInfo emblemInfo; EmblemInfo emblemInfo;
emblemInfo.ReadPacket(recvPacket); emblemInfo.ReadPacket(recvPacket);
;//sLog->outDebug(LOG_FILTER_GUILD, "MSG_SAVE_GUILD_EMBLEM [%s]: Guid: [" UI64FMTD #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_GUILD, "MSG_SAVE_GUILD_EMBLEM [%s]: Guid: [" UI64FMTD
#endif
// "] Style: %d, Color: %d, BorderStyle: %d, BorderColor: %d, BackgroundColor: %d" // "] Style: %d, Color: %d, BorderStyle: %d, BorderColor: %d, BackgroundColor: %d"
// , GetPlayerInfo().c_str(), vendorGuid, emblemInfo.GetStyle() // , GetPlayerInfo().c_str(), vendorGuid, emblemInfo.GetStyle()
// , emblemInfo.GetColor(), emblemInfo.GetBorderStyle() // , emblemInfo.GetColor(), emblemInfo.GetBorderStyle()
@@ -286,7 +326,9 @@ void WorldSession::HandleSaveGuildEmblemOpcode(WorldPacket& recvPacket)
void WorldSession::HandleGuildEventLogQueryOpcode(WorldPacket& /* recvPacket */) void WorldSession::HandleGuildEventLogQueryOpcode(WorldPacket& /* recvPacket */)
{ {
;//sLog->outDebug(LOG_FILTER_GUILD, "MSG_GUILD_EVENT_LOG_QUERY [%s]", GetPlayerInfo().c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_GUILD, "MSG_GUILD_EVENT_LOG_QUERY [%s]", GetPlayerInfo().c_str());
#endif
if (Guild* guild = GetPlayer()->GetGuild()) if (Guild* guild = GetPlayer()->GetGuild())
guild->SendEventLog(this); guild->SendEventLog(this);
@@ -294,7 +336,9 @@ void WorldSession::HandleGuildEventLogQueryOpcode(WorldPacket& /* recvPacket */)
void WorldSession::HandleGuildBankMoneyWithdrawn(WorldPacket & /* recvData */) void WorldSession::HandleGuildBankMoneyWithdrawn(WorldPacket & /* recvData */)
{ {
;//sLog->outDebug(LOG_FILTER_GUILD, "MSG_GUILD_BANK_MONEY_WITHDRAWN [%s]", GetPlayerInfo().c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_GUILD, "MSG_GUILD_BANK_MONEY_WITHDRAWN [%s]", GetPlayerInfo().c_str());
#endif
if (Guild* guild = GetPlayer()->GetGuild()) if (Guild* guild = GetPlayer()->GetGuild())
guild->SendMoneyInfo(this); guild->SendMoneyInfo(this);
@@ -302,7 +346,9 @@ void WorldSession::HandleGuildBankMoneyWithdrawn(WorldPacket & /* recvData */)
void WorldSession::HandleGuildPermissions(WorldPacket& /* recvData */) void WorldSession::HandleGuildPermissions(WorldPacket& /* recvData */)
{ {
;//sLog->outDebug(LOG_FILTER_GUILD, "MSG_GUILD_PERMISSIONS [%s]", GetPlayerInfo().c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_GUILD, "MSG_GUILD_PERMISSIONS [%s]", GetPlayerInfo().c_str());
#endif
if (Guild* guild = GetPlayer()->GetGuild()) if (Guild* guild = GetPlayer()->GetGuild())
guild->SendPermissions(this); guild->SendPermissions(this);
@@ -315,7 +361,9 @@ void WorldSession::HandleGuildBankerActivate(WorldPacket& recvData)
bool sendAllSlots; bool sendAllSlots;
recvData >> guid >> sendAllSlots; recvData >> guid >> sendAllSlots;
;//sLog->outDebug(LOG_FILTER_GUILD, "CMSG_GUILD_BANKER_ACTIVATE [%s]: Go: [" UI64FMTD "] AllSlots: %u" #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_GUILD, "CMSG_GUILD_BANKER_ACTIVATE [%s]: Go: [" UI64FMTD "] AllSlots: %u"
#endif
// , GetPlayerInfo().c_str(), guid, sendAllSlots); // , GetPlayerInfo().c_str(), guid, sendAllSlots);
Guild * const guild = GetPlayer()->GetGuild(); Guild * const guild = GetPlayer()->GetGuild();
@@ -337,7 +385,9 @@ void WorldSession::HandleGuildBankQueryTab(WorldPacket& recvData)
recvData >> guid >> tabId >> full; recvData >> guid >> tabId >> full;
;//sLog->outDebug(LOG_FILTER_GUILD, "CMSG_GUILD_BANK_QUERY_TAB [%s]: Go: [" UI64FMTD "], TabId: %u, ShowTabs: %u" #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_GUILD, "CMSG_GUILD_BANK_QUERY_TAB [%s]: Go: [" UI64FMTD "], TabId: %u, ShowTabs: %u"
#endif
// , GetPlayerInfo().c_str(), guid, tabId, full); // , GetPlayerInfo().c_str(), guid, tabId, full);
if (GetPlayer()->GetGameObjectIfCanInteractWith(guid, GAMEOBJECT_TYPE_GUILD_BANK)) if (GetPlayer()->GetGameObjectIfCanInteractWith(guid, GAMEOBJECT_TYPE_GUILD_BANK))
@@ -351,7 +401,9 @@ void WorldSession::HandleGuildBankDepositMoney(WorldPacket& recvData)
uint32 money; uint32 money;
recvData >> guid >> money; recvData >> guid >> money;
;//sLog->outDebug(LOG_FILTER_GUILD, "CMSG_GUILD_BANK_DEPOSIT_MONEY [%s]: Go: [" UI64FMTD "], money: %u", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_GUILD, "CMSG_GUILD_BANK_DEPOSIT_MONEY [%s]: Go: [" UI64FMTD "], money: %u",
#endif
// GetPlayerInfo().c_str(), guid, money); // GetPlayerInfo().c_str(), guid, money);
if (GetPlayer()->GetGameObjectIfCanInteractWith(guid, GAMEOBJECT_TYPE_GUILD_BANK)) if (GetPlayer()->GetGameObjectIfCanInteractWith(guid, GAMEOBJECT_TYPE_GUILD_BANK))
@@ -366,7 +418,9 @@ void WorldSession::HandleGuildBankWithdrawMoney(WorldPacket& recvData)
uint32 money; uint32 money;
recvData >> guid >> money; recvData >> guid >> money;
;//sLog->outDebug(LOG_FILTER_GUILD, "CMSG_GUILD_BANK_WITHDRAW_MONEY [%s]: Go: [" UI64FMTD "], money: %u", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_GUILD, "CMSG_GUILD_BANK_WITHDRAW_MONEY [%s]: Go: [" UI64FMTD "], money: %u",
#endif
// GetPlayerInfo().c_str(), guid, money); // GetPlayerInfo().c_str(), guid, money);
if (money && GetPlayer()->GetGameObjectIfCanInteractWith(guid, GAMEOBJECT_TYPE_GUILD_BANK)) if (money && GetPlayer()->GetGameObjectIfCanInteractWith(guid, GAMEOBJECT_TYPE_GUILD_BANK))
@@ -376,7 +430,9 @@ void WorldSession::HandleGuildBankWithdrawMoney(WorldPacket& recvData)
void WorldSession::HandleGuildBankSwapItems(WorldPacket& recvData) void WorldSession::HandleGuildBankSwapItems(WorldPacket& recvData)
{ {
;//sLog->outDebug(LOG_FILTER_GUILD, "CMSG_GUILD_BANK_SWAP_ITEMS [%s]", GetPlayerInfo().c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_GUILD, "CMSG_GUILD_BANK_SWAP_ITEMS [%s]", GetPlayerInfo().c_str());
#endif
uint64 GoGuid; uint64 GoGuid;
recvData >> GoGuid; recvData >> GoGuid;
@@ -462,7 +518,9 @@ void WorldSession::HandleGuildBankBuyTab(WorldPacket& recvData)
recvData >> guid >> tabId; recvData >> guid >> tabId;
;//sLog->outDebug(LOG_FILTER_GUILD, "CMSG_GUILD_BANK_BUY_TAB [%s]: Go: [" UI64FMTD "], TabId: %u", GetPlayerInfo().c_str(), guid, tabId); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_GUILD, "CMSG_GUILD_BANK_BUY_TAB [%s]: Go: [" UI64FMTD "], TabId: %u", GetPlayerInfo().c_str(), guid, tabId);
#endif
if (GetPlayer()->GetGameObjectIfCanInteractWith(guid, GAMEOBJECT_TYPE_GUILD_BANK)) if (GetPlayer()->GetGameObjectIfCanInteractWith(guid, GAMEOBJECT_TYPE_GUILD_BANK))
@@ -478,7 +536,9 @@ void WorldSession::HandleGuildBankUpdateTab(WorldPacket& recvData)
recvData >> guid >> tabId >> name >> icon; recvData >> guid >> tabId >> name >> icon;
;//sLog->outDebug(LOG_FILTER_GUILD, "CMSG_GUILD_BANK_UPDATE_TAB [%s]: Go: [" UI64FMTD "], TabId: %u, Name: %s, Icon: %s" #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_GUILD, "CMSG_GUILD_BANK_UPDATE_TAB [%s]: Go: [" UI64FMTD "], TabId: %u, Name: %s, Icon: %s"
#endif
// , GetPlayerInfo().c_str(), guid, tabId, name.c_str(), icon.c_str()); // , GetPlayerInfo().c_str(), guid, tabId, name.c_str(), icon.c_str());
if (!name.empty() && !icon.empty()) if (!name.empty() && !icon.empty())
@@ -492,7 +552,9 @@ void WorldSession::HandleGuildBankLogQuery(WorldPacket& recvData)
uint8 tabId; uint8 tabId;
recvData >> tabId; recvData >> tabId;
;//sLog->outDebug(LOG_FILTER_GUILD, "MSG_GUILD_BANK_LOG_QUERY [%s]: TabId: %u", GetPlayerInfo().c_str(), tabId); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_GUILD, "MSG_GUILD_BANK_LOG_QUERY [%s]: TabId: %u", GetPlayerInfo().c_str(), tabId);
#endif
if (Guild* guild = GetPlayer()->GetGuild()) if (Guild* guild = GetPlayer()->GetGuild())
guild->SendBankLog(this, tabId); guild->SendBankLog(this, tabId);
@@ -503,7 +565,9 @@ void WorldSession::HandleQueryGuildBankTabText(WorldPacket &recvData)
uint8 tabId; uint8 tabId;
recvData >> tabId; recvData >> tabId;
;//sLog->outDebug(LOG_FILTER_GUILD, "MSG_QUERY_GUILD_BANK_TEXT [%s]: TabId: %u", GetPlayerInfo().c_str(), tabId); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_GUILD, "MSG_QUERY_GUILD_BANK_TEXT [%s]: TabId: %u", GetPlayerInfo().c_str(), tabId);
#endif
if (Guild* guild = GetPlayer()->GetGuild()) if (Guild* guild = GetPlayer()->GetGuild())
guild->SendBankTabText(this, tabId); guild->SendBankTabText(this, tabId);
@@ -515,7 +579,9 @@ void WorldSession::HandleSetGuildBankTabText(WorldPacket &recvData)
std::string text; std::string text;
recvData >> tabId >> text; recvData >> tabId >> text;
;//sLog->outDebug(LOG_FILTER_GUILD, "CMSG_SET_GUILD_BANK_TEXT [%s]: TabId: %u, Text: %s", GetPlayerInfo().c_str(), tabId, text.c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_GUILD, "CMSG_SET_GUILD_BANK_TEXT [%s]: TabId: %u, Text: %s", GetPlayerInfo().c_str(), tabId, text.c_str());
#endif
if (Guild* guild = GetPlayer()->GetGuild()) if (Guild* guild = GetPlayer()->GetGuild())
guild->SetBankTabText(tabId, text); guild->SetBankTabText(tabId, text);
src/game/Handlers/ItemHandler.cpp
+90 -30
View File
@@ -428,7 +428,9 @@ void WorldSession::HandleItemQuerySingleOpcode(WorldPacket & recvData)
uint32 item; uint32 item;
recvData >> item; recvData >> item;
;//sLog->outDetail("STORAGE: Item Query = %u", item); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("STORAGE: Item Query = %u", item);
#endif
ItemTemplate const* pProto = sObjectMgr->GetItemTemplate(item); ItemTemplate const* pProto = sObjectMgr->GetItemTemplate(item);
if (pProto) if (pProto)
@@ -574,7 +576,9 @@ void WorldSession::HandleItemQuerySingleOpcode(WorldPacket & recvData)
} }
else else
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_ITEM_QUERY_SINGLE - NO item INFO! (ENTRY: %u)", item); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_ITEM_QUERY_SINGLE - NO item INFO! (ENTRY: %u)", item);
#endif
WorldPacket queryData(SMSG_ITEM_QUERY_SINGLE_RESPONSE, 4); WorldPacket queryData(SMSG_ITEM_QUERY_SINGLE_RESPONSE, 4);
queryData << uint32(item | 0x80000000); queryData << uint32(item | 0x80000000);
SendPacket(&queryData); SendPacket(&queryData);
@@ -599,12 +603,16 @@ void WorldSession::HandleReadItem(WorldPacket & recvData)
if (msg == EQUIP_ERR_OK) if (msg == EQUIP_ERR_OK)
{ {
data.Initialize (SMSG_READ_ITEM_OK, 8); data.Initialize (SMSG_READ_ITEM_OK, 8);
;//sLog->outDetail("STORAGE: Item page sent"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("STORAGE: Item page sent");
#endif
} }
else else
{ {
data.Initialize(SMSG_READ_ITEM_FAILED, 8); data.Initialize(SMSG_READ_ITEM_FAILED, 8);
;//sLog->outDetail("STORAGE: Unable to read item"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("STORAGE: Unable to read item");
#endif
_player->SendEquipError(msg, pItem, NULL); _player->SendEquipError(msg, pItem, NULL);
} }
data << pItem->GetGUID(); data << pItem->GetGUID();
@@ -616,7 +624,9 @@ void WorldSession::HandleReadItem(WorldPacket & recvData)
void WorldSession::HandleSellItemOpcode(WorldPacket & recvData) void WorldSession::HandleSellItemOpcode(WorldPacket & recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_SELL_ITEM"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_SELL_ITEM");
#endif
uint64 vendorguid, itemguid; uint64 vendorguid, itemguid;
uint32 count; uint32 count;
@@ -628,7 +638,9 @@ void WorldSession::HandleSellItemOpcode(WorldPacket & recvData)
Creature* creature = GetPlayer()->GetNPCIfCanInteractWith(vendorguid, UNIT_NPC_FLAG_VENDOR); Creature* creature = GetPlayer()->GetNPCIfCanInteractWith(vendorguid, UNIT_NPC_FLAG_VENDOR);
if (!creature) if (!creature)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandleSellItemOpcode - Unit (GUID: %u) not found or you can not interact with him.", uint32(GUID_LOPART(vendorguid))); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandleSellItemOpcode - Unit (GUID: %u) not found or you can not interact with him.", uint32(GUID_LOPART(vendorguid)));
#endif
_player->SendSellError(SELL_ERR_CANT_FIND_VENDOR, NULL, itemguid, 0); _player->SendSellError(SELL_ERR_CANT_FIND_VENDOR, NULL, itemguid, 0);
return; return;
} }
@@ -731,7 +743,9 @@ void WorldSession::HandleSellItemOpcode(WorldPacket & recvData)
void WorldSession::HandleBuybackItem(WorldPacket & recvData) void WorldSession::HandleBuybackItem(WorldPacket & recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_BUYBACK_ITEM"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_BUYBACK_ITEM");
#endif
uint64 vendorguid; uint64 vendorguid;
uint32 slot; uint32 slot;
@@ -740,7 +754,9 @@ void WorldSession::HandleBuybackItem(WorldPacket & recvData)
Creature* creature = GetPlayer()->GetNPCIfCanInteractWith(vendorguid, UNIT_NPC_FLAG_VENDOR); Creature* creature = GetPlayer()->GetNPCIfCanInteractWith(vendorguid, UNIT_NPC_FLAG_VENDOR);
if (!creature) if (!creature)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandleBuybackItem - Unit (GUID: %u) not found or you can not interact with him.", uint32(GUID_LOPART(vendorguid))); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandleBuybackItem - Unit (GUID: %u) not found or you can not interact with him.", uint32(GUID_LOPART(vendorguid)));
#endif
_player->SendSellError(SELL_ERR_CANT_FIND_VENDOR, NULL, 0, 0); _player->SendSellError(SELL_ERR_CANT_FIND_VENDOR, NULL, 0, 0);
return; return;
} }
@@ -779,7 +795,9 @@ void WorldSession::HandleBuybackItem(WorldPacket & recvData)
void WorldSession::HandleBuyItemInSlotOpcode(WorldPacket & recvData) void WorldSession::HandleBuyItemInSlotOpcode(WorldPacket & recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_BUY_ITEM_IN_SLOT"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_BUY_ITEM_IN_SLOT");
#endif
uint64 vendorguid, bagguid; uint64 vendorguid, bagguid;
uint32 item, slot, count; uint32 item, slot, count;
uint8 bagslot; uint8 bagslot;
@@ -821,7 +839,9 @@ void WorldSession::HandleBuyItemInSlotOpcode(WorldPacket & recvData)
void WorldSession::HandleBuyItemOpcode(WorldPacket & recvData) void WorldSession::HandleBuyItemOpcode(WorldPacket & recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_BUY_ITEM"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_BUY_ITEM");
#endif
uint64 vendorguid; uint64 vendorguid;
uint32 item, slot, count; uint32 item, slot, count;
uint8 unk1; uint8 unk1;
@@ -846,19 +866,25 @@ void WorldSession::HandleListInventoryOpcode(WorldPacket & recvData)
if (!GetPlayer()->IsAlive()) if (!GetPlayer()->IsAlive())
return; return;
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Recvd CMSG_LIST_INVENTORY"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Recvd CMSG_LIST_INVENTORY");
#endif
SendListInventory(guid); SendListInventory(guid);
} }
void WorldSession::SendListInventory(uint64 vendorGuid) void WorldSession::SendListInventory(uint64 vendorGuid)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Sent SMSG_LIST_INVENTORY"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Sent SMSG_LIST_INVENTORY");
#endif
Creature* vendor = GetPlayer()->GetNPCIfCanInteractWith(vendorGuid, UNIT_NPC_FLAG_VENDOR); Creature* vendor = GetPlayer()->GetNPCIfCanInteractWith(vendorGuid, UNIT_NPC_FLAG_VENDOR);
if (!vendor) if (!vendor)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: SendListInventory - Unit (GUID: %u) not found or you can not interact with him.", uint32(GUID_LOPART(vendorGuid))); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: SendListInventory - Unit (GUID: %u) not found or you can not interact with him.", uint32(GUID_LOPART(vendorGuid)));
#endif
_player->SendSellError(SELL_ERR_CANT_FIND_VENDOR, NULL, 0, 0); _player->SendSellError(SELL_ERR_CANT_FIND_VENDOR, NULL, 0, 0);
return; return;
} }
@@ -1001,7 +1027,9 @@ void WorldSession::HandleAutoStoreBagItemOpcode(WorldPacket & recvData)
void WorldSession::HandleBuyBankSlotOpcode(WorldPacket& recvPacket) void WorldSession::HandleBuyBankSlotOpcode(WorldPacket& recvPacket)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_BUY_BANK_SLOT"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_BUY_BANK_SLOT");
#endif
uint64 guid; uint64 guid;
recvPacket >> guid; recvPacket >> guid;
@@ -1017,7 +1045,9 @@ void WorldSession::HandleBuyBankSlotOpcode(WorldPacket& recvPacket)
// next slot // next slot
++slot; ++slot;
;//sLog->outDetail("PLAYER: Buy bank bag slot, slot number = %u", slot); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("PLAYER: Buy bank bag slot, slot number = %u", slot);
#endif
BankBagSlotPricesEntry const* slotEntry = sBankBagSlotPricesStore.LookupEntry(slot); BankBagSlotPricesEntry const* slotEntry = sBankBagSlotPricesStore.LookupEntry(slot);
@@ -1050,11 +1080,15 @@ void WorldSession::HandleBuyBankSlotOpcode(WorldPacket& recvPacket)
void WorldSession::HandleAutoBankItemOpcode(WorldPacket& recvPacket) void WorldSession::HandleAutoBankItemOpcode(WorldPacket& recvPacket)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_AUTOBANK_ITEM"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_AUTOBANK_ITEM");
#endif
uint8 srcbag, srcslot; uint8 srcbag, srcslot;
recvPacket >> srcbag >> srcslot; recvPacket >> srcbag >> srcslot;
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "STORAGE: receive srcbag = %u, srcslot = %u", srcbag, srcslot); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "STORAGE: receive srcbag = %u, srcslot = %u", srcbag, srcslot);
#endif
if (!CanUseBank()) if (!CanUseBank())
{ {
@@ -1088,11 +1122,15 @@ void WorldSession::HandleAutoBankItemOpcode(WorldPacket& recvPacket)
void WorldSession::HandleAutoStoreBankItemOpcode(WorldPacket& recvPacket) void WorldSession::HandleAutoStoreBankItemOpcode(WorldPacket& recvPacket)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_AUTOSTORE_BANK_ITEM"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_AUTOSTORE_BANK_ITEM");
#endif
uint8 srcbag, srcslot; uint8 srcbag, srcslot;
recvPacket >> srcbag >> srcslot; recvPacket >> srcbag >> srcslot;
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "STORAGE: receive srcbag = %u, srcslot = %u", srcbag, srcslot); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "STORAGE: receive srcbag = %u, srcslot = %u", srcbag, srcslot);
#endif
if (!CanUseBank()) if (!CanUseBank())
{ {
@@ -1142,7 +1180,9 @@ void WorldSession::HandleSetAmmoOpcode(WorldPacket & recvData)
return; return;
} }
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_SET_AMMO"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_SET_AMMO");
#endif
uint32 item; uint32 item;
recvData >> item; recvData >> item;
@@ -1188,7 +1228,9 @@ void WorldSession::HandleItemNameQueryOpcode(WorldPacket & recvData)
recvData >> itemid; recvData >> itemid;
recvData.read_skip<uint64>(); // guid recvData.read_skip<uint64>(); // guid
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_ITEM_NAME_QUERY %u", itemid); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_ITEM_NAME_QUERY %u", itemid);
#endif
ItemSetNameEntry const* pName = sObjectMgr->GetItemSetNameEntry(itemid); ItemSetNameEntry const* pName = sObjectMgr->GetItemSetNameEntry(itemid);
if (pName) if (pName)
{ {
@@ -1208,14 +1250,18 @@ void WorldSession::HandleItemNameQueryOpcode(WorldPacket & recvData)
void WorldSession::HandleWrapItemOpcode(WorldPacket& recvData) void WorldSession::HandleWrapItemOpcode(WorldPacket& recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "Received opcode CMSG_WRAP_ITEM"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "Received opcode CMSG_WRAP_ITEM");
#endif
uint8 gift_bag, gift_slot, item_bag, item_slot; uint8 gift_bag, gift_slot, item_bag, item_slot;
recvData >> gift_bag >> gift_slot; // paper recvData >> gift_bag >> gift_slot; // paper
recvData >> item_bag >> item_slot; // item recvData >> item_bag >> item_slot; // item
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WRAP: receive gift_bag = %u, gift_slot = %u, item_bag = %u, item_slot = %u", gift_bag, gift_slot, item_bag, item_slot); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WRAP: receive gift_bag = %u, gift_slot = %u, item_bag = %u, item_slot = %u", gift_bag, gift_slot, item_bag, item_slot);
#endif
Item* gift = _player->GetItemByPos(gift_bag, gift_slot); Item* gift = _player->GetItemByPos(gift_bag, gift_slot);
if (!gift) if (!gift)
@@ -1323,7 +1369,9 @@ void WorldSession::HandleWrapItemOpcode(WorldPacket& recvData)
void WorldSession::HandleSocketOpcode(WorldPacket& recvData) void WorldSession::HandleSocketOpcode(WorldPacket& recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_SOCKET_GEMS"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_SOCKET_GEMS");
#endif
uint64 item_guid; uint64 item_guid;
uint64 gem_guids[MAX_GEM_SOCKETS]; uint64 gem_guids[MAX_GEM_SOCKETS];
@@ -1521,7 +1569,9 @@ void WorldSession::HandleSocketOpcode(WorldPacket& recvData)
void WorldSession::HandleCancelTempEnchantmentOpcode(WorldPacket& recvData) void WorldSession::HandleCancelTempEnchantmentOpcode(WorldPacket& recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_CANCEL_TEMP_ENCHANTMENT"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_CANCEL_TEMP_ENCHANTMENT");
#endif
uint32 eslot; uint32 eslot;
@@ -1545,7 +1595,9 @@ void WorldSession::HandleCancelTempEnchantmentOpcode(WorldPacket& recvData)
void WorldSession::HandleItemRefundInfoRequest(WorldPacket& recvData) void WorldSession::HandleItemRefundInfoRequest(WorldPacket& recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_ITEM_REFUND_INFO"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_ITEM_REFUND_INFO");
#endif
uint64 guid; uint64 guid;
recvData >> guid; // item guid recvData >> guid; // item guid
@@ -1553,7 +1605,9 @@ void WorldSession::HandleItemRefundInfoRequest(WorldPacket& recvData)
Item* item = _player->GetItemByGuid(guid); Item* item = _player->GetItemByGuid(guid);
if (!item) if (!item)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "Item refund: item not found!"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "Item refund: item not found!");
#endif
return; return;
} }
@@ -1562,14 +1616,18 @@ void WorldSession::HandleItemRefundInfoRequest(WorldPacket& recvData)
void WorldSession::HandleItemRefund(WorldPacket &recvData) void WorldSession::HandleItemRefund(WorldPacket &recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_ITEM_REFUND"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_ITEM_REFUND");
#endif
uint64 guid; uint64 guid;
recvData >> guid; // item guid recvData >> guid; // item guid
Item* item = _player->GetItemByGuid(guid); Item* item = _player->GetItemByGuid(guid);
if (!item) if (!item)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "Item refund: item not found!"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "Item refund: item not found!");
#endif
return; return;
} }
@@ -1590,7 +1648,9 @@ void WorldSession::HandleItemTextQuery(WorldPacket & recvData )
uint64 itemGuid; uint64 itemGuid;
recvData >> itemGuid; recvData >> itemGuid;
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_ITEM_TEXT_QUERY item guid: %u", GUID_LOPART(itemGuid)); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_ITEM_TEXT_QUERY item guid: %u", GUID_LOPART(itemGuid));
#endif
WorldPacket data(SMSG_ITEM_TEXT_QUERY_RESPONSE, 50); // guess size WorldPacket data(SMSG_ITEM_TEXT_QUERY_RESPONSE, 50); // guess size
src/game/Handlers/LFGHandler.cpp
+78 -26
View File
@@ -56,7 +56,9 @@ void WorldSession::HandleLfgJoinOpcode(WorldPacket& recvData)
recvData >> numDungeons; recvData >> numDungeons;
if (!numDungeons) if (!numDungeons)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_LFG_JOIN [" UI64FMTD "] no dungeons selected", GetPlayer()->GetGUID()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_LFG_JOIN [" UI64FMTD "] no dungeons selected", GetPlayer()->GetGUID());
#endif
recvData.rfinish(); recvData.rfinish();
return; return;
} }
@@ -75,7 +77,9 @@ void WorldSession::HandleLfgJoinOpcode(WorldPacket& recvData)
std::string comment; std::string comment;
recvData >> comment; recvData >> comment;
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_LFG_JOIN [" UI64FMTD "] roles: %u, Dungeons: %u, Comment: %s", GetPlayer()->GetGUID(), roles, uint8(newDungeons.size()), comment.c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_LFG_JOIN [" UI64FMTD "] roles: %u, Dungeons: %u, Comment: %s", GetPlayer()->GetGUID(), roles, uint8(newDungeons.size()), comment.c_str());
#endif
sLFGMgr->JoinLfg(GetPlayer(), uint8(roles), newDungeons, comment); sLFGMgr->JoinLfg(GetPlayer(), uint8(roles), newDungeons, comment);
} }
@@ -86,7 +90,9 @@ void WorldSession::HandleLfgLeaveOpcode(WorldPacket& /*recvData*/)
uint64 guid = GetPlayer()->GetGUID(); uint64 guid = GetPlayer()->GetGUID();
uint64 gguid = group ? group->GetGUID() : guid; uint64 gguid = group ? group->GetGUID() : guid;
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_LFG_LEAVE [" UI64FMTD "] in group: %u", guid, grp ? 1 : 0); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_LFG_LEAVE [" UI64FMTD "] in group: %u", guid, grp ? 1 : 0);
#endif
// Check cheating - only leader can leave the queue // Check cheating - only leader can leave the queue
if (!group || group->GetLeaderGUID() == guid) if (!group || group->GetLeaderGUID() == guid)
@@ -103,7 +109,9 @@ void WorldSession::HandleLfgProposalResultOpcode(WorldPacket& recvData)
recvData >> proposalID; recvData >> proposalID;
recvData >> accept; recvData >> accept;
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_LFG_PROPOSAL_RESULT [" UI64FMTD "] proposal: %u accept: %u", GetPlayer()->GetGUID(), lfgGroupID, accept ? 1 : 0); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_LFG_PROPOSAL_RESULT [" UI64FMTD "] proposal: %u accept: %u", GetPlayer()->GetGUID(), lfgGroupID, accept ? 1 : 0);
#endif
sLFGMgr->UpdateProposal(proposalID, GetPlayer()->GetGUID(), accept); sLFGMgr->UpdateProposal(proposalID, GetPlayer()->GetGUID(), accept);
} }
@@ -115,11 +123,15 @@ void WorldSession::HandleLfgSetRolesOpcode(WorldPacket& recvData)
Group* group = GetPlayer()->GetGroup(); Group* group = GetPlayer()->GetGroup();
if (!group) if (!group)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_LFG_SET_ROLES [" UI64FMTD "] Not in group", guid); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_LFG_SET_ROLES [" UI64FMTD "] Not in group", guid);
#endif
return; return;
} }
uint64 gguid = group->GetGUID(); uint64 gguid = group->GetGUID();
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_LFG_SET_ROLES: Group [" UI64FMTD "], Player [" UI64FMTD "], Roles: %u", gguid, guid, roles); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_LFG_SET_ROLES: Group [" UI64FMTD "], Player [" UI64FMTD "], Roles: %u", gguid, guid, roles);
#endif
sLFGMgr->UpdateRoleCheck(gguid, guid, roles); sLFGMgr->UpdateRoleCheck(gguid, guid, roles);
} }
@@ -127,7 +139,9 @@ void WorldSession::HandleLfgSetCommentOpcode(WorldPacket& recvData)
{ {
std::string comment; std::string comment;
recvData >> comment; recvData >> comment;
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_LFG_SET_COMMENT [" UI64FMTD "] comment: %s", guid, comment.c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_LFG_SET_COMMENT [" UI64FMTD "] comment: %s", guid, comment.c_str());
#endif
sLFGMgr->SetComment(GetPlayer()->GetGUID(), comment); sLFGMgr->SetComment(GetPlayer()->GetGUID(), comment);
sLFGMgr->LfrSetComment(GetPlayer(), comment); sLFGMgr->LfrSetComment(GetPlayer(), comment);
@@ -139,7 +153,9 @@ void WorldSession::HandleLfgSetBootVoteOpcode(WorldPacket& recvData)
recvData >> agree; recvData >> agree;
uint64 guid = GetPlayer()->GetGUID(); uint64 guid = GetPlayer()->GetGUID();
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_LFG_SET_BOOT_VOTE [" UI64FMTD "] agree: %u", guid, agree ? 1 : 0); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_LFG_SET_BOOT_VOTE [" UI64FMTD "] agree: %u", guid, agree ? 1 : 0);
#endif
sLFGMgr->UpdateBoot(guid, agree); sLFGMgr->UpdateBoot(guid, agree);
} }
@@ -148,14 +164,18 @@ void WorldSession::HandleLfgTeleportOpcode(WorldPacket& recvData)
bool out; bool out;
recvData >> out; recvData >> out;
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_LFG_TELEPORT [" UI64FMTD "] out: %u", GetPlayer()->GetGUID(), out ? 1 : 0); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_LFG_TELEPORT [" UI64FMTD "] out: %u", GetPlayer()->GetGUID(), out ? 1 : 0);
#endif
sLFGMgr->TeleportPlayer(GetPlayer(), out, true); sLFGMgr->TeleportPlayer(GetPlayer(), out, true);
} }
void WorldSession::HandleLfgPlayerLockInfoRequestOpcode(WorldPacket& /*recvData*/) void WorldSession::HandleLfgPlayerLockInfoRequestOpcode(WorldPacket& /*recvData*/)
{ {
uint64 guid = GetPlayer()->GetGUID(); uint64 guid = GetPlayer()->GetGUID();
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_LFG_PLAYER_LOCK_INFO_REQUEST [" UI64FMTD "]", guid); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_LFG_PLAYER_LOCK_INFO_REQUEST [" UI64FMTD "]", guid);
#endif
// Get Random dungeons that can be done at a certain level and expansion // Get Random dungeons that can be done at a certain level and expansion
uint8 level = GetPlayer()->getLevel(); uint8 level = GetPlayer()->getLevel();
@@ -168,7 +188,9 @@ void WorldSession::HandleLfgPlayerLockInfoRequestOpcode(WorldPacket& /*recvData*
uint32 rsize = uint32(randomDungeons.size()); uint32 rsize = uint32(randomDungeons.size());
uint32 lsize = uint32(lock.size()); uint32 lsize = uint32(lock.size());
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "SMSG_LFG_PLAYER_INFO [" UI64FMTD "]", guid); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "SMSG_LFG_PLAYER_INFO [" UI64FMTD "]", guid);
#endif
WorldPacket data(SMSG_LFG_PLAYER_INFO, 1 + rsize * (4 + 1 + 4 + 4 + 4 + 4 + 1 + 4 + 4 + 4) + 4 + lsize * (1 + 4 + 4 + 4 + 4 + 1 + 4 + 4 + 4)); WorldPacket data(SMSG_LFG_PLAYER_INFO, 1 + rsize * (4 + 1 + 4 + 4 + 4 + 4 + 1 + 4 + 4 + 4) + 4 + lsize * (1 + 4 + 4 + 4 + 4 + 1 + 4 + 4 + 4));
data << uint8(randomDungeons.size()); // Random Dungeon count data << uint8(randomDungeons.size()); // Random Dungeon count
@@ -226,7 +248,9 @@ void WorldSession::HandleLfgPlayerLockInfoRequestOpcode(WorldPacket& /*recvData*
void WorldSession::HandleLfgPartyLockInfoRequestOpcode(WorldPacket& /*recvData*/) void WorldSession::HandleLfgPartyLockInfoRequestOpcode(WorldPacket& /*recvData*/)
{ {
uint64 guid = GetPlayer()->GetGUID(); uint64 guid = GetPlayer()->GetGUID();
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_LFG_PARTY_LOCK_INFO_REQUEST [" UI64FMTD "]", guid); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_LFG_PARTY_LOCK_INFO_REQUEST [" UI64FMTD "]", guid);
#endif
Group* group = GetPlayer()->GetGroup(); Group* group = GetPlayer()->GetGroup();
if (!group) if (!group)
@@ -252,7 +276,9 @@ void WorldSession::HandleLfgPartyLockInfoRequestOpcode(WorldPacket& /*recvData*
for (lfg::LfgLockPartyMap::const_iterator it = lockMap.begin(); it != lockMap.end(); ++it) for (lfg::LfgLockPartyMap::const_iterator it = lockMap.begin(); it != lockMap.end(); ++it)
size += 8 + 4 + uint32(it->second.size()) * (4 + 4); size += 8 + 4 + uint32(it->second.size()) * (4 + 4);
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "SMSG_LFG_PARTY_INFO [" UI64FMTD "]", guid); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "SMSG_LFG_PARTY_INFO [" UI64FMTD "]", guid);
#endif
WorldPacket data(SMSG_LFG_PARTY_INFO, 1 + size); WorldPacket data(SMSG_LFG_PARTY_INFO, 1 + size);
BuildPartyLockDungeonBlock(data, lockMap); BuildPartyLockDungeonBlock(data, lockMap);
SendPacket(&data); SendPacket(&data);
@@ -276,7 +302,9 @@ void WorldSession::HandleLfrSearchLeaveOpcode(WorldPacket& recvData)
void WorldSession::HandleLfgGetStatus(WorldPacket& /*recvData*/) void WorldSession::HandleLfgGetStatus(WorldPacket& /*recvData*/)
{ {
;//sLog->outDebug(LOG_FILTER_LFG, "CMSG_LFG_GET_STATUS %s", GetPlayerInfo().c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_LFG, "CMSG_LFG_GET_STATUS %s", GetPlayerInfo().c_str());
#endif
uint64 guid = GetPlayer()->GetGUID(); uint64 guid = GetPlayer()->GetGUID();
lfg::LfgUpdateData updateData = sLFGMgr->GetLfgStatus(guid); lfg::LfgUpdateData updateData = sLFGMgr->GetLfgStatus(guid);
@@ -313,7 +341,9 @@ void WorldSession::SendLfgUpdatePlayer(lfg::LfgUpdateData const& updateData)
break; break;
} }
;//sLog->outDebug(LOG_FILTER_LFG, "SMSG_LFG_UPDATE_PLAYER %s updatetype: %u", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_LFG, "SMSG_LFG_UPDATE_PLAYER %s updatetype: %u",
#endif
// GetPlayerInfo().c_str(), updateData.updateType); // GetPlayerInfo().c_str(), updateData.updateType);
WorldPacket data(SMSG_LFG_UPDATE_PLAYER, 1 + 1 + (size > 0 ? 1 : 0) * (1 + 1 + 1 + 1 + size * 4 + updateData.comment.length())); WorldPacket data(SMSG_LFG_UPDATE_PLAYER, 1 + 1 + (size > 0 ? 1 : 0) * (1 + 1 + 1 + 1 + size * 4 + updateData.comment.length()));
data << uint8(updateData.updateType); // Lfg Update type data << uint8(updateData.updateType); // Lfg Update type
@@ -354,7 +384,9 @@ void WorldSession::SendLfgUpdateParty(lfg::LfgUpdateData const& updateData)
break; break;
} }
;//sLog->outDebug(LOG_FILTER_LFG, "SMSG_LFG_UPDATE_PARTY %s updatetype: %u", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_LFG, "SMSG_LFG_UPDATE_PARTY %s updatetype: %u",
#endif
// GetPlayerInfo().c_str(), updateData.updateType); // GetPlayerInfo().c_str(), updateData.updateType);
WorldPacket data(SMSG_LFG_UPDATE_PARTY, 1 + 1 + (size > 0 ? 1 : 0) * (1 + 1 + 1 + 1 + 1 + size * 4 + updateData.comment.length())); WorldPacket data(SMSG_LFG_UPDATE_PARTY, 1 + 1 + (size > 0 ? 1 : 0) * (1 + 1 + 1 + 1 + 1 + size * 4 + updateData.comment.length()));
data << uint8(updateData.updateType); // Lfg Update type data << uint8(updateData.updateType); // Lfg Update type
@@ -378,7 +410,9 @@ void WorldSession::SendLfgUpdateParty(lfg::LfgUpdateData const& updateData)
void WorldSession::SendLfgRoleChosen(uint64 guid, uint8 roles) void WorldSession::SendLfgRoleChosen(uint64 guid, uint8 roles)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "SMSG_LFG_ROLE_CHOSEN [" UI64FMTD "] guid: [" UI64FMTD "] roles: %u", GetPlayer()->GetGUID(), guid, roles); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "SMSG_LFG_ROLE_CHOSEN [" UI64FMTD "] guid: [" UI64FMTD "] roles: %u", GetPlayer()->GetGUID(), guid, roles);
#endif
WorldPacket data(SMSG_LFG_ROLE_CHOSEN, 8 + 1 + 4); WorldPacket data(SMSG_LFG_ROLE_CHOSEN, 8 + 1 + 4);
data << uint64(guid); // Guid data << uint64(guid); // Guid
@@ -395,7 +429,9 @@ void WorldSession::SendLfgRoleCheckUpdate(lfg::LfgRoleCheck const& roleCheck)
else else
dungeons = roleCheck.dungeons; dungeons = roleCheck.dungeons;
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "SMSG_LFG_ROLE_CHECK_UPDATE [" UI64FMTD "]", GetPlayer()->GetGUID()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "SMSG_LFG_ROLE_CHECK_UPDATE [" UI64FMTD "]", GetPlayer()->GetGUID());
#endif
WorldPacket data(SMSG_LFG_ROLE_CHECK_UPDATE, 4 + 1 + 1 + dungeons.size() * 4 + 1 + roleCheck.roles.size() * (8 + 1 + 4 + 1)); WorldPacket data(SMSG_LFG_ROLE_CHECK_UPDATE, 4 + 1 + 1 + dungeons.size() * 4 + 1 + roleCheck.roles.size() * (8 + 1 + 4 + 1));
data << uint32(roleCheck.state); // Check result data << uint32(roleCheck.state); // Check result
@@ -440,7 +476,9 @@ void WorldSession::SendLfgJoinResult(lfg::LfgJoinResultData const& joinData)
for (lfg::LfgLockPartyMap::const_iterator it = joinData.lockmap.begin(); it != joinData.lockmap.end(); ++it) for (lfg::LfgLockPartyMap::const_iterator it = joinData.lockmap.begin(); it != joinData.lockmap.end(); ++it)
size += 8 + 4 + uint32(it->second.size()) * (4 + 4); size += 8 + 4 + uint32(it->second.size()) * (4 + 4);
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "SMSG_LFG_JOIN_RESULT [" UI64FMTD "] checkResult: %u checkValue: %u", GetPlayer()->GetGUID(), joinData.result, joinData.state); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "SMSG_LFG_JOIN_RESULT [" UI64FMTD "] checkResult: %u checkValue: %u", GetPlayer()->GetGUID(), joinData.result, joinData.state);
#endif
WorldPacket data(SMSG_LFG_JOIN_RESULT, 4 + 4 + size); WorldPacket data(SMSG_LFG_JOIN_RESULT, 4 + 4 + size);
data << uint32(joinData.result); // Check Result data << uint32(joinData.result); // Check Result
data << uint32(joinData.state); // Check Value data << uint32(joinData.state); // Check Value
@@ -451,7 +489,9 @@ void WorldSession::SendLfgJoinResult(lfg::LfgJoinResultData const& joinData)
void WorldSession::SendLfgQueueStatus(lfg::LfgQueueStatusData const& queueData) void WorldSession::SendLfgQueueStatus(lfg::LfgQueueStatusData const& queueData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "SMSG_LFG_QUEUE_STATUS [" UI64FMTD "] dungeon: %u - waitTime: %d - avgWaitTime: %d - waitTimeTanks: %d - waitTimeHealer: %d - waitTimeDps: %d - queuedTime: %u - tanks: %u - healers: %u - dps: %u", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "SMSG_LFG_QUEUE_STATUS [" UI64FMTD "] dungeon: %u - waitTime: %d - avgWaitTime: %d - waitTimeTanks: %d - waitTimeHealer: %d - waitTimeDps: %d - queuedTime: %u - tanks: %u - healers: %u - dps: %u",
#endif
// GetPlayer()->GetGUID(), queueData.dungeonId, queueData.waitTime, queueData.waitTimeAvg, queueData.waitTimeTank, queueData.waitTimeHealer, queueData.waitTimeDps, queueData.queuedTime, queueData.tanks, queueData.healers, queueData.dps); // GetPlayer()->GetGUID(), queueData.dungeonId, queueData.waitTime, queueData.waitTimeAvg, queueData.waitTimeTank, queueData.waitTimeHealer, queueData.waitTimeDps, queueData.queuedTime, queueData.tanks, queueData.healers, queueData.dps);
WorldPacket data(SMSG_LFG_QUEUE_STATUS, 4 + 4 + 4 + 4 + 4 +4 + 1 + 1 + 1 + 4); WorldPacket data(SMSG_LFG_QUEUE_STATUS, 4 + 4 + 4 + 4 + 4 +4 + 1 + 1 + 1 + 4);
@@ -518,7 +558,9 @@ void WorldSession::SendLfgBootProposalUpdate(lfg::LfgPlayerBoot const& boot)
++agreeNum; ++agreeNum;
} }
} }
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "SMSG_LFG_BOOT_PROPOSAL_UPDATE [" UI64FMTD "] inProgress: %u - didVote: %u - agree: %u - victim: [" UI64FMTD "] votes: %u - agrees: %u - left: %u - needed: %u - reason %s", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "SMSG_LFG_BOOT_PROPOSAL_UPDATE [" UI64FMTD "] inProgress: %u - didVote: %u - agree: %u - victim: [" UI64FMTD "] votes: %u - agrees: %u - left: %u - needed: %u - reason %s",
#endif
// guid, uint8(boot.inProgress), uint8(playerVote != lfg::LFG_ANSWER_PENDING), uint8(playerVote == lfg::LFG_ANSWER_AGREE), boot.victim, votesNum, agreeNum, secsleft, lfg::LFG_GROUP_KICK_VOTES_NEEDED, boot.reason.c_str()); // guid, uint8(boot.inProgress), uint8(playerVote != lfg::LFG_ANSWER_PENDING), uint8(playerVote == lfg::LFG_ANSWER_AGREE), boot.victim, votesNum, agreeNum, secsleft, lfg::LFG_GROUP_KICK_VOTES_NEEDED, boot.reason.c_str());
WorldPacket data(SMSG_LFG_BOOT_PROPOSAL_UPDATE, 1 + 1 + 1 + 8 + 4 + 4 + 4 + 4 + boot.reason.length()); WorldPacket data(SMSG_LFG_BOOT_PROPOSAL_UPDATE, 1 + 1 + 1 + 8 + 4 + 4 + 4 + 4 + boot.reason.length());
data << uint8(boot.inProgress); // Vote in progress data << uint8(boot.inProgress); // Vote in progress
@@ -540,7 +582,9 @@ void WorldSession::SendLfgUpdateProposal(lfg::LfgProposal const& proposal)
bool silent = !proposal.isNew && gguid == proposal.group; bool silent = !proposal.isNew && gguid == proposal.group;
uint32 dungeonEntry = proposal.dungeonId; uint32 dungeonEntry = proposal.dungeonId;
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "SMSG_LFG_PROPOSAL_UPDATE [" UI64FMTD "] state: %u", guid, proposal.state); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "SMSG_LFG_PROPOSAL_UPDATE [" UI64FMTD "] state: %u", guid, proposal.state);
#endif
// show random dungeon if player selected random dungeon and it's not lfg group // show random dungeon if player selected random dungeon and it's not lfg group
if (!silent) if (!silent)
@@ -583,7 +627,9 @@ void WorldSession::SendLfgUpdateProposal(lfg::LfgProposal const& proposal)
void WorldSession::SendLfgLfrList(bool update) void WorldSession::SendLfgLfrList(bool update)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "SMSG_LFG_LFR_LIST [" UI64FMTD "] update: %u", GetPlayer()->GetGUID(), update ? 1 : 0); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "SMSG_LFG_LFR_LIST [" UI64FMTD "] update: %u", GetPlayer()->GetGUID(), update ? 1 : 0);
#endif
WorldPacket data(SMSG_LFG_UPDATE_SEARCH, 1); WorldPacket data(SMSG_LFG_UPDATE_SEARCH, 1);
data << uint8(update); // In Lfg Queue? data << uint8(update); // In Lfg Queue?
SendPacket(&data); SendPacket(&data);
@@ -591,14 +637,18 @@ void WorldSession::SendLfgLfrList(bool update)
void WorldSession::SendLfgDisabled() void WorldSession::SendLfgDisabled()
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "SMSG_LFG_DISABLED [" UI64FMTD "]", GetPlayer()->GetGUID()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "SMSG_LFG_DISABLED [" UI64FMTD "]", GetPlayer()->GetGUID());
#endif
WorldPacket data(SMSG_LFG_DISABLED, 0); WorldPacket data(SMSG_LFG_DISABLED, 0);
SendPacket(&data); SendPacket(&data);
} }
void WorldSession::SendLfgOfferContinue(uint32 dungeonEntry) void WorldSession::SendLfgOfferContinue(uint32 dungeonEntry)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "SMSG_LFG_OFFER_CONTINUE [" UI64FMTD "] dungeon entry: %u", GetPlayer()->GetGUID(), dungeonEntry); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "SMSG_LFG_OFFER_CONTINUE [" UI64FMTD "] dungeon entry: %u", GetPlayer()->GetGUID(), dungeonEntry);
#endif
WorldPacket data(SMSG_LFG_OFFER_CONTINUE, 4); WorldPacket data(SMSG_LFG_OFFER_CONTINUE, 4);
data << uint32(dungeonEntry); data << uint32(dungeonEntry);
SendPacket(&data); SendPacket(&data);
@@ -606,7 +656,9 @@ void WorldSession::SendLfgOfferContinue(uint32 dungeonEntry)
void WorldSession::SendLfgTeleportError(uint8 err) void WorldSession::SendLfgTeleportError(uint8 err)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "SMSG_LFG_TELEPORT_DENIED [" UI64FMTD "] reason: %u", GetPlayer()->GetGUID(), err); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "SMSG_LFG_TELEPORT_DENIED [" UI64FMTD "] reason: %u", GetPlayer()->GetGUID(), err);
#endif
WorldPacket data(SMSG_LFG_TELEPORT_DENIED, 4); WorldPacket data(SMSG_LFG_TELEPORT_DENIED, 4);
data << uint32(err); // Error data << uint32(err); // Error
SendPacket(&data); SendPacket(&data);
src/game/Handlers/LootHandler.cpp
+21 -7
View File
@@ -23,7 +23,9 @@
void WorldSession::HandleAutostoreLootItemOpcode(WorldPacket& recvData) void WorldSession::HandleAutostoreLootItemOpcode(WorldPacket& recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_AUTOSTORE_LOOT_ITEM"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_AUTOSTORE_LOOT_ITEM");
#endif
Player* player = GetPlayer(); Player* player = GetPlayer();
uint64 lguid = player->GetLootGUID(); uint64 lguid = player->GetLootGUID();
Loot* loot = NULL; Loot* loot = NULL;
@@ -93,7 +95,9 @@ void WorldSession::HandleAutostoreLootItemOpcode(WorldPacket& recvData)
void WorldSession::HandleLootMoneyOpcode(WorldPacket & /*recvData*/) void WorldSession::HandleLootMoneyOpcode(WorldPacket & /*recvData*/)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_LOOT_MONEY"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_LOOT_MONEY");
#endif
Player* player = GetPlayer(); Player* player = GetPlayer();
uint64 guid = player->GetLootGUID(); uint64 guid = player->GetLootGUID();
@@ -211,7 +215,9 @@ void WorldSession::HandleLootMoneyOpcode(WorldPacket & /*recvData*/)
void WorldSession::HandleLootOpcode(WorldPacket& recvData) void WorldSession::HandleLootOpcode(WorldPacket& recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_LOOT"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_LOOT");
#endif
uint64 guid; uint64 guid;
recvData >> guid; recvData >> guid;
@@ -229,7 +235,9 @@ void WorldSession::HandleLootOpcode(WorldPacket& recvData)
void WorldSession::HandleLootReleaseOpcode(WorldPacket& recvData) void WorldSession::HandleLootReleaseOpcode(WorldPacket& recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_LOOT_RELEASE"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_LOOT_RELEASE");
#endif
// cheaters can modify lguid to prevent correct apply loot release code and re-loot // cheaters can modify lguid to prevent correct apply loot release code and re-loot
// use internal stored guid // use internal stored guid
@@ -288,7 +296,9 @@ void WorldSession::DoLootRelease(uint64 lguid)
// Xinef: prevents exploits with just opening GO and spawning bilions of npcs, which can crash core if you know what you're doin ;) // Xinef: prevents exploits with just opening GO and spawning bilions of npcs, which can crash core if you know what you're doin ;)
if (go->GetGoType() == GAMEOBJECT_TYPE_CHEST && go->GetGOInfo()->chest.eventId) if (go->GetGoType() == GAMEOBJECT_TYPE_CHEST && go->GetGOInfo()->chest.eventId)
{ {
;//sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "Chest ScriptStart id %u for GO %u", gameObjTarget->GetGOInfo()->chest.eventId, gameObjTarget->GetDBTableGUIDLow()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "Chest ScriptStart id %u for GO %u", gameObjTarget->GetGOInfo()->chest.eventId, gameObjTarget->GetDBTableGUIDLow());
#endif
player->GetMap()->ScriptsStart(sEventScripts, go->GetGOInfo()->chest.eventId, player, go); player->GetMap()->ScriptsStart(sEventScripts, go->GetGOInfo()->chest.eventId, player, go);
} }
} }
@@ -409,7 +419,9 @@ void WorldSession::HandleLootMasterGiveOpcode(WorldPacket& recvData)
return; return;
} }
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WorldSession::HandleLootMasterGiveOpcode (CMSG_LOOT_MASTER_GIVE, 0x02A3) Target = [%s].", target->GetName().c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WorldSession::HandleLootMasterGiveOpcode (CMSG_LOOT_MASTER_GIVE, 0x02A3) Target = [%s].", target->GetName().c_str());
#endif
if (_player->GetLootGUID() != lootguid) if (_player->GetLootGUID() != lootguid)
{ {
@@ -448,7 +460,9 @@ void WorldSession::HandleLootMasterGiveOpcode(WorldPacket& recvData)
if (slotid >= loot->items.size() + loot->quest_items.size()) if (slotid >= loot->items.size() + loot->quest_items.size())
{ {
;//sLog->outDebug(LOG_FILTER_LOOT, "MasterLootItem: Player %s might be using a hack! (slot %d, size %lu)", GetPlayer()->GetName().c_str(), slotid, (unsigned long)loot->items.size()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_LOOT, "MasterLootItem: Player %s might be using a hack! (slot %d, size %lu)", GetPlayer()->GetName().c_str(), slotid, (unsigned long)loot->items.size());
#endif
return; return;
} }
src/game/Handlers/MailHandler.cpp
+9 -3
View File
@@ -101,13 +101,17 @@ void WorldSession::HandleSendMail(WorldPacket & recvData)
if (!rc) if (!rc)
{ {
;//sLog->outDetail("Player %u is sending mail to %s (GUID: not existed!) with subject %s and body %s includes %u items, %u copper and %u COD copper with unk1 = %u, unk2 = %u", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("Player %u is sending mail to %s (GUID: not existed!) with subject %s and body %s includes %u items, %u copper and %u COD copper with unk1 = %u, unk2 = %u",
#endif
// player->GetGUIDLow(), receiver.c_str(), subject.c_str(), body.c_str(), items_count, money, COD, unk1, unk2); // player->GetGUIDLow(), receiver.c_str(), subject.c_str(), body.c_str(), items_count, money, COD, unk1, unk2);
player->SendMailResult(0, MAIL_SEND, MAIL_ERR_RECIPIENT_NOT_FOUND); player->SendMailResult(0, MAIL_SEND, MAIL_ERR_RECIPIENT_NOT_FOUND);
return; return;
} }
;//sLog->outDetail("Player %u is sending mail to %s (GUID: %u) with subject %s and body %s includes %u items, %u copper and %u COD copper with unk1 = %u, unk2 = %u", player->GetGUIDLow(), receiver.c_str(), GUID_LOPART(rc), subject.c_str(), body.c_str(), items_count, money, COD, unk1, unk2); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("Player %u is sending mail to %s (GUID: %u) with subject %s and body %s includes %u items, %u copper and %u COD copper with unk1 = %u, unk2 = %u", player->GetGUIDLow(), receiver.c_str(), GUID_LOPART(rc), subject.c_str(), body.c_str(), items_count, money, COD, unk1, unk2);
#endif
if (player->GetGUID() == rc) if (player->GetGUID() == rc)
{ {
@@ -718,7 +722,9 @@ void WorldSession::HandleMailCreateTextItem(WorldPacket & recvData)
bodyItem->SetUInt32Value(ITEM_FIELD_CREATOR, m->sender); bodyItem->SetUInt32Value(ITEM_FIELD_CREATOR, m->sender);
bodyItem->SetFlag(ITEM_FIELD_FLAGS, ITEM_FLAG_MAIL_TEXT_MASK); bodyItem->SetFlag(ITEM_FIELD_FLAGS, ITEM_FLAG_MAIL_TEXT_MASK);
;//sLog->outDetail("HandleMailCreateTextItem mailid=%u", mailId); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("HandleMailCreateTextItem mailid=%u", mailId);
#endif
ItemPosCountVec dest; ItemPosCountVec dest;
uint8 msg = _player->CanStoreItem(NULL_BAG, NULL_SLOT, dest, bodyItem, false); uint8 msg = _player->CanStoreItem(NULL_BAG, NULL_SLOT, dest, bodyItem, false);
src/game/Handlers/MiscHandler.cpp
+240 -80
View File
@@ -46,7 +46,9 @@
void WorldSession::HandleRepopRequestOpcode(WorldPacket & recv_data) void WorldSession::HandleRepopRequestOpcode(WorldPacket & recv_data)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Recvd CMSG_REPOP_REQUEST Message"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Recvd CMSG_REPOP_REQUEST Message");
#endif
recv_data.read_skip<uint8>(); recv_data.read_skip<uint8>();
@@ -63,7 +65,9 @@ void WorldSession::HandleRepopRequestOpcode(WorldPacket & recv_data)
// release spirit after he's killed but before he is updated // release spirit after he's killed but before he is updated
if (GetPlayer()->getDeathState() == JUST_DIED) if (GetPlayer()->getDeathState() == JUST_DIED)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "HandleRepopRequestOpcode: got request after player %s(%d) was killed and before he was updated", GetPlayer()->GetName().c_str(), GetPlayer()->GetGUIDLow()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "HandleRepopRequestOpcode: got request after player %s(%d) was killed and before he was updated", GetPlayer()->GetName().c_str(), GetPlayer()->GetGUIDLow());
#endif
GetPlayer()->KillPlayer(); GetPlayer()->KillPlayer();
} }
@@ -75,7 +79,9 @@ void WorldSession::HandleRepopRequestOpcode(WorldPacket & recv_data)
void WorldSession::HandleGossipSelectOptionOpcode(WorldPacket & recv_data) void WorldSession::HandleGossipSelectOptionOpcode(WorldPacket & recv_data)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_GOSSIP_SELECT_OPTION"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_GOSSIP_SELECT_OPTION");
#endif
uint32 gossipListId; uint32 gossipListId;
uint32 menuId; uint32 menuId;
@@ -95,7 +101,9 @@ void WorldSession::HandleGossipSelectOptionOpcode(WorldPacket & recv_data)
unit = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_NONE); unit = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_NONE);
if (!unit) if (!unit)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandleGossipSelectOptionOpcode - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(guid))); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandleGossipSelectOptionOpcode - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(guid)));
#endif
return; return;
} }
} }
@@ -104,7 +112,9 @@ void WorldSession::HandleGossipSelectOptionOpcode(WorldPacket & recv_data)
go = _player->GetMap()->GetGameObject(guid); go = _player->GetMap()->GetGameObject(guid);
if (!go) if (!go)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandleGossipSelectOptionOpcode - GameObject (GUID: %u) not found.", uint32(GUID_LOPART(guid))); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandleGossipSelectOptionOpcode - GameObject (GUID: %u) not found.", uint32(GUID_LOPART(guid)));
#endif
return; return;
} }
} }
@@ -127,7 +137,9 @@ void WorldSession::HandleGossipSelectOptionOpcode(WorldPacket & recv_data)
} }
else else
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandleGossipSelectOptionOpcode - unsupported GUID type for highguid %u. lowpart %u.", uint32(GUID_HIPART(guid)), uint32(GUID_LOPART(guid))); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandleGossipSelectOptionOpcode - unsupported GUID type for highguid %u. lowpart %u.", uint32(GUID_HIPART(guid)), uint32(GUID_LOPART(guid)));
#endif
return; return;
} }
@@ -137,7 +149,9 @@ void WorldSession::HandleGossipSelectOptionOpcode(WorldPacket & recv_data)
if ((unit && unit->GetCreatureTemplate()->ScriptID != unit->LastUsedScriptID) || (go && go->GetGOInfo()->ScriptId != go->LastUsedScriptID)) if ((unit && unit->GetCreatureTemplate()->ScriptID != unit->LastUsedScriptID) || (go && go->GetGOInfo()->ScriptId != go->LastUsedScriptID))
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandleGossipSelectOptionOpcode - Script reloaded while in use, ignoring and set new scipt id"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandleGossipSelectOptionOpcode - Script reloaded while in use, ignoring and set new scipt id");
#endif
if (unit) if (unit)
unit->LastUsedScriptID = unit->GetCreatureTemplate()->ScriptID; unit->LastUsedScriptID = unit->GetCreatureTemplate()->ScriptID;
if (go) if (go)
@@ -393,7 +407,9 @@ void WorldSession::HandleWhoOpcode(WorldPacket& recvData)
void WorldSession::HandleLogoutRequestOpcode(WorldPacket & /*recv_data*/) void WorldSession::HandleLogoutRequestOpcode(WorldPacket & /*recv_data*/)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Recvd CMSG_LOGOUT_REQUEST Message, security - %u", GetSecurity()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Recvd CMSG_LOGOUT_REQUEST Message, security - %u", GetSecurity());
#endif
if (uint64 lguid = GetPlayer()->GetLootGUID()) if (uint64 lguid = GetPlayer()->GetLootGUID())
DoLootRelease(lguid); DoLootRelease(lguid);
@@ -447,7 +463,9 @@ void WorldSession::HandleLogoutRequestOpcode(WorldPacket & /*recv_data*/)
void WorldSession::HandlePlayerLogoutOpcode(WorldPacket & /*recv_data*/) void WorldSession::HandlePlayerLogoutOpcode(WorldPacket & /*recv_data*/)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Recvd CMSG_PLAYER_LOGOUT Message"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Recvd CMSG_PLAYER_LOGOUT Message");
#endif
} }
void WorldSession::HandleLogoutCancelOpcode(WorldPacket & /*recv_data*/) void WorldSession::HandleLogoutCancelOpcode(WorldPacket & /*recv_data*/)
@@ -496,7 +514,9 @@ void WorldSession::HandleZoneUpdateOpcode(WorldPacket & recv_data)
uint32 newZone; uint32 newZone;
recv_data >> newZone; recv_data >> newZone;
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Recvd ZONE_UPDATE: %u", newZone); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Recvd ZONE_UPDATE: %u", newZone);
#endif
// use server size data // use server size data
uint32 newzone, newarea; uint32 newzone, newarea;
@@ -515,7 +535,9 @@ void WorldSession::HandleSetSelectionOpcode(WorldPacket & recv_data)
void WorldSession::HandleStandStateChangeOpcode(WorldPacket & recv_data) void WorldSession::HandleStandStateChangeOpcode(WorldPacket & recv_data)
{ {
// ;//sLog->outDebug(LOG_FILTER_PACKETIO, "WORLD: Received CMSG_STANDSTATECHANGE"); -- too many spam in log at lags/debug stop #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
// sLog->outDebug(LOG_FILTER_PACKETIO, "WORLD: Received CMSG_STANDSTATECHANGE"); -- too many spam in log at lags/debug stop
#endif
uint32 animstate; uint32 animstate;
recv_data >> animstate; recv_data >> animstate;
@@ -526,13 +548,17 @@ void WorldSession::HandleContactListOpcode(WorldPacket & recv_data)
{ {
uint32 unk; uint32 unk;
recv_data >> unk; recv_data >> unk;
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_CONTACT_LIST - Unk: %d", unk); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_CONTACT_LIST - Unk: %d", unk);
#endif
_player->GetSocial()->SendSocialList(_player); _player->GetSocial()->SendSocialList(_player);
} }
void WorldSession::HandleAddFriendOpcode(WorldPacket & recv_data) void WorldSession::HandleAddFriendOpcode(WorldPacket & recv_data)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_ADD_FRIEND"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_ADD_FRIEND");
#endif
std::string friendName = GetTrinityString(LANG_FRIEND_IGNORE_UNKNOWN); std::string friendName = GetTrinityString(LANG_FRIEND_IGNORE_UNKNOWN);
std::string friendNote; std::string friendNote;
@@ -544,7 +570,9 @@ void WorldSession::HandleAddFriendOpcode(WorldPacket & recv_data)
if (!normalizePlayerName(friendName)) if (!normalizePlayerName(friendName))
return; return;
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: %s asked to add friend : '%s'", GetPlayer()->GetName().c_str(), friendName.c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: %s asked to add friend : '%s'", GetPlayer()->GetName().c_str(), friendName.c_str());
#endif
// xinef: Get Data From global storage // xinef: Get Data From global storage
uint32 guidLow = sWorld->GetGlobalPlayerGUID(friendName); uint32 guidLow = sWorld->GetGlobalPlayerGUID(friendName);
@@ -580,7 +608,9 @@ void WorldSession::HandleAddFriendOpcode(WorldPacket & recv_data)
if (!GetPlayer()->GetSocial()->AddToSocialList(guidLow, false)) if (!GetPlayer()->GetSocial()->AddToSocialList(guidLow, false))
{ {
friendResult = FRIEND_LIST_FULL; friendResult = FRIEND_LIST_FULL;
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: %s's friend list is full.", GetPlayer()->GetName().c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: %s's friend list is full.", GetPlayer()->GetName().c_str());
#endif
} }
} }
GetPlayer()->GetSocial()->SetFriendNote(guidLow, friendNote); GetPlayer()->GetSocial()->SetFriendNote(guidLow, friendNote);
@@ -589,14 +619,18 @@ void WorldSession::HandleAddFriendOpcode(WorldPacket & recv_data)
sSocialMgr->SendFriendStatus(GetPlayer(), friendResult, guidLow, false); sSocialMgr->SendFriendStatus(GetPlayer(), friendResult, guidLow, false);
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Sent (SMSG_FRIEND_STATUS)"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Sent (SMSG_FRIEND_STATUS)");
#endif
} }
void WorldSession::HandleDelFriendOpcode(WorldPacket & recv_data) void WorldSession::HandleDelFriendOpcode(WorldPacket & recv_data)
{ {
uint64 FriendGUID; uint64 FriendGUID;
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_DEL_FRIEND"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_DEL_FRIEND");
#endif
recv_data >> FriendGUID; recv_data >> FriendGUID;
@@ -604,12 +638,16 @@ void WorldSession::HandleDelFriendOpcode(WorldPacket & recv_data)
sSocialMgr->SendFriendStatus(GetPlayer(), FRIEND_REMOVED, GUID_LOPART(FriendGUID), false); sSocialMgr->SendFriendStatus(GetPlayer(), FRIEND_REMOVED, GUID_LOPART(FriendGUID), false);
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Sent motd (SMSG_FRIEND_STATUS)"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Sent motd (SMSG_FRIEND_STATUS)");
#endif
} }
void WorldSession::HandleAddIgnoreOpcode(WorldPacket & recv_data) void WorldSession::HandleAddIgnoreOpcode(WorldPacket & recv_data)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_ADD_IGNORE"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_ADD_IGNORE");
#endif
std::string ignoreName = GetTrinityString(LANG_FRIEND_IGNORE_UNKNOWN); std::string ignoreName = GetTrinityString(LANG_FRIEND_IGNORE_UNKNOWN);
@@ -618,7 +656,9 @@ void WorldSession::HandleAddIgnoreOpcode(WorldPacket & recv_data)
if (!normalizePlayerName(ignoreName)) if (!normalizePlayerName(ignoreName))
return; return;
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: %s asked to Ignore: '%s'", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: %s asked to Ignore: '%s'",
#endif
// GetPlayer()->GetName().c_str(), ignoreName.c_str()); // GetPlayer()->GetName().c_str(), ignoreName.c_str());
uint32 lowGuid = sWorld->GetGlobalPlayerGUID(ignoreName); uint32 lowGuid = sWorld->GetGlobalPlayerGUID(ignoreName);
@@ -643,7 +683,9 @@ void WorldSession::HandleAddIgnoreOpcode(WorldPacket & recv_data)
sSocialMgr->SendFriendStatus(GetPlayer(), ignoreResult, lowGuid, false); sSocialMgr->SendFriendStatus(GetPlayer(), ignoreResult, lowGuid, false);
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Sent (SMSG_FRIEND_STATUS)"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Sent (SMSG_FRIEND_STATUS)");
#endif
} }
void WorldSession::HandleLoadActionsSwitchSpec(PreparedQueryResult result) void WorldSession::HandleLoadActionsSwitchSpec(PreparedQueryResult result)
@@ -688,7 +730,9 @@ void WorldSession::HandleDelIgnoreOpcode(WorldPacket & recv_data)
{ {
uint64 IgnoreGUID; uint64 IgnoreGUID;
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_DEL_IGNORE"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_DEL_IGNORE");
#endif
recv_data >> IgnoreGUID; recv_data >> IgnoreGUID;
@@ -696,12 +740,16 @@ void WorldSession::HandleDelIgnoreOpcode(WorldPacket & recv_data)
sSocialMgr->SendFriendStatus(GetPlayer(), FRIEND_IGNORE_REMOVED, GUID_LOPART(IgnoreGUID), false); sSocialMgr->SendFriendStatus(GetPlayer(), FRIEND_IGNORE_REMOVED, GUID_LOPART(IgnoreGUID), false);
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Sent motd (SMSG_FRIEND_STATUS)"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Sent motd (SMSG_FRIEND_STATUS)");
#endif
} }
void WorldSession::HandleSetContactNotesOpcode(WorldPacket & recv_data) void WorldSession::HandleSetContactNotesOpcode(WorldPacket & recv_data)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_SET_CONTACT_NOTES"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_SET_CONTACT_NOTES");
#endif
uint64 guid; uint64 guid;
std::string note; std::string note;
recv_data >> guid >> note; recv_data >> guid >> note;
@@ -718,12 +766,20 @@ void WorldSession::HandleBugOpcode(WorldPacket & recv_data)
recv_data >> typelen >> type; recv_data >> typelen >> type;
if (suggestion == 0) if (suggestion == 0)
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_BUG [Bug Report]"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_BUG [Bug Report]");
#endif
else else
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_BUG [Suggestion]"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_BUG [Suggestion]");
#endif
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "%s", type.c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "%s", content.c_str()); sLog->outDebug(LOG_FILTER_NETWORKIO, "%s", type.c_str());
#endif
#ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "%s", content.c_str());
#endif
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_INS_BUG_REPORT); PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_INS_BUG_REPORT);
@@ -735,7 +791,9 @@ void WorldSession::HandleBugOpcode(WorldPacket & recv_data)
void WorldSession::HandleReclaimCorpseOpcode(WorldPacket &recv_data) void WorldSession::HandleReclaimCorpseOpcode(WorldPacket &recv_data)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_RECLAIM_CORPSE"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_RECLAIM_CORPSE");
#endif
uint64 guid; uint64 guid;
recv_data >> guid; recv_data >> guid;
@@ -772,7 +830,9 @@ void WorldSession::HandleReclaimCorpseOpcode(WorldPacket &recv_data)
void WorldSession::HandleResurrectResponseOpcode(WorldPacket & recv_data) void WorldSession::HandleResurrectResponseOpcode(WorldPacket & recv_data)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_RESURRECT_RESPONSE"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_RESURRECT_RESPONSE");
#endif
uint64 guid; uint64 guid;
uint8 status; uint8 status;
@@ -817,12 +877,16 @@ void WorldSession::HandleAreaTriggerOpcode(WorldPacket& recv_data)
uint32 triggerId; uint32 triggerId;
recv_data >> triggerId; recv_data >> triggerId;
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_AREATRIGGER. Trigger ID: %u", triggerId); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_AREATRIGGER. Trigger ID: %u", triggerId);
#endif
Player* player = GetPlayer(); Player* player = GetPlayer();
if (player->IsInFlight()) if (player->IsInFlight())
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "HandleAreaTriggerOpcode: Player '%s' (GUID: %u) in flight, ignore Area Trigger ID:%u", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "HandleAreaTriggerOpcode: Player '%s' (GUID: %u) in flight, ignore Area Trigger ID:%u",
#endif
// player->GetName().c_str(), player->GetGUIDLow(), triggerId); // player->GetName().c_str(), player->GetGUIDLow(), triggerId);
return; return;
} }
@@ -830,14 +894,18 @@ void WorldSession::HandleAreaTriggerOpcode(WorldPacket& recv_data)
AreaTriggerEntry const* atEntry = sAreaTriggerStore.LookupEntry(triggerId); AreaTriggerEntry const* atEntry = sAreaTriggerStore.LookupEntry(triggerId);
if (!atEntry) if (!atEntry)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "HandleAreaTriggerOpcode: Player '%s' (GUID: %u) send unknown (by DBC) Area Trigger ID:%u", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "HandleAreaTriggerOpcode: Player '%s' (GUID: %u) send unknown (by DBC) Area Trigger ID:%u",
#endif
// player->GetName().c_str(), player->GetGUIDLow(), triggerId); // player->GetName().c_str(), player->GetGUIDLow(), triggerId);
return; return;
} }
if (!player->IsInAreaTriggerRadius(atEntry)) if (!player->IsInAreaTriggerRadius(atEntry))
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "HandleAreaTriggerOpcode: Player '%s' (GUID: %u) too far (trigger map: %u player map: %u), ignore Area Trigger ID: %u", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "HandleAreaTriggerOpcode: Player '%s' (GUID: %u) too far (trigger map: %u player map: %u), ignore Area Trigger ID: %u",
#endif
// player->GetName().c_str(), atEntry->mapid, player->GetMapId(), player->GetGUIDLow(), triggerId); // player->GetName().c_str(), atEntry->mapid, player->GetMapId(), player->GetGUIDLow(), triggerId);
return; return;
} }
@@ -896,12 +964,16 @@ void WorldSession::HandleAreaTriggerOpcode(WorldPacket& recv_data)
void WorldSession::HandleUpdateAccountData(WorldPacket &recv_data) void WorldSession::HandleUpdateAccountData(WorldPacket &recv_data)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_UPDATE_ACCOUNT_DATA"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_UPDATE_ACCOUNT_DATA");
#endif
uint32 type, timestamp, decompressedSize; uint32 type, timestamp, decompressedSize;
recv_data >> type >> timestamp >> decompressedSize; recv_data >> type >> timestamp >> decompressedSize;
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "UAD: type %u, time %u, decompressedSize %u", type, timestamp, decompressedSize); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "UAD: type %u, time %u, decompressedSize %u", type, timestamp, decompressedSize);
#endif
if (type > NUM_ACCOUNT_DATA_TYPES) if (type > NUM_ACCOUNT_DATA_TYPES)
return; return;
@@ -951,12 +1023,16 @@ void WorldSession::HandleUpdateAccountData(WorldPacket &recv_data)
void WorldSession::HandleRequestAccountData(WorldPacket& recv_data) void WorldSession::HandleRequestAccountData(WorldPacket& recv_data)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_REQUEST_ACCOUNT_DATA"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_REQUEST_ACCOUNT_DATA");
#endif
uint32 type; uint32 type;
recv_data >> type; recv_data >> type;
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "RAD: type %u", type); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "RAD: type %u", type);
#endif
if (type >= NUM_ACCOUNT_DATA_TYPES) if (type >= NUM_ACCOUNT_DATA_TYPES)
return; return;
@@ -972,7 +1048,9 @@ void WorldSession::HandleRequestAccountData(WorldPacket& recv_data)
if (size && compress(dest.contents(), &destSize, (uint8 const*)adata->Data.c_str(), size) != Z_OK) if (size && compress(dest.contents(), &destSize, (uint8 const*)adata->Data.c_str(), size) != Z_OK)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "RAD: Failed to compress account data"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "RAD: Failed to compress account data");
#endif
return; return;
} }
@@ -989,7 +1067,9 @@ void WorldSession::HandleRequestAccountData(WorldPacket& recv_data)
void WorldSession::HandleSetActionButtonOpcode(WorldPacket& recv_data) void WorldSession::HandleSetActionButtonOpcode(WorldPacket& recv_data)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_SET_ACTION_BUTTON"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_SET_ACTION_BUTTON");
#endif
uint8 button; uint8 button;
uint32 packetData; uint32 packetData;
recv_data >> button >> packetData; recv_data >> button >> packetData;
@@ -997,10 +1077,14 @@ void WorldSession::HandleSetActionButtonOpcode(WorldPacket& recv_data)
uint32 action = ACTION_BUTTON_ACTION(packetData); uint32 action = ACTION_BUTTON_ACTION(packetData);
uint8 type = ACTION_BUTTON_TYPE(packetData); uint8 type = ACTION_BUTTON_TYPE(packetData);
;//sLog->outDetail("BUTTON: %u ACTION: %u TYPE: %u", button, action, type); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("BUTTON: %u ACTION: %u TYPE: %u", button, action, type);
#endif
if (!packetData) if (!packetData)
{ {
;//sLog->outDetail("MISC: Remove action from button %u", button); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("MISC: Remove action from button %u", button);
#endif
GetPlayer()->removeActionButton(button); GetPlayer()->removeActionButton(button);
} }
else else
@@ -1009,16 +1093,24 @@ void WorldSession::HandleSetActionButtonOpcode(WorldPacket& recv_data)
{ {
case ACTION_BUTTON_MACRO: case ACTION_BUTTON_MACRO:
case ACTION_BUTTON_CMACRO: case ACTION_BUTTON_CMACRO:
;//sLog->outDetail("MISC: Added Macro %u into button %u", action, button); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("MISC: Added Macro %u into button %u", action, button);
#endif
break; break;
case ACTION_BUTTON_EQSET: case ACTION_BUTTON_EQSET:
;//sLog->outDetail("MISC: Added EquipmentSet %u into button %u", action, button); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("MISC: Added EquipmentSet %u into button %u", action, button);
#endif
break; break;
case ACTION_BUTTON_SPELL: case ACTION_BUTTON_SPELL:
;//sLog->outDetail("MISC: Added Spell %u into button %u", action, button); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("MISC: Added Spell %u into button %u", action, button);
#endif
break; break;
case ACTION_BUTTON_ITEM: case ACTION_BUTTON_ITEM:
;//sLog->outDetail("MISC: Added Item %u into button %u", action, button); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("MISC: Added Item %u into button %u", action, button);
#endif
break; break;
default: default:
sLog->outError("MISC: Unknown action button type %u for action %u into button %u for player %s (GUID: %u)", type, action, button, _player->GetName().c_str(), _player->GetGUIDLow()); sLog->outError("MISC: Unknown action button type %u for action %u into button %u for player %s (GUID: %u)", type, action, button, _player->GetName().c_str(), _player->GetGUIDLow());
@@ -1030,12 +1122,16 @@ void WorldSession::HandleSetActionButtonOpcode(WorldPacket& recv_data)
void WorldSession::HandleCompleteCinematic(WorldPacket & /*recv_data*/) void WorldSession::HandleCompleteCinematic(WorldPacket & /*recv_data*/)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_COMPLETE_CINEMATIC"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_COMPLETE_CINEMATIC");
#endif
} }
void WorldSession::HandleNextCinematicCamera(WorldPacket & /*recv_data*/) void WorldSession::HandleNextCinematicCamera(WorldPacket & /*recv_data*/)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_NEXT_CINEMATIC_CAMERA"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_NEXT_CINEMATIC_CAMERA");
#endif
} }
void WorldSession::HandleMoveTimeSkippedOpcode(WorldPacket & recv_data) void WorldSession::HandleMoveTimeSkippedOpcode(WorldPacket & recv_data)
@@ -1048,7 +1144,9 @@ void WorldSession::HandleMoveTimeSkippedOpcode(WorldPacket & recv_data)
void WorldSession::HandleFeatherFallAck(WorldPacket &recv_data) void WorldSession::HandleFeatherFallAck(WorldPacket &recv_data)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_MOVE_FEATHER_FALL_ACK"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_MOVE_FEATHER_FALL_ACK");
#endif
// no used // no used
recv_data.rfinish(); // prevent warnings spam recv_data.rfinish(); // prevent warnings spam
@@ -1069,7 +1167,9 @@ void WorldSession::HandleMoveUnRootAck(WorldPacket& recv_data)
return; return;
} }
;//sLog->outDebug(LOG_FILTER_PACKETIO, "WORLD: CMSG_FORCE_MOVE_UNROOT_ACK"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_PACKETIO, "WORLD: CMSG_FORCE_MOVE_UNROOT_ACK");
#endif
recv_data.read_skip<uint32>(); // unk recv_data.read_skip<uint32>(); // unk
@@ -1095,7 +1195,9 @@ void WorldSession::HandleMoveRootAck(WorldPacket& recv_data)
return; return;
} }
;//sLog->outDebug(LOG_FILTER_PACKETIO, "WORLD: CMSG_FORCE_MOVE_ROOT_ACK"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_PACKETIO, "WORLD: CMSG_FORCE_MOVE_ROOT_ACK");
#endif
recv_data.read_skip<uint32>(); // unk recv_data.read_skip<uint32>(); // unk
@@ -1137,12 +1239,16 @@ void WorldSession::HandleInspectOpcode(WorldPacket& recv_data)
uint64 guid; uint64 guid;
recv_data >> guid; recv_data >> guid;
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_INSPECT"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_INSPECT");
#endif
Player* player = ObjectAccessor::GetPlayer(*_player, guid); Player* player = ObjectAccessor::GetPlayer(*_player, guid);
if (!player) if (!player)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_INSPECT: No player found from GUID: " UI64FMTD, guid); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_INSPECT: No player found from GUID: " UI64FMTD, guid);
#endif
return; return;
} }
@@ -1174,7 +1280,9 @@ void WorldSession::HandleInspectHonorStatsOpcode(WorldPacket& recv_data)
Player* player = ObjectAccessor::GetPlayer(*_player, guid); Player* player = ObjectAccessor::GetPlayer(*_player, guid);
if (!player) if (!player)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "MSG_INSPECT_HONOR_STATS: No player found from GUID: " UI64FMTD, guid); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "MSG_INSPECT_HONOR_STATS: No player found from GUID: " UI64FMTD, guid);
#endif
return; return;
} }
@@ -1204,15 +1312,21 @@ void WorldSession::HandleWorldTeleportOpcode(WorldPacket& recv_data)
recv_data >> PositionZ; recv_data >> PositionZ;
recv_data >> Orientation; // o (3.141593 = 180 degrees) recv_data >> Orientation; // o (3.141593 = 180 degrees)
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_WORLD_TELEPORT"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_WORLD_TELEPORT");
#endif
if (GetPlayer()->IsInFlight()) if (GetPlayer()->IsInFlight())
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "Player '%s' (GUID: %u) in flight, ignore worldport command.", GetPlayer()->GetName().c_str(), GetPlayer()->GetGUIDLow()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "Player '%s' (GUID: %u) in flight, ignore worldport command.", GetPlayer()->GetName().c_str(), GetPlayer()->GetGUIDLow());
#endif
return; return;
} }
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_WORLD_TELEPORT: Player = %s, Time = %u, map = %u, x = %f, y = %f, z = %f, o = %f", GetPlayer()->GetName().c_str(), time, mapid, PositionX, PositionY, PositionZ, Orientation); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_WORLD_TELEPORT: Player = %s, Time = %u, map = %u, x = %f, y = %f, z = %f, o = %f", GetPlayer()->GetName().c_str(), time, mapid, PositionX, PositionY, PositionZ, Orientation);
#endif
if (AccountMgr::IsAdminAccount(GetSecurity())) if (AccountMgr::IsAdminAccount(GetSecurity()))
GetPlayer()->TeleportTo(mapid, PositionX, PositionY, PositionZ, Orientation); GetPlayer()->TeleportTo(mapid, PositionX, PositionY, PositionZ, Orientation);
@@ -1222,7 +1336,9 @@ void WorldSession::HandleWorldTeleportOpcode(WorldPacket& recv_data)
void WorldSession::HandleWhoisOpcode(WorldPacket& recv_data) void WorldSession::HandleWhoisOpcode(WorldPacket& recv_data)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "Received opcode CMSG_WHOIS"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "Received opcode CMSG_WHOIS");
#endif
std::string charname; std::string charname;
recv_data >> charname; recv_data >> charname;
@@ -1277,12 +1393,16 @@ void WorldSession::HandleWhoisOpcode(WorldPacket& recv_data)
data << msg; data << msg;
SendPacket(&data); SendPacket(&data);
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "Received whois command from player %s for character %s", GetPlayer()->GetName().c_str(), charname.c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "Received whois command from player %s for character %s", GetPlayer()->GetName().c_str(), charname.c_str());
#endif
} }
void WorldSession::HandleComplainOpcode(WorldPacket & recv_data) void WorldSession::HandleComplainOpcode(WorldPacket & recv_data)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_COMPLAIN"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_COMPLAIN");
#endif
uint8 spam_type; // 0 - mail, 1 - chat uint8 spam_type; // 0 - mail, 1 - chat
uint64 spammer_guid; uint64 spammer_guid;
@@ -1317,12 +1437,16 @@ void WorldSession::HandleComplainOpcode(WorldPacket & recv_data)
data << uint8(0); data << uint8(0);
SendPacket(&data); SendPacket(&data);
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "REPORT SPAM: type %u, guid %u, unk1 %u, unk2 %u, unk3 %u, unk4 %u, message %s", spam_type, GUID_LOPART(spammer_guid), unk1, unk2, unk3, unk4, description.c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "REPORT SPAM: type %u, guid %u, unk1 %u, unk2 %u, unk3 %u, unk4 %u, message %s", spam_type, GUID_LOPART(spammer_guid), unk1, unk2, unk3, unk4, description.c_str());
#endif
} }
void WorldSession::HandleRealmSplitOpcode(WorldPacket & recv_data) void WorldSession::HandleRealmSplitOpcode(WorldPacket & recv_data)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_REALM_SPLIT"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_REALM_SPLIT");
#endif
uint32 unk; uint32 unk;
std::string split_date = "01/01/01"; std::string split_date = "01/01/01";
@@ -1342,22 +1466,30 @@ void WorldSession::HandleRealmSplitOpcode(WorldPacket & recv_data)
void WorldSession::HandleFarSightOpcode(WorldPacket& recvData) void WorldSession::HandleFarSightOpcode(WorldPacket& recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_FAR_SIGHT"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_FAR_SIGHT");
#endif
bool apply; bool apply;
recvData >> apply; recvData >> apply;
if (apply) if (apply)
{ {
;//sLog->outDebug("Added FarSight " UI64FMTD " to player %u", _player->GetUInt64Value(PLAYER_FARSIGHT), _player->GetGUIDLow()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug("Added FarSight " UI64FMTD " to player %u", _player->GetUInt64Value(PLAYER_FARSIGHT), _player->GetGUIDLow());
#endif
if (WorldObject* target = _player->GetViewpoint()) if (WorldObject* target = _player->GetViewpoint())
_player->SetSeer(target); _player->SetSeer(target);
else else
;//sLog->outError("Player %s requests non-existing seer " UI64FMTD, _player->GetName().c_str(), _player->GetUInt64Value(PLAYER_FARSIGHT)); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outError("Player %s requests non-existing seer " UI64FMTD, _player->GetName().c_str(), _player->GetUInt64Value(PLAYER_FARSIGHT));
#endif
} }
else else
{ {
;//sLog->outDebug("Player %u set vision to self", _player->GetGUIDLow()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug("Player %u set vision to self", _player->GetGUIDLow());
#endif
_player->SetSeer(_player); _player->SetSeer(_player);
} }
@@ -1366,7 +1498,9 @@ void WorldSession::HandleFarSightOpcode(WorldPacket& recvData)
void WorldSession::HandleSetTitleOpcode(WorldPacket & recv_data) void WorldSession::HandleSetTitleOpcode(WorldPacket & recv_data)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_SET_TITLE"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_SET_TITLE");
#endif
int32 title; int32 title;
recv_data >> title; recv_data >> title;
@@ -1393,7 +1527,9 @@ void WorldSession::HandleTimeSyncResp(WorldPacket & recv_data)
void WorldSession::HandleResetInstancesOpcode(WorldPacket & /*recv_data*/) void WorldSession::HandleResetInstancesOpcode(WorldPacket & /*recv_data*/)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_RESET_INSTANCES"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_RESET_INSTANCES");
#endif
if (Group* group = _player->GetGroup()) if (Group* group = _player->GetGroup())
{ {
@@ -1406,7 +1542,9 @@ void WorldSession::HandleResetInstancesOpcode(WorldPacket & /*recv_data*/)
void WorldSession::HandleSetDungeonDifficultyOpcode(WorldPacket & recv_data) void WorldSession::HandleSetDungeonDifficultyOpcode(WorldPacket & recv_data)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "MSG_SET_DUNGEON_DIFFICULTY"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "MSG_SET_DUNGEON_DIFFICULTY");
#endif
uint32 mode; uint32 mode;
recv_data >> mode; recv_data >> mode;
@@ -1459,7 +1597,9 @@ void WorldSession::HandleSetDungeonDifficultyOpcode(WorldPacket & recv_data)
void WorldSession::HandleSetRaidDifficultyOpcode(WorldPacket & recv_data) void WorldSession::HandleSetRaidDifficultyOpcode(WorldPacket & recv_data)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "MSG_SET_RAID_DIFFICULTY"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "MSG_SET_RAID_DIFFICULTY");
#endif
uint32 mode; uint32 mode;
recv_data >> mode; recv_data >> mode;
@@ -1616,7 +1756,9 @@ void WorldSession::HandleSetRaidDifficultyOpcode(WorldPacket & recv_data)
void WorldSession::HandleCancelMountAuraOpcode(WorldPacket & /*recv_data*/) void WorldSession::HandleCancelMountAuraOpcode(WorldPacket & /*recv_data*/)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_CANCEL_MOUNT_AURA"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_CANCEL_MOUNT_AURA");
#endif
//If player is not mounted, so go out :) //If player is not mounted, so go out :)
if (!_player->IsMounted()) // not blizz like; no any messages on blizz if (!_player->IsMounted()) // not blizz like; no any messages on blizz
@@ -1638,7 +1780,9 @@ void WorldSession::HandleCancelMountAuraOpcode(WorldPacket & /*recv_data*/)
void WorldSession::HandleMoveSetCanFlyAckOpcode(WorldPacket & recv_data) void WorldSession::HandleMoveSetCanFlyAckOpcode(WorldPacket & recv_data)
{ {
// fly mode on/off // fly mode on/off
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_MOVE_SET_CAN_FLY_ACK"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_MOVE_SET_CAN_FLY_ACK");
#endif
uint64 guid; // guid - unused uint64 guid; // guid - unused
recv_data.readPackGUID(guid); recv_data.readPackGUID(guid);
@@ -1664,7 +1808,9 @@ void WorldSession::HandleMoveSetCanFlyAckOpcode(WorldPacket & recv_data)
void WorldSession::HandleRequestPetInfoOpcode(WorldPacket & /*recv_data */) void WorldSession::HandleRequestPetInfoOpcode(WorldPacket & /*recv_data */)
{ {
/* /*
;//sLog->outDebug(LOG_FILTER_PACKETIO, "WORLD: CMSG_REQUEST_PET_INFO"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_PACKETIO, "WORLD: CMSG_REQUEST_PET_INFO");
#endif
recv_data.hexlike(); recv_data.hexlike();
*/ */
} }
@@ -1676,7 +1822,9 @@ void WorldSession::HandleSetTaxiBenchmarkOpcode(WorldPacket & recv_data)
mode ? _player->SetFlag(PLAYER_FLAGS, PLAYER_FLAGS_TAXI_BENCHMARK) : _player->RemoveFlag(PLAYER_FLAGS, PLAYER_FLAGS_TAXI_BENCHMARK); mode ? _player->SetFlag(PLAYER_FLAGS, PLAYER_FLAGS_TAXI_BENCHMARK) : _player->RemoveFlag(PLAYER_FLAGS, PLAYER_FLAGS_TAXI_BENCHMARK);
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "Client used \"/timetest %d\" command", mode); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "Client used \"/timetest %d\" command", mode);
#endif
} }
void WorldSession::HandleQueryInspectAchievements(WorldPacket & recv_data) void WorldSession::HandleQueryInspectAchievements(WorldPacket & recv_data)
@@ -1694,7 +1842,9 @@ void WorldSession::HandleQueryInspectAchievements(WorldPacket & recv_data)
void WorldSession::HandleWorldStateUITimerUpdate(WorldPacket& /*recv_data*/) void WorldSession::HandleWorldStateUITimerUpdate(WorldPacket& /*recv_data*/)
{ {
// empty opcode // empty opcode
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_WORLD_STATE_UI_TIMER_UPDATE"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_WORLD_STATE_UI_TIMER_UPDATE");
#endif
WorldPacket data(SMSG_WORLD_STATE_UI_TIMER_UPDATE, 4); WorldPacket data(SMSG_WORLD_STATE_UI_TIMER_UPDATE, 4);
data << uint32(time(NULL)); data << uint32(time(NULL));
@@ -1704,7 +1854,9 @@ void WorldSession::HandleWorldStateUITimerUpdate(WorldPacket& /*recv_data*/)
void WorldSession::HandleReadyForAccountDataTimes(WorldPacket& /*recv_data*/) void WorldSession::HandleReadyForAccountDataTimes(WorldPacket& /*recv_data*/)
{ {
// empty opcode // empty opcode
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_READY_FOR_ACCOUNT_DATA_TIMES"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_READY_FOR_ACCOUNT_DATA_TIMES");
#endif
SendAccountDataTimes(GLOBAL_CACHE_MASK); SendAccountDataTimes(GLOBAL_CACHE_MASK);
} }
@@ -1719,7 +1871,9 @@ void WorldSession::SendSetPhaseShift(uint32 PhaseShift)
//Battlefield and Battleground //Battlefield and Battleground
void WorldSession::HandleAreaSpiritHealerQueryOpcode(WorldPacket & recv_data) void WorldSession::HandleAreaSpiritHealerQueryOpcode(WorldPacket & recv_data)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_AREA_SPIRIT_HEALER_QUERY"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_AREA_SPIRIT_HEALER_QUERY");
#endif
Battleground* bg = _player->GetBattleground(); Battleground* bg = _player->GetBattleground();
@@ -1742,7 +1896,9 @@ void WorldSession::HandleAreaSpiritHealerQueryOpcode(WorldPacket & recv_data)
void WorldSession::HandleAreaSpiritHealerQueueOpcode(WorldPacket & recv_data) void WorldSession::HandleAreaSpiritHealerQueueOpcode(WorldPacket & recv_data)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_AREA_SPIRIT_HEALER_QUEUE"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_AREA_SPIRIT_HEALER_QUEUE");
#endif
Battleground* bg = _player->GetBattleground(); Battleground* bg = _player->GetBattleground();
@@ -1791,7 +1947,9 @@ void WorldSession::HandleInstanceLockResponse(WorldPacket& recvPacket)
if (!_player->HasPendingBind() || _player->GetPendingBind() != _player->GetInstanceId() || (_player->GetGroup() && _player->GetGroup()->isLFGGroup() && _player->GetGroup()->IsLfgRandomInstance())) if (!_player->HasPendingBind() || _player->GetPendingBind() != _player->GetInstanceId() || (_player->GetGroup() && _player->GetGroup()->isLFGGroup() && _player->GetGroup()->IsLfgRandomInstance()))
{ {
;//sLog->outDetail("InstanceLockResponse: Player %s (guid %u) tried to bind himself/teleport to graveyard without a pending bind!", _player->GetName().c_str(), _player->GetGUIDLow()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("InstanceLockResponse: Player %s (guid %u) tried to bind himself/teleport to graveyard without a pending bind!", _player->GetName().c_str(), _player->GetGUIDLow());
#endif
return; return;
} }
@@ -1805,7 +1963,9 @@ void WorldSession::HandleInstanceLockResponse(WorldPacket& recvPacket)
void WorldSession::HandleUpdateMissileTrajectory(WorldPacket& recvPacket) void WorldSession::HandleUpdateMissileTrajectory(WorldPacket& recvPacket)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_UPDATE_MISSILE_TRAJECTORY"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_UPDATE_MISSILE_TRAJECTORY");
#endif
uint64 guid; uint64 guid;
uint32 spellId; uint32 spellId;
src/game/Handlers/MovementHandler.cpp
+30 -10
View File
@@ -29,7 +29,9 @@
void WorldSession::HandleMoveWorldportAckOpcode(WorldPacket & /*recvData*/) void WorldSession::HandleMoveWorldportAckOpcode(WorldPacket & /*recvData*/)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: got MSG_MOVE_WORLDPORT_ACK."); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: got MSG_MOVE_WORLDPORT_ACK.");
#endif
HandleMoveWorldportAckOpcode(); HandleMoveWorldportAckOpcode();
} }
@@ -222,15 +224,21 @@ void WorldSession::HandleMoveWorldportAckOpcode()
void WorldSession::HandleMoveTeleportAck(WorldPacket& recvData) void WorldSession::HandleMoveTeleportAck(WorldPacket& recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "MSG_MOVE_TELEPORT_ACK"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "MSG_MOVE_TELEPORT_ACK");
#endif
uint64 guid; uint64 guid;
recvData.readPackGUID(guid); recvData.readPackGUID(guid);
uint32 flags, time; uint32 flags, time;
recvData >> flags >> time; // unused recvData >> flags >> time; // unused
;//sLog->outStaticDebug("Guid " UI64FMTD, guid); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
;//sLog->outStaticDebug("Flags %u, time %u", flags, time/IN_MILLISECONDS); sLog->outStaticDebug("Guid " UI64FMTD, guid);
#endif
#ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug("Flags %u, time %u", flags, time/IN_MILLISECONDS);
#endif
Player* plMover = _player->m_mover->ToPlayer(); Player* plMover = _player->m_mover->ToPlayer();
@@ -484,7 +492,9 @@ void WorldSession::HandleMovementOpcodes(WorldPacket & recvData)
void WorldSession::HandleForceSpeedChangeAck(WorldPacket &recvData) void WorldSession::HandleForceSpeedChangeAck(WorldPacket &recvData)
{ {
uint32 opcode = recvData.GetOpcode(); uint32 opcode = recvData.GetOpcode();
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Recvd %s (%u, 0x%X) opcode", LookupOpcodeName(opcode), opcode, opcode); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Recvd %s (%u, 0x%X) opcode", LookupOpcodeName(opcode), opcode, opcode);
#endif
/* extract packet */ /* extract packet */
uint64 guid; uint64 guid;
@@ -562,7 +572,9 @@ void WorldSession::HandleForceSpeedChangeAck(WorldPacket &recvData)
void WorldSession::HandleSetActiveMoverOpcode(WorldPacket &recvData) void WorldSession::HandleSetActiveMoverOpcode(WorldPacket &recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Recvd CMSG_SET_ACTIVE_MOVER"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Recvd CMSG_SET_ACTIVE_MOVER");
#endif
uint64 guid; uint64 guid;
recvData >> guid; recvData >> guid;
@@ -576,7 +588,9 @@ void WorldSession::HandleSetActiveMoverOpcode(WorldPacket &recvData)
void WorldSession::HandleMoveNotActiveMover(WorldPacket &recvData) void WorldSession::HandleMoveNotActiveMover(WorldPacket &recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Recvd CMSG_MOVE_NOT_ACTIVE_MOVER"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Recvd CMSG_MOVE_NOT_ACTIVE_MOVER");
#endif
uint64 old_mover_guid; uint64 old_mover_guid;
recvData.readPackGUID(old_mover_guid); recvData.readPackGUID(old_mover_guid);
@@ -605,7 +619,9 @@ void WorldSession::HandleMountSpecialAnimOpcode(WorldPacket& /*recvData*/)
void WorldSession::HandleMoveKnockBackAck(WorldPacket & recvData) void WorldSession::HandleMoveKnockBackAck(WorldPacket & recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_MOVE_KNOCK_BACK_ACK"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_MOVE_KNOCK_BACK_ACK");
#endif
uint64 guid; uint64 guid;
recvData.readPackGUID(guid); recvData.readPackGUID(guid);
@@ -640,7 +656,9 @@ void WorldSession::HandleMoveKnockBackAck(WorldPacket & recvData)
void WorldSession::HandleMoveHoverAck(WorldPacket& recvData) void WorldSession::HandleMoveHoverAck(WorldPacket& recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_MOVE_HOVER_ACK"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_MOVE_HOVER_ACK");
#endif
uint64 guid; // guid - unused uint64 guid; // guid - unused
recvData.readPackGUID(guid); recvData.readPackGUID(guid);
@@ -656,7 +674,9 @@ void WorldSession::HandleMoveHoverAck(WorldPacket& recvData)
void WorldSession::HandleMoveWaterWalkAck(WorldPacket& recvData) void WorldSession::HandleMoveWaterWalkAck(WorldPacket& recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_MOVE_WATER_WALK_ACK"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_MOVE_WATER_WALK_ACK");
#endif
uint64 guid; // guid - unused uint64 guid; // guid - unused
recvData.readPackGUID(guid); recvData.readPackGUID(guid);
src/game/Handlers/NPCHandler.cpp
+87 -29
View File
@@ -44,7 +44,9 @@ void WorldSession::HandleTabardVendorActivateOpcode(WorldPacket & recvData)
Creature* unit = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_TABARDDESIGNER); Creature* unit = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_TABARDDESIGNER);
if (!unit) if (!unit)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandleTabardVendorActivateOpcode - Unit (GUID: %u) not found or you can not interact with him.", uint32(GUID_LOPART(guid))); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandleTabardVendorActivateOpcode - Unit (GUID: %u) not found or you can not interact with him.", uint32(GUID_LOPART(guid)));
#endif
return; return;
} }
@@ -66,14 +68,18 @@ void WorldSession::HandleBankerActivateOpcode(WorldPacket & recvData)
{ {
uint64 guid; uint64 guid;
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_BANKER_ACTIVATE"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_BANKER_ACTIVATE");
#endif
recvData >> guid; recvData >> guid;
Creature* unit = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_BANKER); Creature* unit = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_BANKER);
if (!unit) if (!unit)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandleBankerActivateOpcode - Unit (GUID: %u) not found or you can not interact with him.", uint32(GUID_LOPART(guid))); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandleBankerActivateOpcode - Unit (GUID: %u) not found or you can not interact with him.", uint32(GUID_LOPART(guid)));
#endif
return; return;
} }
@@ -115,12 +121,16 @@ void WorldSession::SendTrainerList(uint64 guid)
void WorldSession::SendTrainerList(uint64 guid, const std::string& strTitle) void WorldSession::SendTrainerList(uint64 guid, const std::string& strTitle)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: SendTrainerList"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: SendTrainerList");
#endif
Creature* unit = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_TRAINER); Creature* unit = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_TRAINER);
if (!unit) if (!unit)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: SendTrainerList - Unit (GUID: %u) not found or you can not interact with him.", uint32(GUID_LOPART(guid))); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: SendTrainerList - Unit (GUID: %u) not found or you can not interact with him.", uint32(GUID_LOPART(guid)));
#endif
return; return;
} }
@@ -132,14 +142,18 @@ void WorldSession::SendTrainerList(uint64 guid, const std::string& strTitle)
if (!ci) if (!ci)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: SendTrainerList - (GUID: %u) NO CREATUREINFO!", GUID_LOPART(guid)); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: SendTrainerList - (GUID: %u) NO CREATUREINFO!", GUID_LOPART(guid));
#endif
return; return;
} }
TrainerSpellData const* trainer_spells = unit->GetTrainerSpells(); TrainerSpellData const* trainer_spells = unit->GetTrainerSpells();
if (!trainer_spells) if (!trainer_spells)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: SendTrainerList - Training spells not found for creature (GUID: %u Entry: %u)", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: SendTrainerList - Training spells not found for creature (GUID: %u Entry: %u)",
#endif
// GUID_LOPART(guid), unit->GetEntry()); // GUID_LOPART(guid), unit->GetEntry());
return; return;
} }
@@ -233,12 +247,16 @@ void WorldSession::HandleTrainerBuySpellOpcode(WorldPacket & recvData)
uint32 spellId = 0; uint32 spellId = 0;
recvData >> guid >> spellId; recvData >> guid >> spellId;
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_TRAINER_BUY_SPELL NpcGUID=%u, learn spell id is: %u", uint32(GUID_LOPART(guid)), spellId); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_TRAINER_BUY_SPELL NpcGUID=%u, learn spell id is: %u", uint32(GUID_LOPART(guid)), spellId);
#endif
Creature* unit = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_TRAINER); Creature* unit = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_TRAINER);
if (!unit) if (!unit)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandleTrainerBuySpellOpcode - Unit (GUID: %u) not found or you can not interact with him.", uint32(GUID_LOPART(guid))); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandleTrainerBuySpellOpcode - Unit (GUID: %u) not found or you can not interact with him.", uint32(GUID_LOPART(guid)));
#endif
return; return;
} }
@@ -286,7 +304,9 @@ void WorldSession::HandleTrainerBuySpellOpcode(WorldPacket & recvData)
void WorldSession::HandleGossipHelloOpcode(WorldPacket & recvData) void WorldSession::HandleGossipHelloOpcode(WorldPacket & recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_GOSSIP_HELLO"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_GOSSIP_HELLO");
#endif
uint64 guid; uint64 guid;
recvData >> guid; recvData >> guid;
@@ -294,7 +314,9 @@ void WorldSession::HandleGossipHelloOpcode(WorldPacket & recvData)
Creature* unit = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_NONE); Creature* unit = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_NONE);
if (!unit) if (!unit)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandleGossipHelloOpcode - Unit (GUID: %u) not found or you can not interact with him.", uint32(GUID_LOPART(guid))); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandleGossipHelloOpcode - Unit (GUID: %u) not found or you can not interact with him.", uint32(GUID_LOPART(guid)));
#endif
return; return;
} }
@@ -345,7 +367,9 @@ void WorldSession::HandleGossipHelloOpcode(WorldPacket & recvData)
/*void WorldSession::HandleGossipSelectOptionOpcode(WorldPacket & recvData) /*void WorldSession::HandleGossipSelectOptionOpcode(WorldPacket & recvData)
{ {
;//sLog->outDebug(LOG_FILTER_PACKETIO, "WORLD: CMSG_GOSSIP_SELECT_OPTION"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_PACKETIO, "WORLD: CMSG_GOSSIP_SELECT_OPTION");
#endif
uint32 option; uint32 option;
uint32 unk; uint32 unk;
@@ -356,15 +380,21 @@ void WorldSession::HandleGossipHelloOpcode(WorldPacket & recvData)
if (_player->PlayerTalkClass->GossipOptionCoded(option)) if (_player->PlayerTalkClass->GossipOptionCoded(option))
{ {
;//sLog->outDebug(LOG_FILTER_PACKETIO, "reading string"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_PACKETIO, "reading string");
#endif
recvData >> code; recvData >> code;
;//sLog->outDebug(LOG_FILTER_PACKETIO, "string read: %s", code.c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_PACKETIO, "string read: %s", code.c_str());
#endif
} }
Creature* unit = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_NONE); Creature* unit = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_NONE);
if (!unit) if (!unit)
{ {
;//sLog->outDebug(LOG_FILTER_PACKETIO, "WORLD: HandleGossipSelectOptionOpcode - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(guid))); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_PACKETIO, "WORLD: HandleGossipSelectOptionOpcode - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(guid)));
#endif
return; return;
} }
@@ -386,7 +416,9 @@ void WorldSession::HandleGossipHelloOpcode(WorldPacket & recvData)
void WorldSession::HandleSpiritHealerActivateOpcode(WorldPacket & recvData) void WorldSession::HandleSpiritHealerActivateOpcode(WorldPacket & recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_SPIRIT_HEALER_ACTIVATE"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_SPIRIT_HEALER_ACTIVATE");
#endif
uint64 guid; uint64 guid;
@@ -395,7 +427,9 @@ void WorldSession::HandleSpiritHealerActivateOpcode(WorldPacket & recvData)
Creature* unit = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_SPIRITHEALER); Creature* unit = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_SPIRITHEALER);
if (!unit) if (!unit)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandleSpiritHealerActivateOpcode - Unit (GUID: %u) not found or you can not interact with him.", uint32(GUID_LOPART(guid))); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandleSpiritHealerActivateOpcode - Unit (GUID: %u) not found or you can not interact with him.", uint32(GUID_LOPART(guid)));
#endif
return; return;
} }
@@ -448,7 +482,9 @@ void WorldSession::HandleBinderActivateOpcode(WorldPacket & recvData)
Creature* unit = GetPlayer()->GetNPCIfCanInteractWith(npcGUID, UNIT_NPC_FLAG_INNKEEPER); Creature* unit = GetPlayer()->GetNPCIfCanInteractWith(npcGUID, UNIT_NPC_FLAG_INNKEEPER);
if (!unit) if (!unit)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandleBinderActivateOpcode - Unit (GUID: %u) not found or you can not interact with him.", uint32(GUID_LOPART(npcGUID))); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandleBinderActivateOpcode - Unit (GUID: %u) not found or you can not interact with him.", uint32(GUID_LOPART(npcGUID)));
#endif
return; return;
} }
@@ -480,7 +516,9 @@ void WorldSession::SendBindPoint(Creature* npc)
void WorldSession::HandleListStabledPetsOpcode(WorldPacket & recvData) void WorldSession::HandleListStabledPetsOpcode(WorldPacket & recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Recv MSG_LIST_STABLED_PETS"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Recv MSG_LIST_STABLED_PETS");
#endif
uint64 npcGUID; uint64 npcGUID;
recvData >> npcGUID; recvData >> npcGUID;
@@ -516,7 +554,9 @@ void WorldSession::SendStablePetCallback(PreparedQueryResult result, uint64 guid
if (!GetPlayer()) if (!GetPlayer())
return; return;
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Recv MSG_LIST_STABLED_PETS Send."); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Recv MSG_LIST_STABLED_PETS Send.");
#endif
WorldPacket data(MSG_LIST_STABLED_PETS, 200); // guess size WorldPacket data(MSG_LIST_STABLED_PETS, 200); // guess size
@@ -573,7 +613,9 @@ void WorldSession::SendStableResult(uint8 res)
void WorldSession::HandleStablePet(WorldPacket & recvData) void WorldSession::HandleStablePet(WorldPacket & recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Recv CMSG_STABLE_PET"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Recv CMSG_STABLE_PET");
#endif
uint64 npcGUID; uint64 npcGUID;
recvData >> npcGUID; recvData >> npcGUID;
@@ -648,7 +690,9 @@ void WorldSession::HandleStablePetCallback(PreparedQueryResult result)
void WorldSession::HandleUnstablePet(WorldPacket & recvData) void WorldSession::HandleUnstablePet(WorldPacket & recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Recv CMSG_UNSTABLE_PET."); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Recv CMSG_UNSTABLE_PET.");
#endif
uint64 npcGUID; uint64 npcGUID;
uint32 petnumber; uint32 petnumber;
@@ -724,7 +768,9 @@ void WorldSession::HandleUnstablePetCallback(PreparedQueryResult result, uint32
void WorldSession::HandleBuyStableSlot(WorldPacket & recvData) void WorldSession::HandleBuyStableSlot(WorldPacket & recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Recv CMSG_BUY_STABLE_SLOT."); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Recv CMSG_BUY_STABLE_SLOT.");
#endif
uint64 npcGUID; uint64 npcGUID;
recvData >> npcGUID; recvData >> npcGUID;
@@ -757,12 +803,16 @@ void WorldSession::HandleBuyStableSlot(WorldPacket & recvData)
void WorldSession::HandleStableRevivePet(WorldPacket &/* recvData */) void WorldSession::HandleStableRevivePet(WorldPacket &/* recvData */)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "HandleStableRevivePet: Not implemented"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "HandleStableRevivePet: Not implemented");
#endif
} }
void WorldSession::HandleStableSwapPet(WorldPacket & recvData) void WorldSession::HandleStableSwapPet(WorldPacket & recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Recv CMSG_STABLE_SWAP_PET."); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Recv CMSG_STABLE_SWAP_PET.");
#endif
uint64 npcGUID; uint64 npcGUID;
uint32 petId; uint32 petId;
@@ -852,7 +902,9 @@ void WorldSession::HandleStableSwapPetCallback(PreparedQueryResult result, uint3
void WorldSession::HandleRepairItemOpcode(WorldPacket & recvData) void WorldSession::HandleRepairItemOpcode(WorldPacket & recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_REPAIR_ITEM"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_REPAIR_ITEM");
#endif
uint64 npcGUID, itemGUID; uint64 npcGUID, itemGUID;
uint8 guildBank; // new in 2.3.2, bool that means from guild bank money uint8 guildBank; // new in 2.3.2, bool that means from guild bank money
@@ -862,7 +914,9 @@ void WorldSession::HandleRepairItemOpcode(WorldPacket & recvData)
Creature* unit = GetPlayer()->GetNPCIfCanInteractWith(npcGUID, UNIT_NPC_FLAG_REPAIR); Creature* unit = GetPlayer()->GetNPCIfCanInteractWith(npcGUID, UNIT_NPC_FLAG_REPAIR);
if (!unit) if (!unit)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandleRepairItemOpcode - Unit (GUID: %u) not found or you can not interact with him.", uint32(GUID_LOPART(npcGUID))); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandleRepairItemOpcode - Unit (GUID: %u) not found or you can not interact with him.", uint32(GUID_LOPART(npcGUID)));
#endif
return; return;
} }
@@ -875,7 +929,9 @@ void WorldSession::HandleRepairItemOpcode(WorldPacket & recvData)
if (itemGUID) if (itemGUID)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "ITEM: Repair item, itemGUID = %u, npcGUID = %u", GUID_LOPART(itemGUID), GUID_LOPART(npcGUID)); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "ITEM: Repair item, itemGUID = %u, npcGUID = %u", GUID_LOPART(itemGUID), GUID_LOPART(npcGUID));
#endif
Item* item = _player->GetItemByGuid(itemGUID); Item* item = _player->GetItemByGuid(itemGUID);
if (item) if (item)
@@ -883,7 +939,9 @@ void WorldSession::HandleRepairItemOpcode(WorldPacket & recvData)
} }
else else
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "ITEM: Repair all items, npcGUID = %u", GUID_LOPART(npcGUID)); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "ITEM: Repair all items, npcGUID = %u", GUID_LOPART(npcGUID));
#endif
_player->DurabilityRepairAll(true, discountMod, guildBank); _player->DurabilityRepairAll(true, discountMod, guildBank);
} }
} }
src/game/Handlers/PetHandler.cpp
+45 -15
View File
@@ -354,13 +354,17 @@ void WorldSession::HandleDismissCritter(WorldPacket &recvData)
uint64 guid; uint64 guid;
recvData >> guid; recvData >> guid;
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_DISMISS_CRITTER for GUID " UI64FMTD, guid); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_DISMISS_CRITTER for GUID " UI64FMTD, guid);
#endif
Unit* pet = ObjectAccessor::GetCreatureOrPetOrVehicle(*_player, guid); Unit* pet = ObjectAccessor::GetCreatureOrPetOrVehicle(*_player, guid);
if (!pet) if (!pet)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "Vanitypet (guid: %u) does not exist - player '%s' (guid: %u / account: %u) attempted to dismiss it (possibly lagged out)", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "Vanitypet (guid: %u) does not exist - player '%s' (guid: %u / account: %u) attempted to dismiss it (possibly lagged out)",
#endif
// uint32(GUID_LOPART(guid)), GetPlayer()->GetName().c_str(), GetPlayer()->GetGUIDLow(), GetAccountId()); // uint32(GUID_LOPART(guid)), GetPlayer()->GetName().c_str(), GetPlayer()->GetGUIDLow(), GetAccountId());
return; return;
} }
@@ -386,7 +390,9 @@ void WorldSession::HandlePetAction(WorldPacket & recvData)
// used also for charmed creature // used also for charmed creature
Unit* pet= ObjectAccessor::GetUnit(*_player, guid1); Unit* pet= ObjectAccessor::GetUnit(*_player, guid1);
;//sLog->outDetail("HandlePetAction: Pet %u - flag: %u, spellid: %u, target: %u.", uint32(GUID_LOPART(guid1)), uint32(flag), spellid, uint32(GUID_LOPART(guid2))); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("HandlePetAction: Pet %u - flag: %u, spellid: %u, target: %u.", uint32(GUID_LOPART(guid1)), uint32(flag), spellid, uint32(GUID_LOPART(guid2)));
#endif
if (!pet) if (!pet)
{ {
@@ -440,7 +446,9 @@ void WorldSession::HandlePetStopAttack(WorldPacket &recvData)
uint64 guid; uint64 guid;
recvData >> guid; recvData >> guid;
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_PET_STOP_ATTACK for GUID " UI64FMTD "", guid); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_PET_STOP_ATTACK for GUID " UI64FMTD "", guid);
#endif
Unit* pet = ObjectAccessor::GetCreatureOrPetOrVehicle(*_player, guid); Unit* pet = ObjectAccessor::GetCreatureOrPetOrVehicle(*_player, guid);
@@ -894,7 +902,9 @@ void WorldSession::HandlePetActionHelper(Unit* pet, uint64 guid1, uint16 spellid
void WorldSession::HandlePetNameQuery(WorldPacket & recvData) void WorldSession::HandlePetNameQuery(WorldPacket & recvData)
{ {
;//sLog->outDetail("HandlePetNameQuery. CMSG_PET_NAME_QUERY"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("HandlePetNameQuery. CMSG_PET_NAME_QUERY");
#endif
uint32 petnumber; uint32 petnumber;
uint64 petguid; uint64 petguid;
@@ -945,7 +955,9 @@ bool WorldSession::CheckStableMaster(uint64 guid)
{ {
if (!GetPlayer()->IsGameMaster() && !GetPlayer()->HasAuraType(SPELL_AURA_OPEN_STABLE)) if (!GetPlayer()->IsGameMaster() && !GetPlayer()->HasAuraType(SPELL_AURA_OPEN_STABLE))
{ {
;//sLog->outStaticDebug("Player (GUID:%u) attempt open stable in cheating way.", GUID_LOPART(guid)); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug("Player (GUID:%u) attempt open stable in cheating way.", GUID_LOPART(guid));
#endif
return false; return false;
} }
} }
@@ -954,7 +966,9 @@ bool WorldSession::CheckStableMaster(uint64 guid)
{ {
if (!GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_STABLEMASTER)) if (!GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_STABLEMASTER))
{ {
;//sLog->outStaticDebug("Stablemaster (GUID:%u) not found or you can't interact with him.", GUID_LOPART(guid)); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug("Stablemaster (GUID:%u) not found or you can't interact with him.", GUID_LOPART(guid));
#endif
return false; return false;
} }
} }
@@ -963,7 +977,9 @@ bool WorldSession::CheckStableMaster(uint64 guid)
void WorldSession::HandlePetSetAction(WorldPacket & recvData) void WorldSession::HandlePetSetAction(WorldPacket & recvData)
{ {
;//sLog->outDetail("HandlePetSetAction. CMSG_PET_SET_ACTION"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("HandlePetSetAction. CMSG_PET_SET_ACTION");
#endif
uint64 petguid; uint64 petguid;
uint8 count; uint8 count;
@@ -1090,7 +1106,9 @@ void WorldSession::HandlePetSetAction(WorldPacket & recvData)
void WorldSession::HandlePetRename(WorldPacket & recvData) void WorldSession::HandlePetRename(WorldPacket & recvData)
{ {
;//sLog->outDetail("HandlePetRename. CMSG_PET_RENAME"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("HandlePetRename. CMSG_PET_RENAME");
#endif
uint64 petguid; uint64 petguid;
uint8 isdeclined; uint8 isdeclined;
@@ -1180,7 +1198,9 @@ void WorldSession::HandlePetAbandon(WorldPacket & recvData)
{ {
uint64 guid; uint64 guid;
recvData >> guid; //pet guid recvData >> guid; //pet guid
;//sLog->outDetail("HandlePetAbandon. CMSG_PET_ABANDON pet guid is %u", GUID_LOPART(guid)); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("HandlePetAbandon. CMSG_PET_ABANDON pet guid is %u", GUID_LOPART(guid));
#endif
if (!_player->IsInWorld()) if (!_player->IsInWorld())
return; return;
@@ -1206,7 +1226,9 @@ void WorldSession::HandlePetAbandon(WorldPacket & recvData)
void WorldSession::HandlePetSpellAutocastOpcode(WorldPacket& recvPacket) void WorldSession::HandlePetSpellAutocastOpcode(WorldPacket& recvPacket)
{ {
;//sLog->outDetail("CMSG_PET_SPELL_AUTOCAST"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("CMSG_PET_SPELL_AUTOCAST");
#endif
uint64 guid; uint64 guid;
uint32 spellid; uint32 spellid;
uint8 state; //1 for on, 0 for off uint8 state; //1 for on, 0 for off
@@ -1264,7 +1286,9 @@ void WorldSession::HandlePetSpellAutocastOpcode(WorldPacket& recvPacket)
void WorldSession::HandlePetCastSpellOpcode(WorldPacket& recvPacket) void WorldSession::HandlePetCastSpellOpcode(WorldPacket& recvPacket)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_PET_CAST_SPELL"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_PET_CAST_SPELL");
#endif
uint64 guid; uint64 guid;
uint8 castCount; uint8 castCount;
@@ -1273,7 +1297,9 @@ void WorldSession::HandlePetCastSpellOpcode(WorldPacket& recvPacket)
recvPacket >> guid >> castCount >> spellId >> castFlags; recvPacket >> guid >> castCount >> spellId >> castFlags;
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_PET_CAST_SPELL, guid: " UI64FMTD ", castCount: %u, spellId %u, castFlags %u", guid, castCount, spellId, castFlags); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_PET_CAST_SPELL, guid: " UI64FMTD ", castCount: %u, spellId %u, castFlags %u", guid, castCount, spellId, castFlags);
#endif
// This opcode is also sent from charmed and possessed units (players and creatures) // This opcode is also sent from charmed and possessed units (players and creatures)
if (!_player->GetGuardianPet() && !_player->GetCharm()) if (!_player->GetGuardianPet() && !_player->GetCharm())
@@ -1381,7 +1407,9 @@ void WorldSession::SendPetNameInvalid(uint32 error, const std::string& name, Dec
void WorldSession::HandlePetLearnTalent(WorldPacket & recvData) void WorldSession::HandlePetLearnTalent(WorldPacket & recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_PET_LEARN_TALENT"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_PET_LEARN_TALENT");
#endif
uint64 guid; uint64 guid;
uint32 talent_id, requested_rank; uint32 talent_id, requested_rank;
@@ -1393,7 +1421,9 @@ void WorldSession::HandlePetLearnTalent(WorldPacket & recvData)
void WorldSession::HandleLearnPreviewTalentsPet(WorldPacket & recvData) void WorldSession::HandleLearnPreviewTalentsPet(WorldPacket & recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_LEARN_PREVIEW_TALENTS_PET"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_LEARN_PREVIEW_TALENTS_PET");
#endif
uint64 guid; uint64 guid;
recvData >> guid; recvData >> guid;
src/game/Handlers/PetitionsHandler.cpp
+78 -26
View File
@@ -41,7 +41,9 @@ enum CharterCosts
void WorldSession::HandlePetitionBuyOpcode(WorldPacket & recvData) void WorldSession::HandlePetitionBuyOpcode(WorldPacket & recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "Received opcode CMSG_PETITION_BUY"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "Received opcode CMSG_PETITION_BUY");
#endif
uint64 guidNPC; uint64 guidNPC;
uint32 clientIndex; // 1 for guild and arenaslot+1 for arenas in client uint32 clientIndex; // 1 for guild and arenaslot+1 for arenas in client
@@ -70,13 +72,17 @@ void WorldSession::HandlePetitionBuyOpcode(WorldPacket & recvData)
recvData >> clientIndex; // index recvData >> clientIndex; // index
recvData.read_skip<uint32>(); // 0 recvData.read_skip<uint32>(); // 0
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "Petitioner with GUID %u tried sell petition: name %s", GUID_LOPART(guidNPC), name.c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "Petitioner with GUID %u tried sell petition: name %s", GUID_LOPART(guidNPC), name.c_str());
#endif
// prevent cheating // prevent cheating
Creature* creature = GetPlayer()->GetNPCIfCanInteractWith(guidNPC, UNIT_NPC_FLAG_PETITIONER); Creature* creature = GetPlayer()->GetNPCIfCanInteractWith(guidNPC, UNIT_NPC_FLAG_PETITIONER);
if (!creature) if (!creature)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandlePetitionBuyOpcode - Unit (GUID: %u) not found or you can't interact with him.", GUID_LOPART(guidNPC)); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandlePetitionBuyOpcode - Unit (GUID: %u) not found or you can't interact with him.", GUID_LOPART(guidNPC));
#endif
return; return;
} }
@@ -125,7 +131,9 @@ void WorldSession::HandlePetitionBuyOpcode(WorldPacket & recvData)
type = ARENA_TEAM_CHARTER_5v5_TYPE; type = ARENA_TEAM_CHARTER_5v5_TYPE;
break; break;
default: default:
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "unknown selection at buy arena petition: %u", clientIndex); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "unknown selection at buy arena petition: %u", clientIndex);
#endif
return; return;
} }
@@ -201,7 +209,9 @@ void WorldSession::HandlePetitionBuyOpcode(WorldPacket & recvData)
// datacorruption // datacorruption
Petition const* petition = sPetitionMgr->GetPetitionByOwnerWithType(_player->GetGUIDLow(), type); Petition const* petition = sPetitionMgr->GetPetitionByOwnerWithType(_player->GetGUIDLow(), type);
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "Invalid petition GUIDs: %s", ssInvalidPetitionGUIDs.str().c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "Invalid petition GUIDs: %s", ssInvalidPetitionGUIDs.str().c_str());
#endif
CharacterDatabase.EscapeString(name); CharacterDatabase.EscapeString(name);
SQLTransaction trans = CharacterDatabase.BeginTransaction(); SQLTransaction trans = CharacterDatabase.BeginTransaction();
@@ -230,7 +240,9 @@ void WorldSession::HandlePetitionBuyOpcode(WorldPacket & recvData)
void WorldSession::HandlePetitionShowSignOpcode(WorldPacket& recvData) void WorldSession::HandlePetitionShowSignOpcode(WorldPacket& recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "Received opcode CMSG_PETITION_SHOW_SIGNATURES"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "Received opcode CMSG_PETITION_SHOW_SIGNATURES");
#endif
uint64 petitionguid; uint64 petitionguid;
recvData >> petitionguid; // petition guid recvData >> petitionguid; // petition guid
@@ -251,7 +263,9 @@ void WorldSession::HandlePetitionShowSignOpcode(WorldPacket& recvData)
Signatures const* signatures = sPetitionMgr->GetSignature(petitionGuidLow); Signatures const* signatures = sPetitionMgr->GetSignature(petitionGuidLow);
uint8 signs = signatures ? signatures->signatureMap.size() : 0; uint8 signs = signatures ? signatures->signatureMap.size() : 0;
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_PETITION_SHOW_SIGNATURES petition entry: '%u'", petitionGuidLow); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_PETITION_SHOW_SIGNATURES petition entry: '%u'", petitionGuidLow);
#endif
WorldPacket data(SMSG_PETITION_SHOW_SIGNATURES, (8+8+4+1+signs*12)); WorldPacket data(SMSG_PETITION_SHOW_SIGNATURES, (8+8+4+1+signs*12));
data << uint64(petitionguid); // petition guid data << uint64(petitionguid); // petition guid
@@ -271,13 +285,17 @@ void WorldSession::HandlePetitionShowSignOpcode(WorldPacket& recvData)
void WorldSession::HandlePetitionQueryOpcode(WorldPacket & recvData) void WorldSession::HandlePetitionQueryOpcode(WorldPacket & recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "Received opcode CMSG_PETITION_QUERY"); // ok #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "Received opcode CMSG_PETITION_QUERY"); // ok
#endif
uint32 guildguid; uint32 guildguid;
uint64 petitionguid; uint64 petitionguid;
recvData >> guildguid; // in Trinity always same as GUID_LOPART(petitionguid) recvData >> guildguid; // in Trinity always same as GUID_LOPART(petitionguid)
recvData >> petitionguid; // petition guid recvData >> petitionguid; // petition guid
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_PETITION_QUERY Petition GUID %u Guild GUID %u", GUID_LOPART(petitionguid), guildguid); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_PETITION_QUERY Petition GUID %u Guild GUID %u", GUID_LOPART(petitionguid), guildguid);
#endif
SendPetitionQueryOpcode(petitionguid); SendPetitionQueryOpcode(petitionguid);
} }
@@ -287,7 +305,9 @@ void WorldSession::SendPetitionQueryOpcode(uint64 petitionguid)
Petition const* petition = sPetitionMgr->GetPetition(GUID_LOPART(petitionguid)); Petition const* petition = sPetitionMgr->GetPetition(GUID_LOPART(petitionguid));
if (!petition) if (!petition)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_PETITION_QUERY failed for petition (GUID: %u)", GUID_LOPART(petitionguid)); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_PETITION_QUERY failed for petition (GUID: %u)", GUID_LOPART(petitionguid));
#endif
return; return;
} }
@@ -331,7 +351,9 @@ void WorldSession::SendPetitionQueryOpcode(uint64 petitionguid)
void WorldSession::HandlePetitionRenameOpcode(WorldPacket & recvData) void WorldSession::HandlePetitionRenameOpcode(WorldPacket & recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "Received opcode MSG_PETITION_RENAME"); // ok #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "Received opcode MSG_PETITION_RENAME"); // ok
#endif
uint64 petitionGuid; uint64 petitionGuid;
std::string newName; std::string newName;
@@ -346,7 +368,9 @@ void WorldSession::HandlePetitionRenameOpcode(WorldPacket & recvData)
Petition const* petition = sPetitionMgr->GetPetition(GUID_LOPART(petitionGuid)); Petition const* petition = sPetitionMgr->GetPetition(GUID_LOPART(petitionGuid));
if (!petition) if (!petition)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_PETITION_QUERY failed for petition (GUID: %u)", GUID_LOPART(petitionGuid)); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_PETITION_QUERY failed for petition (GUID: %u)", GUID_LOPART(petitionGuid));
#endif
return; return;
} }
@@ -387,7 +411,9 @@ void WorldSession::HandlePetitionRenameOpcode(WorldPacket & recvData)
// xinef: update petition container // xinef: update petition container
const_cast<Petition*>(petition)->petitionName = newName; const_cast<Petition*>(petition)->petitionName = newName;
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "Petition (GUID: %u) renamed to '%s'", GUID_LOPART(petitionGuid), newName.c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "Petition (GUID: %u) renamed to '%s'", GUID_LOPART(petitionGuid), newName.c_str());
#endif
WorldPacket data(MSG_PETITION_RENAME, (8+newName.size()+1)); WorldPacket data(MSG_PETITION_RENAME, (8+newName.size()+1));
data << uint64(petitionGuid); data << uint64(petitionGuid);
data << newName; data << newName;
@@ -396,7 +422,9 @@ void WorldSession::HandlePetitionRenameOpcode(WorldPacket & recvData)
void WorldSession::HandlePetitionSignOpcode(WorldPacket & recvData) void WorldSession::HandlePetitionSignOpcode(WorldPacket & recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "Received opcode CMSG_PETITION_SIGN"); // ok #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "Received opcode CMSG_PETITION_SIGN"); // ok
#endif
uint64 petitionGuid; uint64 petitionGuid;
uint8 unk; uint8 unk;
@@ -514,7 +542,9 @@ void WorldSession::HandlePetitionSignOpcode(WorldPacket & recvData)
// xinef: fill petition store // xinef: fill petition store
sPetitionMgr->AddSignature(GUID_LOPART(petitionGuid), GetAccountId(), playerGuid); sPetitionMgr->AddSignature(GUID_LOPART(petitionGuid), GetAccountId(), playerGuid);
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "PETITION SIGN: GUID %u by player: %s (GUID: %u Account: %u)", GUID_LOPART(petitionGuid), _player->GetName().c_str(), playerGuid, GetAccountId()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "PETITION SIGN: GUID %u by player: %s (GUID: %u Account: %u)", GUID_LOPART(petitionGuid), _player->GetName().c_str(), playerGuid, GetAccountId());
#endif
WorldPacket data(SMSG_PETITION_SIGN_RESULTS, (8+8+4)); WorldPacket data(SMSG_PETITION_SIGN_RESULTS, (8+8+4));
data << uint64(petitionGuid); data << uint64(petitionGuid);
@@ -536,12 +566,16 @@ void WorldSession::HandlePetitionSignOpcode(WorldPacket & recvData)
void WorldSession::HandlePetitionDeclineOpcode(WorldPacket & recvData) void WorldSession::HandlePetitionDeclineOpcode(WorldPacket & recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "Received opcode MSG_PETITION_DECLINE"); // ok #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "Received opcode MSG_PETITION_DECLINE"); // ok
#endif
uint64 petitionguid; uint64 petitionguid;
uint64 ownerguid; uint64 ownerguid;
recvData >> petitionguid; // petition guid recvData >> petitionguid; // petition guid
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "Petition %u declined by %u", GUID_LOPART(petitionguid), _player->GetGUIDLow()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "Petition %u declined by %u", GUID_LOPART(petitionguid), _player->GetGUIDLow());
#endif
Petition const* petition = sPetitionMgr->GetPetition(GUID_LOPART(petitionguid)); Petition const* petition = sPetitionMgr->GetPetition(GUID_LOPART(petitionguid));
if (!petition) if (!petition)
@@ -558,7 +592,9 @@ void WorldSession::HandlePetitionDeclineOpcode(WorldPacket & recvData)
void WorldSession::HandleOfferPetitionOpcode(WorldPacket & recvData) void WorldSession::HandleOfferPetitionOpcode(WorldPacket & recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "Received opcode CMSG_OFFER_PETITION"); // ok #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "Received opcode CMSG_OFFER_PETITION"); // ok
#endif
uint64 petitionguid, plguid; uint64 petitionguid, plguid;
uint32 junk; uint32 junk;
@@ -646,7 +682,9 @@ void WorldSession::HandleOfferPetitionOpcode(WorldPacket & recvData)
void WorldSession::HandleTurnInPetitionOpcode(WorldPacket & recvData) void WorldSession::HandleTurnInPetitionOpcode(WorldPacket & recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "Received opcode CMSG_TURN_IN_PETITION"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "Received opcode CMSG_TURN_IN_PETITION");
#endif
// Get petition guid from packet // Get petition guid from packet
WorldPacket data; WorldPacket data;
@@ -659,7 +697,9 @@ void WorldSession::HandleTurnInPetitionOpcode(WorldPacket & recvData)
if (!item) if (!item)
return; return;
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "Petition %u turned in by %u", GUID_LOPART(petitionGuid), _player->GetGUIDLow()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "Petition %u turned in by %u", GUID_LOPART(petitionGuid), _player->GetGUIDLow());
#endif
Petition const* petition = sPetitionMgr->GetPetition(GUID_LOPART(petitionGuid)); Petition const* petition = sPetitionMgr->GetPetition(GUID_LOPART(petitionGuid));
if (!petition) if (!petition)
@@ -782,13 +822,17 @@ void WorldSession::HandleTurnInPetitionOpcode(WorldPacket & recvData)
// Register arena team // Register arena team
sArenaTeamMgr->AddArenaTeam(arenaTeam); sArenaTeamMgr->AddArenaTeam(arenaTeam);
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "PetitonsHandler: Arena team (guid: %u) added to ObjectMgr", arenaTeam->GetId()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "PetitonsHandler: Arena team (guid: %u) added to ObjectMgr", arenaTeam->GetId());
#endif
// Add members // Add members
if (signs) if (signs)
for (SignatureMap::const_iterator itr = signatureCopy.begin(); itr != signatureCopy.end(); ++itr) for (SignatureMap::const_iterator itr = signatureCopy.begin(); itr != signatureCopy.end(); ++itr)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "PetitionsHandler: Adding arena team (guid: %u) member %u", arenaTeam->GetId(), memberGUID); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "PetitionsHandler: Adding arena team (guid: %u) member %u", arenaTeam->GetId(), memberGUID);
#endif
arenaTeam->AddMember(MAKE_NEW_GUID(itr->first, 0, HIGHGUID_PLAYER)); arenaTeam->AddMember(MAKE_NEW_GUID(itr->first, 0, HIGHGUID_PLAYER));
} }
} }
@@ -809,7 +853,9 @@ void WorldSession::HandleTurnInPetitionOpcode(WorldPacket & recvData)
sPetitionMgr->RemovePetition(GUID_LOPART(petitionGuid)); sPetitionMgr->RemovePetition(GUID_LOPART(petitionGuid));
// created // created
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "TURN IN PETITION GUID %u", GUID_LOPART(petitionGuid)); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "TURN IN PETITION GUID %u", GUID_LOPART(petitionGuid));
#endif
data.Initialize(SMSG_TURN_IN_PETITION_RESULTS, 4); data.Initialize(SMSG_TURN_IN_PETITION_RESULTS, 4);
data << (uint32)PETITION_TURN_OK; data << (uint32)PETITION_TURN_OK;
@@ -818,7 +864,9 @@ void WorldSession::HandleTurnInPetitionOpcode(WorldPacket & recvData)
void WorldSession::HandlePetitionShowListOpcode(WorldPacket & recvData) void WorldSession::HandlePetitionShowListOpcode(WorldPacket & recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "Received CMSG_PETITION_SHOWLIST"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "Received CMSG_PETITION_SHOWLIST");
#endif
uint64 guid; uint64 guid;
recvData >> guid; recvData >> guid;
@@ -831,7 +879,9 @@ void WorldSession::SendPetitionShowList(uint64 guid)
Creature* creature = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_PETITIONER); Creature* creature = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_PETITIONER);
if (!creature) if (!creature)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandlePetitionShowListOpcode - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(guid))); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandlePetitionShowListOpcode - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(guid)));
#endif
return; return;
} }
@@ -875,5 +925,7 @@ void WorldSession::SendPetitionShowList(uint64 guid)
} }
SendPacket(&data); SendPacket(&data);
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "Sent SMSG_PETITION_SHOWLIST"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "Sent SMSG_PETITION_SHOWLIST");
#endif
} }
src/game/Handlers/QueryHandler.cpp
+36 -12
View File
@@ -135,12 +135,16 @@ void WorldSession::HandleCreatureQueryOpcode(WorldPacket & recvData)
} }
else else
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_CREATURE_QUERY - NO CREATURE INFO! (GUID: %u, ENTRY: %u)", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_CREATURE_QUERY - NO CREATURE INFO! (GUID: %u, ENTRY: %u)",
#endif
// GUID_LOPART(guid), entry); // GUID_LOPART(guid), entry);
WorldPacket data(SMSG_CREATURE_QUERY_RESPONSE, 4); WorldPacket data(SMSG_CREATURE_QUERY_RESPONSE, 4);
data << uint32(entry | 0x80000000); data << uint32(entry | 0x80000000);
SendPacket(&data); SendPacket(&data);
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Sent SMSG_CREATURE_QUERY_RESPONSE"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Sent SMSG_CREATURE_QUERY_RESPONSE");
#endif
} }
} }
@@ -171,7 +175,9 @@ void WorldSession::HandleGameObjectQueryOpcode(WorldPacket & recvData)
ObjectMgr::GetLocaleString(gameObjectLocale->CastBarCaption, localeConstant, CastBarCaption); ObjectMgr::GetLocaleString(gameObjectLocale->CastBarCaption, localeConstant, CastBarCaption);
} }
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_GAMEOBJECT_QUERY '%s' - Entry: %u. ", info->name.c_str(), entry); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_GAMEOBJECT_QUERY '%s' - Entry: %u. ", info->name.c_str(), entry);
#endif
WorldPacket data (SMSG_GAMEOBJECT_QUERY_RESPONSE, 150); WorldPacket data (SMSG_GAMEOBJECT_QUERY_RESPONSE, 150);
data << uint32(entry); data << uint32(entry);
data << uint32(info->type); data << uint32(info->type);
@@ -193,22 +199,30 @@ void WorldSession::HandleGameObjectQueryOpcode(WorldPacket & recvData)
data << uint32(0); data << uint32(0);
SendPacket(&data); SendPacket(&data);
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Sent SMSG_GAMEOBJECT_QUERY_RESPONSE"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Sent SMSG_GAMEOBJECT_QUERY_RESPONSE");
#endif
} }
else else
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_GAMEOBJECT_QUERY - Missing gameobject info for (GUID: %u, ENTRY: %u)", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_GAMEOBJECT_QUERY - Missing gameobject info for (GUID: %u, ENTRY: %u)",
#endif
// GUID_LOPART(guid), entry); // GUID_LOPART(guid), entry);
WorldPacket data (SMSG_GAMEOBJECT_QUERY_RESPONSE, 4); WorldPacket data (SMSG_GAMEOBJECT_QUERY_RESPONSE, 4);
data << uint32(entry | 0x80000000); data << uint32(entry | 0x80000000);
SendPacket(&data); SendPacket(&data);
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Sent SMSG_GAMEOBJECT_QUERY_RESPONSE"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Sent SMSG_GAMEOBJECT_QUERY_RESPONSE");
#endif
} }
} }
void WorldSession::HandleCorpseQueryOpcode(WorldPacket & /*recvData*/) void WorldSession::HandleCorpseQueryOpcode(WorldPacket & /*recvData*/)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received MSG_CORPSE_QUERY"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received MSG_CORPSE_QUERY");
#endif
Corpse* corpse = GetPlayer()->GetCorpse(); Corpse* corpse = GetPlayer()->GetCorpse();
@@ -263,7 +277,9 @@ void WorldSession::HandleNpcTextQueryOpcode(WorldPacket & recvData)
uint64 guid; uint64 guid;
recvData >> textID; recvData >> textID;
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_NPC_TEXT_QUERY ID '%u'", textID); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_NPC_TEXT_QUERY ID '%u'", textID);
#endif
recvData >> guid; recvData >> guid;
@@ -340,13 +356,17 @@ void WorldSession::HandleNpcTextQueryOpcode(WorldPacket & recvData)
SendPacket(&data); SendPacket(&data);
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Sent SMSG_NPC_TEXT_UPDATE"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Sent SMSG_NPC_TEXT_UPDATE");
#endif
} }
/// Only _static_ data is sent in this packet !!! /// Only _static_ data is sent in this packet !!!
void WorldSession::HandlePageTextQueryOpcode(WorldPacket & recvData) void WorldSession::HandlePageTextQueryOpcode(WorldPacket & recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_PAGE_TEXT_QUERY"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_PAGE_TEXT_QUERY");
#endif
uint32 pageID; uint32 pageID;
recvData >> pageID; recvData >> pageID;
@@ -380,13 +400,17 @@ void WorldSession::HandlePageTextQueryOpcode(WorldPacket & recvData)
} }
SendPacket(&data); SendPacket(&data);
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Sent SMSG_PAGE_TEXT_QUERY_RESPONSE"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Sent SMSG_PAGE_TEXT_QUERY_RESPONSE");
#endif
} }
} }
void WorldSession::HandleCorpseMapPositionQuery(WorldPacket & recvData) void WorldSession::HandleCorpseMapPositionQuery(WorldPacket & recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Recv CMSG_CORPSE_MAP_POSITION_QUERY"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Recv CMSG_CORPSE_MAP_POSITION_QUERY");
#endif
uint32 unk; uint32 unk;
recvData >> unk; recvData >> unk;
src/game/Handlers/QuestHandler.cpp
+60 -20
View File
@@ -30,7 +30,9 @@ void WorldSession::HandleQuestgiverStatusQueryOpcode(WorldPacket & recvData)
Object* questGiver = ObjectAccessor::GetObjectByTypeMask(*_player, guid, TYPEMASK_UNIT | TYPEMASK_GAMEOBJECT); Object* questGiver = ObjectAccessor::GetObjectByTypeMask(*_player, guid, TYPEMASK_UNIT | TYPEMASK_GAMEOBJECT);
if (!questGiver) if (!questGiver)
{ {
;//sLog->outDetail("Error in CMSG_QUESTGIVER_STATUS_QUERY, called for not found questgiver (Typeid: %u GUID: %u)", GuidHigh2TypeId(GUID_HIPART(guid)), GUID_LOPART(guid)); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("Error in CMSG_QUESTGIVER_STATUS_QUERY, called for not found questgiver (Typeid: %u GUID: %u)", GuidHigh2TypeId(GUID_HIPART(guid)), GUID_LOPART(guid));
#endif
return; return;
} }
@@ -38,14 +40,18 @@ void WorldSession::HandleQuestgiverStatusQueryOpcode(WorldPacket & recvData)
{ {
case TYPEID_UNIT: case TYPEID_UNIT:
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_QUESTGIVER_STATUS_QUERY for npc, guid = %u", uint32(GUID_LOPART(guid))); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_QUESTGIVER_STATUS_QUERY for npc, guid = %u", uint32(GUID_LOPART(guid)));
#endif
if (!questGiver->ToCreature()->IsHostileTo(_player)) // do not show quest status to enemies if (!questGiver->ToCreature()->IsHostileTo(_player)) // do not show quest status to enemies
questStatus = _player->GetQuestDialogStatus(questGiver); questStatus = _player->GetQuestDialogStatus(questGiver);
break; break;
} }
case TYPEID_GAMEOBJECT: case TYPEID_GAMEOBJECT:
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_QUESTGIVER_STATUS_QUERY for GameObject guid = %u", uint32(GUID_LOPART(guid))); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_QUESTGIVER_STATUS_QUERY for GameObject guid = %u", uint32(GUID_LOPART(guid)));
#endif
questStatus = _player->GetQuestDialogStatus(questGiver); questStatus = _player->GetQuestDialogStatus(questGiver);
break; break;
} }
@@ -63,12 +69,16 @@ void WorldSession::HandleQuestgiverHelloOpcode(WorldPacket & recvData)
uint64 guid; uint64 guid;
recvData >> guid; recvData >> guid;
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_QUESTGIVER_HELLO npc = %u", GUID_LOPART(guid)); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_QUESTGIVER_HELLO npc = %u", GUID_LOPART(guid));
#endif
Creature* creature = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_NONE); Creature* creature = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_NONE);
if (!creature) if (!creature)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandleQuestgiverHelloOpcode - Unit (GUID: %u) not found or you can't interact with him.", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandleQuestgiverHelloOpcode - Unit (GUID: %u) not found or you can't interact with him.",
#endif
// GUID_LOPART(guid)); // GUID_LOPART(guid));
return; return;
} }
@@ -96,7 +106,9 @@ void WorldSession::HandleQuestgiverAcceptQuestOpcode(WorldPacket & recvData)
uint32 unk1; uint32 unk1;
recvData >> guid >> questId >> unk1; recvData >> guid >> questId >> unk1;
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_QUESTGIVER_ACCEPT_QUEST npc = %u, quest = %u, unk1 = %u", uint32(GUID_LOPART(guid)), questId, unk1); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_QUESTGIVER_ACCEPT_QUEST npc = %u, quest = %u, unk1 = %u", uint32(GUID_LOPART(guid)), questId, unk1);
#endif
Object* object = ObjectAccessor::GetObjectByTypeMask(*_player, guid, TYPEMASK_UNIT|TYPEMASK_GAMEOBJECT|TYPEMASK_ITEM|TYPEMASK_PLAYER); Object* object = ObjectAccessor::GetObjectByTypeMask(*_player, guid, TYPEMASK_UNIT|TYPEMASK_GAMEOBJECT|TYPEMASK_ITEM|TYPEMASK_PLAYER);
@@ -185,7 +197,9 @@ void WorldSession::HandleQuestgiverQueryQuestOpcode(WorldPacket & recvData)
uint32 questId; uint32 questId;
uint8 unk1; uint8 unk1;
recvData >> guid >> questId >> unk1; recvData >> guid >> questId >> unk1;
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_QUESTGIVER_QUERY_QUEST npc = %u, quest = %u, unk1 = %u", uint32(GUID_LOPART(guid)), questId, unk1); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_QUESTGIVER_QUERY_QUEST npc = %u, quest = %u, unk1 = %u", uint32(GUID_LOPART(guid)), questId, unk1);
#endif
// Verify that the guid is valid and is a questgiver or involved in the requested quest // Verify that the guid is valid and is a questgiver or involved in the requested quest
Object* object = ObjectAccessor::GetObjectByTypeMask(*_player, guid, TYPEMASK_UNIT | TYPEMASK_GAMEOBJECT | TYPEMASK_ITEM); Object* object = ObjectAccessor::GetObjectByTypeMask(*_player, guid, TYPEMASK_UNIT | TYPEMASK_GAMEOBJECT | TYPEMASK_ITEM);
@@ -220,7 +234,9 @@ void WorldSession::HandleQuestQueryOpcode(WorldPacket & recvData)
uint32 questId; uint32 questId;
recvData >> questId; recvData >> questId;
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_QUEST_QUERY quest = %u", questId); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_QUEST_QUERY quest = %u", questId);
#endif
if (Quest const* quest = sObjectMgr->GetQuestTemplate(questId)) if (Quest const* quest = sObjectMgr->GetQuestTemplate(questId))
_player->PlayerTalkClass->SendQuestQueryResponse(quest); _player->PlayerTalkClass->SendQuestQueryResponse(quest);
@@ -238,7 +254,9 @@ void WorldSession::HandleQuestgiverChooseRewardOpcode(WorldPacket & recvData)
return; return;
} }
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_QUESTGIVER_CHOOSE_REWARD npc = %u, quest = %u, reward = %u", uint32(GUID_LOPART(guid)), questId, reward); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_QUESTGIVER_CHOOSE_REWARD npc = %u, quest = %u, reward = %u", uint32(GUID_LOPART(guid)), questId, reward);
#endif
Object* object = ObjectAccessor::GetObjectByTypeMask(*_player, guid, TYPEMASK_UNIT | TYPEMASK_GAMEOBJECT); Object* object = ObjectAccessor::GetObjectByTypeMask(*_player, guid, TYPEMASK_UNIT | TYPEMASK_GAMEOBJECT);
if (!object || !object->hasInvolvedQuest(questId)) if (!object || !object->hasInvolvedQuest(questId))
@@ -318,7 +336,9 @@ void WorldSession::HandleQuestgiverRequestRewardOpcode(WorldPacket & recvData)
uint64 guid; uint64 guid;
recvData >> guid >> questId; recvData >> guid >> questId;
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_QUESTGIVER_REQUEST_REWARD npc = %u, quest = %u", uint32(GUID_LOPART(guid)), questId); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_QUESTGIVER_REQUEST_REWARD npc = %u, quest = %u", uint32(GUID_LOPART(guid)), questId);
#endif
Object* object = ObjectAccessor::GetObjectByTypeMask(*_player, guid, TYPEMASK_UNIT | TYPEMASK_GAMEOBJECT); Object* object = ObjectAccessor::GetObjectByTypeMask(*_player, guid, TYPEMASK_UNIT | TYPEMASK_GAMEOBJECT);
if (!object || !object->hasInvolvedQuest(questId)) if (!object || !object->hasInvolvedQuest(questId))
@@ -340,7 +360,9 @@ void WorldSession::HandleQuestgiverRequestRewardOpcode(WorldPacket & recvData)
void WorldSession::HandleQuestgiverCancel(WorldPacket& /*recvData*/) void WorldSession::HandleQuestgiverCancel(WorldPacket& /*recvData*/)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_QUESTGIVER_CANCEL"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_QUESTGIVER_CANCEL");
#endif
_player->PlayerTalkClass->SendCloseGossip(); _player->PlayerTalkClass->SendCloseGossip();
} }
@@ -353,7 +375,9 @@ void WorldSession::HandleQuestLogSwapQuest(WorldPacket& recvData)
if (slot1 == slot2 || slot1 >= MAX_QUEST_LOG_SIZE || slot2 >= MAX_QUEST_LOG_SIZE) if (slot1 == slot2 || slot1 >= MAX_QUEST_LOG_SIZE || slot2 >= MAX_QUEST_LOG_SIZE)
return; return;
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_QUESTLOG_SWAP_QUEST slot 1 = %u, slot 2 = %u", slot1, slot2); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_QUESTLOG_SWAP_QUEST slot 1 = %u, slot 2 = %u", slot1, slot2);
#endif
GetPlayer()->SwapQuestSlot(slot1, slot2); GetPlayer()->SwapQuestSlot(slot1, slot2);
} }
@@ -363,7 +387,9 @@ void WorldSession::HandleQuestLogRemoveQuest(WorldPacket& recvData)
uint8 slot; uint8 slot;
recvData >> slot; recvData >> slot;
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_QUESTLOG_REMOVE_QUEST slot = %u", slot); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_QUESTLOG_REMOVE_QUEST slot = %u", slot);
#endif
if (slot < MAX_QUEST_LOG_SIZE) if (slot < MAX_QUEST_LOG_SIZE)
{ {
@@ -388,7 +414,9 @@ void WorldSession::HandleQuestLogRemoveQuest(WorldPacket& recvData)
_player->RemoveActiveQuest(questId); _player->RemoveActiveQuest(questId);
_player->RemoveTimedAchievement(ACHIEVEMENT_TIMED_TYPE_QUEST, questId); _player->RemoveTimedAchievement(ACHIEVEMENT_TIMED_TYPE_QUEST, questId);
;//sLog->outDetail("Player %u abandoned quest %u", _player->GetGUIDLow(), questId); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("Player %u abandoned quest %u", _player->GetGUIDLow(), questId);
#endif
} }
_player->SetQuestSlot(slot, 0); _player->SetQuestSlot(slot, 0);
@@ -402,7 +430,9 @@ void WorldSession::HandleQuestConfirmAccept(WorldPacket& recvData)
uint32 questId; uint32 questId;
recvData >> questId; recvData >> questId;
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_QUEST_CONFIRM_ACCEPT quest = %u", questId); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_QUEST_CONFIRM_ACCEPT quest = %u", questId);
#endif
if (Quest const* quest = sObjectMgr->GetQuestTemplate(questId)) if (Quest const* quest = sObjectMgr->GetQuestTemplate(questId))
{ {
@@ -439,7 +469,9 @@ void WorldSession::HandleQuestgiverCompleteQuest(WorldPacket& recvData)
recvData >> guid >> questId; recvData >> guid >> questId;
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_QUESTGIVER_COMPLETE_QUEST npc = %u, quest = %u", uint32(GUID_LOPART(guid)), questId); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_QUESTGIVER_COMPLETE_QUEST npc = %u, quest = %u", uint32(GUID_LOPART(guid)), questId);
#endif
Object* object = ObjectAccessor::GetObjectByTypeMask(*_player, guid, TYPEMASK_UNIT | TYPEMASK_GAMEOBJECT); Object* object = ObjectAccessor::GetObjectByTypeMask(*_player, guid, TYPEMASK_UNIT | TYPEMASK_GAMEOBJECT);
if (!object || !object->hasInvolvedQuest(questId)) if (!object || !object->hasInvolvedQuest(questId))
@@ -481,7 +513,9 @@ void WorldSession::HandleQuestgiverCompleteQuest(WorldPacket& recvData)
void WorldSession::HandleQuestgiverQuestAutoLaunch(WorldPacket& /*recvPacket*/) void WorldSession::HandleQuestgiverQuestAutoLaunch(WorldPacket& /*recvPacket*/)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_QUESTGIVER_QUEST_AUTOLAUNCH"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_QUESTGIVER_QUEST_AUTOLAUNCH");
#endif
} }
void WorldSession::HandlePushQuestToParty(WorldPacket& recvPacket) void WorldSession::HandlePushQuestToParty(WorldPacket& recvPacket)
@@ -492,7 +526,9 @@ void WorldSession::HandlePushQuestToParty(WorldPacket& recvPacket)
if (!_player->CanShareQuest(questId)) if (!_player->CanShareQuest(questId))
return; return;
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_PUSHQUESTTOPARTY quest = %u", questId); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_PUSHQUESTTOPARTY quest = %u", questId);
#endif
if (Quest const* quest = sObjectMgr->GetQuestTemplate(questId)) if (Quest const* quest = sObjectMgr->GetQuestTemplate(questId))
{ {
@@ -559,7 +595,9 @@ void WorldSession::HandleQuestPushResult(WorldPacket& recvPacket)
uint8 msg; uint8 msg;
recvPacket >> guid >> questId >> msg; recvPacket >> guid >> questId >> msg;
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received MSG_QUEST_PUSH_RESULT"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received MSG_QUEST_PUSH_RESULT");
#endif
if (_player->GetDivider() && _player->GetDivider() == guid) if (_player->GetDivider() && _player->GetDivider() == guid)
{ {
@@ -576,7 +614,9 @@ void WorldSession::HandleQuestPushResult(WorldPacket& recvPacket)
void WorldSession::HandleQuestgiverStatusMultipleQuery(WorldPacket& /*recvPacket*/) void WorldSession::HandleQuestgiverStatusMultipleQuery(WorldPacket& /*recvPacket*/)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_QUESTGIVER_STATUS_MULTIPLE_QUERY"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_QUESTGIVER_STATUS_MULTIPLE_QUERY");
#endif
uint32 count = 0; uint32 count = 0;
src/game/Handlers/ReferAFriendHandler.cpp
+6 -2
View File
@@ -12,7 +12,9 @@
void WorldSession::HandleGrantLevel(WorldPacket& recvData) void WorldSession::HandleGrantLevel(WorldPacket& recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_GRANT_LEVEL"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_GRANT_LEVEL");
#endif
uint64 guid; uint64 guid;
recvData.readPackGUID(guid); recvData.readPackGUID(guid);
@@ -54,7 +56,9 @@ void WorldSession::HandleGrantLevel(WorldPacket& recvData)
void WorldSession::HandleAcceptGrantLevel(WorldPacket& recvData) void WorldSession::HandleAcceptGrantLevel(WorldPacket& recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_ACCEPT_LEVEL_GRANT"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_ACCEPT_LEVEL_GRANT");
#endif
uint64 guid; uint64 guid;
recvData.readPackGUID(guid); recvData.readPackGUID(guid);
src/game/Handlers/SkillHandler.cpp
+9 -3
View File
@@ -26,7 +26,9 @@ void WorldSession::HandleLearnTalentOpcode(WorldPacket & recvData)
void WorldSession::HandleLearnPreviewTalents(WorldPacket& recvPacket) void WorldSession::HandleLearnPreviewTalents(WorldPacket& recvPacket)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_LEARN_PREVIEW_TALENTS"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_LEARN_PREVIEW_TALENTS");
#endif
uint32 talentsCount; uint32 talentsCount;
recvPacket >> talentsCount; recvPacket >> talentsCount;
@@ -50,14 +52,18 @@ void WorldSession::HandleLearnPreviewTalents(WorldPacket& recvPacket)
void WorldSession::HandleTalentWipeConfirmOpcode(WorldPacket & recvData) void WorldSession::HandleTalentWipeConfirmOpcode(WorldPacket & recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "MSG_TALENT_WIPE_CONFIRM"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "MSG_TALENT_WIPE_CONFIRM");
#endif
uint64 guid; uint64 guid;
recvData >> guid; recvData >> guid;
Creature* unit = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_TRAINER); Creature* unit = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_TRAINER);
if (!unit) if (!unit)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandleTalentWipeConfirmOpcode - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(guid))); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandleTalentWipeConfirmOpcode - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(guid)));
#endif
return; return;
} }
src/game/Handlers/SpellHandler.cpp
+27 -9
View File
@@ -82,7 +82,9 @@ void WorldSession::HandleUseItemOpcode(WorldPacket& recvPacket)
return; return;
} }
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_USE_ITEM packet, bagIndex: %u, slot: %u, castCount: %u, spellId: %u, Item: %u, glyphIndex: %u, data length = %i", bagIndex, slot, castCount, spellId, pItem->GetEntry(), glyphIndex, (uint32)recvPacket.size()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_USE_ITEM packet, bagIndex: %u, slot: %u, castCount: %u, spellId: %u, Item: %u, glyphIndex: %u, data length = %i", bagIndex, slot, castCount, spellId, pItem->GetEntry(), glyphIndex, (uint32)recvPacket.size());
#endif
ItemTemplate const* proto = pItem->GetTemplate(); ItemTemplate const* proto = pItem->GetTemplate();
if (!proto) if (!proto)
@@ -159,7 +161,9 @@ void WorldSession::HandleUseItemOpcode(WorldPacket& recvPacket)
void WorldSession::HandleOpenItemOpcode(WorldPacket& recvPacket) void WorldSession::HandleOpenItemOpcode(WorldPacket& recvPacket)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_OPEN_ITEM packet, data length = %i", (uint32)recvPacket.size()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_OPEN_ITEM packet, data length = %i", (uint32)recvPacket.size());
#endif
Player* pUser = _player; Player* pUser = _player;
@@ -178,7 +182,9 @@ void WorldSession::HandleOpenItemOpcode(WorldPacket& recvPacket)
recvPacket >> bagIndex >> slot; recvPacket >> bagIndex >> slot;
;//sLog->outDetail("bagIndex: %u, slot: %u", bagIndex, slot); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("bagIndex: %u, slot: %u", bagIndex, slot);
#endif
Item* item = pUser->GetItemByPos(bagIndex, slot); Item* item = pUser->GetItemByPos(bagIndex, slot);
if (!item) if (!item)
@@ -285,7 +291,9 @@ void WorldSession::HandleGameObjectUseOpcode(WorldPacket & recvData)
uint64 guid; uint64 guid;
recvData >> guid; recvData >> guid;
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Recvd CMSG_GAMEOBJ_USE Message [guid=%u]", GUID_LOPART(guid)); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Recvd CMSG_GAMEOBJ_USE Message [guid=%u]", GUID_LOPART(guid));
#endif
if (GameObject* obj = GetPlayer()->GetMap()->GetGameObject(guid)) if (GameObject* obj = GetPlayer()->GetMap()->GetGameObject(guid))
{ {
@@ -306,7 +314,9 @@ void WorldSession::HandleGameobjectReportUse(WorldPacket& recvPacket)
uint64 guid; uint64 guid;
recvPacket >> guid; recvPacket >> guid;
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Recvd CMSG_GAMEOBJ_REPORT_USE Message [in game guid: %u]", GUID_LOPART(guid)); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Recvd CMSG_GAMEOBJ_REPORT_USE Message [in game guid: %u]", GUID_LOPART(guid));
#endif
// ignore for remote control state // ignore for remote control state
if (_player->m_mover != _player) if (_player->m_mover != _player)
@@ -331,7 +341,9 @@ void WorldSession::HandleCastSpellOpcode(WorldPacket& recvPacket)
uint8 castCount, castFlags; uint8 castCount, castFlags;
recvPacket >> castCount >> spellId >> castFlags; recvPacket >> castCount >> spellId >> castFlags;
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: got cast spell packet, castCount: %u, spellId: %u, castFlags: %u, data length = %u", castCount, spellId, castFlags, (uint32)recvPacket.size()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: got cast spell packet, castCount: %u, spellId: %u, castFlags: %u, data length = %u", castCount, spellId, castFlags, (uint32)recvPacket.size());
#endif
// ignore for remote control state (for player case) // ignore for remote control state (for player case)
Unit* mover = _player->m_mover; Unit* mover = _player->m_mover;
@@ -559,7 +571,9 @@ void WorldSession::HandleTotemDestroyed(WorldPacket& recvPacket)
void WorldSession::HandleSelfResOpcode(WorldPacket & /*recvData*/) void WorldSession::HandleSelfResOpcode(WorldPacket & /*recvData*/)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_SELF_RES"); // empty opcode #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_SELF_RES"); // empty opcode
#endif
if (_player->HasAuraType(SPELL_AURA_PREVENT_RESURRECTION)) if (_player->HasAuraType(SPELL_AURA_PREVENT_RESURRECTION))
return; // silent return, client should display error by itself and not send this opcode return; // silent return, client should display error by itself and not send this opcode
@@ -597,7 +611,9 @@ void WorldSession::HandleSpellClick(WorldPacket& recvData)
void WorldSession::HandleMirrorImageDataRequest(WorldPacket & recvData) void WorldSession::HandleMirrorImageDataRequest(WorldPacket & recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_GET_MIRRORIMAGE_DATA"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_GET_MIRRORIMAGE_DATA");
#endif
uint64 guid; uint64 guid;
recvData >> guid; recvData >> guid;
@@ -690,7 +706,9 @@ void WorldSession::HandleMirrorImageDataRequest(WorldPacket & recvData)
void WorldSession::HandleUpdateProjectilePosition(WorldPacket& recvPacket) void WorldSession::HandleUpdateProjectilePosition(WorldPacket& recvPacket)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_UPDATE_PROJECTILE_POSITION"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_UPDATE_PROJECTILE_POSITION");
#endif
uint64 casterGuid; uint64 casterGuid;
uint32 spellId; uint32 spellId;
src/game/Handlers/TaxiHandler.cpp
+48 -16
View File
@@ -17,7 +17,9 @@
void WorldSession::HandleTaxiNodeStatusQueryOpcode(WorldPacket & recvData) void WorldSession::HandleTaxiNodeStatusQueryOpcode(WorldPacket & recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_TAXINODE_STATUS_QUERY"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_TAXINODE_STATUS_QUERY");
#endif
uint64 guid; uint64 guid;
@@ -31,7 +33,9 @@ void WorldSession::SendTaxiStatus(uint64 guid)
Creature* unit = GetPlayer()->GetMap()->GetCreature(guid); Creature* unit = GetPlayer()->GetMap()->GetCreature(guid);
if (!unit) if (!unit)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WorldSession::SendTaxiStatus - Unit (GUID: %u) not found.", uint32(GUID_LOPART(guid))); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WorldSession::SendTaxiStatus - Unit (GUID: %u) not found.", uint32(GUID_LOPART(guid)));
#endif
return; return;
} }
@@ -41,18 +45,24 @@ void WorldSession::SendTaxiStatus(uint64 guid)
if (curloc == 0) if (curloc == 0)
return; return;
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: current location %u ", curloc); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: current location %u ", curloc);
#endif
WorldPacket data(SMSG_TAXINODE_STATUS, 9); WorldPacket data(SMSG_TAXINODE_STATUS, 9);
data << guid; data << guid;
data << uint8(GetPlayer()->m_taxi.IsTaximaskNodeKnown(curloc) ? 1 : 0); data << uint8(GetPlayer()->m_taxi.IsTaximaskNodeKnown(curloc) ? 1 : 0);
SendPacket(&data); SendPacket(&data);
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Sent SMSG_TAXINODE_STATUS"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Sent SMSG_TAXINODE_STATUS");
#endif
} }
void WorldSession::HandleTaxiQueryAvailableNodes(WorldPacket & recvData) void WorldSession::HandleTaxiQueryAvailableNodes(WorldPacket & recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_TAXIQUERYAVAILABLENODES"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_TAXIQUERYAVAILABLENODES");
#endif
uint64 guid; uint64 guid;
recvData >> guid; recvData >> guid;
@@ -61,7 +71,9 @@ void WorldSession::HandleTaxiQueryAvailableNodes(WorldPacket & recvData)
Creature* unit = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_FLIGHTMASTER); Creature* unit = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_FLIGHTMASTER);
if (!unit) if (!unit)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandleTaxiQueryAvailableNodes - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(guid))); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandleTaxiQueryAvailableNodes - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(guid)));
#endif
return; return;
} }
@@ -88,7 +100,9 @@ void WorldSession::SendTaxiMenu(Creature* unit)
bool lastTaxiCheaterState = GetPlayer()->isTaxiCheater(); bool lastTaxiCheaterState = GetPlayer()->isTaxiCheater();
if (unit->GetEntry() == 29480) GetPlayer()->SetTaxiCheater(true); // Grimwing in Ebon Hold, special case. NOTE: Not perfect, Zul'Aman should not be included according to WoWhead, and I think taxicheat includes it. if (unit->GetEntry() == 29480) GetPlayer()->SetTaxiCheater(true); // Grimwing in Ebon Hold, special case. NOTE: Not perfect, Zul'Aman should not be included according to WoWhead, and I think taxicheat includes it.
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_TAXINODE_STATUS_QUERY %u ", curloc); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_TAXINODE_STATUS_QUERY %u ", curloc);
#endif
WorldPacket data(SMSG_SHOWTAXINODES, (4 + 8 + 4 + 8 * 4)); WorldPacket data(SMSG_SHOWTAXINODES, (4 + 8 + 4 + 8 * 4));
data << uint32(1); data << uint32(1);
@@ -97,7 +111,9 @@ void WorldSession::SendTaxiMenu(Creature* unit)
GetPlayer()->m_taxi.AppendTaximaskTo(data, GetPlayer()->isTaxiCheater()); GetPlayer()->m_taxi.AppendTaximaskTo(data, GetPlayer()->isTaxiCheater());
SendPacket(&data); SendPacket(&data);
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Sent SMSG_SHOWTAXINODES"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Sent SMSG_SHOWTAXINODES");
#endif
GetPlayer()->SetTaxiCheater(lastTaxiCheaterState); GetPlayer()->SetTaxiCheater(lastTaxiCheaterState);
} }
@@ -152,7 +168,9 @@ void WorldSession::SendDiscoverNewTaxiNode(uint32 nodeid)
void WorldSession::HandleActivateTaxiExpressOpcode (WorldPacket & recvData) void WorldSession::HandleActivateTaxiExpressOpcode (WorldPacket & recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_ACTIVATETAXIEXPRESS"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_ACTIVATETAXIEXPRESS");
#endif
uint64 guid; uint64 guid;
uint32 node_count; uint32 node_count;
@@ -162,7 +180,9 @@ void WorldSession::HandleActivateTaxiExpressOpcode (WorldPacket & recvData)
Creature* npc = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_FLIGHTMASTER); Creature* npc = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_FLIGHTMASTER);
if (!npc) if (!npc)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandleActivateTaxiExpressOpcode - Unit (GUID: %u) not found or you can't interact with it.", uint32(GUID_LOPART(guid))); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandleActivateTaxiExpressOpcode - Unit (GUID: %u) not found or you can't interact with it.", uint32(GUID_LOPART(guid)));
#endif
return; return;
} }
std::vector<uint32> nodes; std::vector<uint32> nodes;
@@ -185,14 +205,18 @@ void WorldSession::HandleActivateTaxiExpressOpcode (WorldPacket & recvData)
if (nodes.empty()) if (nodes.empty())
return; return;
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_ACTIVATETAXIEXPRESS from %d to %d", nodes.front(), nodes.back()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_ACTIVATETAXIEXPRESS from %d to %d", nodes.front(), nodes.back());
#endif
GetPlayer()->ActivateTaxiPathTo(nodes, npc, 0); GetPlayer()->ActivateTaxiPathTo(nodes, npc, 0);
} }
void WorldSession::HandleMoveSplineDoneOpcode(WorldPacket& recvData) void WorldSession::HandleMoveSplineDoneOpcode(WorldPacket& recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_MOVE_SPLINE_DONE"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_MOVE_SPLINE_DONE");
#endif
uint64 guid; // used only for proper packet read uint64 guid; // used only for proper packet read
recvData.readPackGUID(guid); recvData.readPackGUID(guid);
@@ -206,18 +230,24 @@ void WorldSession::HandleMoveSplineDoneOpcode(WorldPacket& recvData)
void WorldSession::HandleActivateTaxiOpcode(WorldPacket & recvData) void WorldSession::HandleActivateTaxiOpcode(WorldPacket & recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_ACTIVATETAXI"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_ACTIVATETAXI");
#endif
uint64 guid; uint64 guid;
std::vector<uint32> nodes; std::vector<uint32> nodes;
nodes.resize(2); nodes.resize(2);
recvData >> guid >> nodes[0] >> nodes[1]; recvData >> guid >> nodes[0] >> nodes[1];
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_ACTIVATETAXI from %d to %d", nodes[0], nodes[1]); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_ACTIVATETAXI from %d to %d", nodes[0], nodes[1]);
#endif
Creature* npc = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_FLIGHTMASTER); Creature* npc = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_FLIGHTMASTER);
if (!npc) if (!npc)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandleActivateTaxiOpcode - Unit (GUID: %u) not found or you can't interact with it.", uint32(GUID_LOPART(guid))); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandleActivateTaxiOpcode - Unit (GUID: %u) not found or you can't interact with it.", uint32(GUID_LOPART(guid)));
#endif
return; return;
} }
@@ -239,5 +269,7 @@ void WorldSession::SendActivateTaxiReply(ActivateTaxiReply reply)
data << uint32(reply); data << uint32(reply);
SendPacket(&data); SendPacket(&data);
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Sent SMSG_ACTIVATETAXIREPLY"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Sent SMSG_ACTIVATETAXIREPLY");
#endif
} }
src/game/Handlers/TradeHandler.cpp
+18 -6
View File
@@ -58,13 +58,17 @@ void WorldSession::SendTradeStatus(TradeStatus status)
void WorldSession::HandleIgnoreTradeOpcode(WorldPacket& /*recvPacket*/) void WorldSession::HandleIgnoreTradeOpcode(WorldPacket& /*recvPacket*/)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Ignore Trade %u", _player->GetGUIDLow()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Ignore Trade %u", _player->GetGUIDLow());
#endif
// recvPacket.print_storage(); // recvPacket.print_storage();
} }
void WorldSession::HandleBusyTradeOpcode(WorldPacket& /*recvPacket*/) void WorldSession::HandleBusyTradeOpcode(WorldPacket& /*recvPacket*/)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Busy Trade %u", _player->GetGUIDLow()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Busy Trade %u", _player->GetGUIDLow());
#endif
// recvPacket.print_storage(); // recvPacket.print_storage();
} }
@@ -139,7 +143,9 @@ void WorldSession::moveItems(Item* myItems[], Item* hisItems[])
if (myItems[i]) if (myItems[i])
{ {
// logging // logging
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "partner storing: %u", myItems[i]->GetGUIDLow()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "partner storing: %u", myItems[i]->GetGUIDLow());
#endif
// adjust time (depends on /played) // adjust time (depends on /played)
if (myItems[i]->HasFlag(ITEM_FIELD_FLAGS, ITEM_FLAG_BOP_TRADEABLE)) if (myItems[i]->HasFlag(ITEM_FIELD_FLAGS, ITEM_FLAG_BOP_TRADEABLE))
@@ -150,7 +156,9 @@ void WorldSession::moveItems(Item* myItems[], Item* hisItems[])
if (hisItems[i]) if (hisItems[i])
{ {
// logging // logging
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "player storing: %u", hisItems[i]->GetGUIDLow()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "player storing: %u", hisItems[i]->GetGUIDLow());
#endif
// adjust time (depends on /played) // adjust time (depends on /played)
if (hisItems[i]->HasFlag(ITEM_FIELD_FLAGS, ITEM_FLAG_BOP_TRADEABLE)) if (hisItems[i]->HasFlag(ITEM_FIELD_FLAGS, ITEM_FLAG_BOP_TRADEABLE))
@@ -198,7 +206,9 @@ static void setAcceptTradeMode(TradeData* myTrade, TradeData* hisTrade, Item* *m
{ {
if (Item* item = myTrade->GetItem(TradeSlots(i))) if (Item* item = myTrade->GetItem(TradeSlots(i)))
{ {
;//sLog->outStaticDebug("player trade item %u bag: %u slot: %u", item->GetGUIDLow(), item->GetBagSlot(), item->GetSlot()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug("player trade item %u bag: %u slot: %u", item->GetGUIDLow(), item->GetBagSlot(), item->GetSlot());
#endif
//Can return NULL //Can return NULL
myItems[i] = item; myItems[i] = item;
myItems[i]->SetInTrade(); myItems[i]->SetInTrade();
@@ -206,7 +216,9 @@ static void setAcceptTradeMode(TradeData* myTrade, TradeData* hisTrade, Item* *m
if (Item* item = hisTrade->GetItem(TradeSlots(i))) if (Item* item = hisTrade->GetItem(TradeSlots(i)))
{ {
;//sLog->outStaticDebug("partner trade item %u bag: %u slot: %u", item->GetGUIDLow(), item->GetBagSlot(), item->GetSlot()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug("partner trade item %u bag: %u slot: %u", item->GetGUIDLow(), item->GetBagSlot(), item->GetSlot());
#endif
hisItems[i] = item; hisItems[i] = item;
hisItems[i]->SetInTrade(); hisItems[i]->SetInTrade();
} }
src/game/Handlers/VehicleHandler.cpp
+9 -3
View File
@@ -14,7 +14,9 @@
void WorldSession::HandleDismissControlledVehicle(WorldPacket &recvData) void WorldSession::HandleDismissControlledVehicle(WorldPacket &recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Recvd CMSG_DISMISS_CONTROLLED_VEHICLE"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Recvd CMSG_DISMISS_CONTROLLED_VEHICLE");
#endif
uint64 vehicleGUID = _player->GetCharmGUID(); uint64 vehicleGUID = _player->GetCharmGUID();
@@ -47,7 +49,9 @@ void WorldSession::HandleDismissControlledVehicle(WorldPacket &recvData)
void WorldSession::HandleChangeSeatsOnControlledVehicle(WorldPacket &recvData) void WorldSession::HandleChangeSeatsOnControlledVehicle(WorldPacket &recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Recvd CMSG_CHANGE_SEATS_ON_CONTROLLED_VEHICLE"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Recvd CMSG_CHANGE_SEATS_ON_CONTROLLED_VEHICLE");
#endif
Unit* vehicle_base = GetPlayer()->GetVehicleBase(); Unit* vehicle_base = GetPlayer()->GetVehicleBase();
if (!vehicle_base) if (!vehicle_base)
@@ -216,7 +220,9 @@ void WorldSession::HandleEjectPassenger(WorldPacket &data)
void WorldSession::HandleRequestVehicleExit(WorldPacket& /*recvData*/) void WorldSession::HandleRequestVehicleExit(WorldPacket& /*recvData*/)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Recvd CMSG_REQUEST_VEHICLE_EXIT"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Recvd CMSG_REQUEST_VEHICLE_EXIT");
#endif
if (Vehicle* vehicle = GetPlayer()->GetVehicle()) if (Vehicle* vehicle = GetPlayer()->GetVehicle())
{ {
src/game/Handlers/VoiceChatHandler.cpp
+9 -3
View File
@@ -12,7 +12,9 @@
void WorldSession::HandleVoiceSessionEnableOpcode(WorldPacket& recvData) void WorldSession::HandleVoiceSessionEnableOpcode(WorldPacket& recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_VOICE_SESSION_ENABLE"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_VOICE_SESSION_ENABLE");
#endif
// uint8 isVoiceEnabled, uint8 isMicrophoneEnabled // uint8 isVoiceEnabled, uint8 isMicrophoneEnabled
recvData.read_skip<uint8>(); recvData.read_skip<uint8>();
recvData.read_skip<uint8>(); recvData.read_skip<uint8>();
@@ -20,13 +22,17 @@ void WorldSession::HandleVoiceSessionEnableOpcode(WorldPacket& recvData)
void WorldSession::HandleChannelVoiceOnOpcode(WorldPacket& /*recvData*/) void WorldSession::HandleChannelVoiceOnOpcode(WorldPacket& /*recvData*/)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_CHANNEL_VOICE_ON"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_CHANNEL_VOICE_ON");
#endif
// Enable Voice button in channel context menu // Enable Voice button in channel context menu
} }
void WorldSession::HandleSetActiveVoiceChannel(WorldPacket& recvData) void WorldSession::HandleSetActiveVoiceChannel(WorldPacket& recvData)
{ {
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_SET_ACTIVE_VOICE_CHANNEL"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_SET_ACTIVE_VOICE_CHANNEL");
#endif
recvData.read_skip<uint32>(); recvData.read_skip<uint32>();
recvData.read_skip<char*>(); recvData.read_skip<char*>();
} }
src/game/Instances/InstanceScript.cpp
+12 -4
View File
@@ -43,7 +43,9 @@ void InstanceScript::HandleGameObject(uint64 GUID, bool open, GameObject* go)
if (go) if (go)
go->SetGoState(open ? GO_STATE_ACTIVE : GO_STATE_READY); go->SetGoState(open ? GO_STATE_ACTIVE : GO_STATE_READY);
else else
;//sLog->outDebug(LOG_FILTER_TSCR, "TSCR: InstanceScript: HandleGameObject failed"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_TSCR, "TSCR: InstanceScript: HandleGameObject failed");
#endif
} }
bool InstanceScript::IsEncounterInProgress() const bool InstanceScript::IsEncounterInProgress() const
@@ -64,7 +66,9 @@ void InstanceScript::LoadMinionData(const MinionData* data)
++data; ++data;
} }
;//sLog->outDebug(LOG_FILTER_TSCR, "InstanceScript::LoadMinionData: " UI64FMTD " minions loaded.", uint64(minions.size())); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_TSCR, "InstanceScript::LoadMinionData: " UI64FMTD " minions loaded.", uint64(minions.size()));
#endif
} }
void InstanceScript::LoadDoorData(const DoorData* data) void InstanceScript::LoadDoorData(const DoorData* data)
@@ -76,7 +80,9 @@ void InstanceScript::LoadDoorData(const DoorData* data)
++data; ++data;
} }
;//sLog->outDebug(LOG_FILTER_TSCR, "InstanceScript::LoadDoorData: " UI64FMTD " doors loaded.", uint64(doors.size())); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_TSCR, "InstanceScript::LoadDoorData: " UI64FMTD " doors loaded.", uint64(doors.size()));
#endif
} }
void InstanceScript::UpdateMinionState(Creature* minion, EncounterState state) void InstanceScript::UpdateMinionState(Creature* minion, EncounterState state)
@@ -295,7 +301,9 @@ void InstanceScript::DoUpdateWorldState(uint32 uiStateId, uint32 uiStateData)
player->SendUpdateWorldState(uiStateId, uiStateData); player->SendUpdateWorldState(uiStateId, uiStateData);
} }
else else
;//sLog->outDebug(LOG_FILTER_TSCR, "TSCR: DoUpdateWorldState attempt send data but no players in map."); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_TSCR, "TSCR: DoUpdateWorldState attempt send data but no players in map.");
#endif
} }
// Send Notify to all players in instance // Send Notify to all players in instance
src/game/Instances/InstanceScript.h
+12 -4
View File
@@ -13,10 +13,18 @@
//#include "GameObject.h" //#include "GameObject.h"
//#include "Map.h" //#include "Map.h"
#define OUT_SAVE_INST_DATA ;//sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Saving Instance Data for Instance %s (Map %d, Instance Id %d)", instance->GetMapName(), instance->GetId(), instance->GetInstanceId()) #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
#define OUT_SAVE_INST_DATA_COMPLETE ;//sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Saving Instance Data for Instance %s (Map %d, Instance Id %d) completed.", instance->GetMapName(), instance->GetId(), instance->GetInstanceId()) #define OUT_SAVE_INST_DATA sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Saving Instance Data for Instance %s (Map %d, Instance Id %d)", instance->GetMapName(), instance->GetId(), instance->GetInstanceId())
#define OUT_LOAD_INST_DATA(a) ;//sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Loading Instance Data for Instance %s (Map %d, Instance Id %d). Input is '%s'", instance->GetMapName(), instance->GetId(), instance->GetInstanceId(), a) #endif
#define OUT_LOAD_INST_DATA_COMPLETE ;//sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Data Load for Instance %s (Map %d, Instance Id: %d) is complete.", instance->GetMapName(), instance->GetId(), instance->GetInstanceId()) #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
#define OUT_SAVE_INST_DATA_COMPLETE sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Saving Instance Data for Instance %s (Map %d, Instance Id %d) completed.", instance->GetMapName(), instance->GetId(), instance->GetInstanceId())
#endif
#ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
#define OUT_LOAD_INST_DATA(a) sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Loading Instance Data for Instance %s (Map %d, Instance Id %d). Input is '%s'", instance->GetMapName(), instance->GetId(), instance->GetInstanceId(), a)
#endif
#ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
#define OUT_LOAD_INST_DATA_COMPLETE sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Data Load for Instance %s (Map %d, Instance Id: %d) is complete.", instance->GetMapName(), instance->GetId(), instance->GetInstanceId())
#endif
#define OUT_LOAD_INST_DATA_FAIL sLog->outError("TSCR: Unable to load Instance Data for Instance %s (Map %d, Instance Id: %d).", instance->GetMapName(), instance->GetId(), instance->GetInstanceId()) #define OUT_LOAD_INST_DATA_FAIL sLog->outError("TSCR: Unable to load Instance Data for Instance %s (Map %d, Instance Id: %d).", instance->GetMapName(), instance->GetId(), instance->GetInstanceId())
class Map; class Map;
src/game/Maps/Map.cpp
+45 -15
View File
@@ -114,13 +114,19 @@ void Map::LoadMMap(int gx, int gy)
switch (mmapLoadResult) switch (mmapLoadResult)
{ {
case MMAP::MMAP_LOAD_RESULT_OK: case MMAP::MMAP_LOAD_RESULT_OK:
;//sLog->outDetail("MMAP loaded name:%s, id:%d, x:%d, y:%d (vmap rep.: x:%d, y:%d)", GetMapName(), GetId(), gx, gy, gx, gy); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("MMAP loaded name:%s, id:%d, x:%d, y:%d (vmap rep.: x:%d, y:%d)", GetMapName(), GetId(), gx, gy, gx, gy);
#endif
break; break;
case MMAP::MMAP_LOAD_RESULT_ERROR: case MMAP::MMAP_LOAD_RESULT_ERROR:
;//sLog->outDetail("Could not load MMAP name:%s, id:%d, x:%d, y:%d (vmap rep.: x:%d, y:%d)", GetMapName(), GetId(), gx, gy, gx, gy); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("Could not load MMAP name:%s, id:%d, x:%d, y:%d (vmap rep.: x:%d, y:%d)", GetMapName(), GetId(), gx, gy, gx, gy);
#endif
break; break;
case MMAP::MMAP_LOAD_RESULT_IGNORED: case MMAP::MMAP_LOAD_RESULT_IGNORED:
;//sLog->outStaticDebug("Ignored MMAP name:%s, id:%d, x:%d, y:%d (vmap rep.: x:%d, y:%d)", GetMapName(), GetId(), gx, gy, gx, gy); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug("Ignored MMAP name:%s, id:%d, x:%d, y:%d (vmap rep.: x:%d, y:%d)", GetMapName(), GetId(), gx, gy, gx, gy);
#endif
break; break;
} }
} }
@@ -132,13 +138,19 @@ void Map::LoadVMap(int gx, int gy)
switch (vmapLoadResult) switch (vmapLoadResult)
{ {
case VMAP::VMAP_LOAD_RESULT_OK: case VMAP::VMAP_LOAD_RESULT_OK:
;//sLog->outDetail("VMAP loaded name:%s, id:%d, x:%d, y:%d (vmap rep.: x:%d, y:%d)", GetMapName(), GetId(), gx, gy, gx, gy); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("VMAP loaded name:%s, id:%d, x:%d, y:%d (vmap rep.: x:%d, y:%d)", GetMapName(), GetId(), gx, gy, gx, gy);
#endif
break; break;
case VMAP::VMAP_LOAD_RESULT_ERROR: case VMAP::VMAP_LOAD_RESULT_ERROR:
;//sLog->outDetail("Could not load VMAP name:%s, id:%d, x:%d, y:%d (vmap rep.: x:%d, y:%d)", GetMapName(), GetId(), gx, gy, gx, gy); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("Could not load VMAP name:%s, id:%d, x:%d, y:%d (vmap rep.: x:%d, y:%d)", GetMapName(), GetId(), gx, gy, gx, gy);
#endif
break; break;
case VMAP::VMAP_LOAD_RESULT_IGNORED: case VMAP::VMAP_LOAD_RESULT_IGNORED:
;//sLog->outStaticDebug("Ignored VMAP name:%s, id:%d, x:%d, y:%d (vmap rep.: x:%d, y:%d)", GetMapName(), GetId(), gx, gy, gx, gy); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug("Ignored VMAP name:%s, id:%d, x:%d, y:%d (vmap rep.: x:%d, y:%d)", GetMapName(), GetId(), gx, gy, gx, gy);
#endif
break; break;
} }
} }
@@ -163,7 +175,9 @@ void Map::LoadMap(int gx, int gy, bool reload)
//map already load, delete it before reloading (Is it necessary? Do we really need the ability the reload maps during runtime?) //map already load, delete it before reloading (Is it necessary? Do we really need the ability the reload maps during runtime?)
if (GridMaps[gx][gy]) if (GridMaps[gx][gy])
{ {
;//sLog->outDetail("Unloading previously loaded map %u before reloading.", GetId()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("Unloading previously loaded map %u before reloading.", GetId());
#endif
sScriptMgr->OnUnloadGridMap(this, GridMaps[gx][gy], gx, gy); sScriptMgr->OnUnloadGridMap(this, GridMaps[gx][gy], gx, gy);
delete (GridMaps[gx][gy]); delete (GridMaps[gx][gy]);
@@ -175,7 +189,9 @@ void Map::LoadMap(int gx, int gy, bool reload)
int len = sWorld->GetDataPath().length()+strlen("maps/%03u%02u%02u.map")+1; int len = sWorld->GetDataPath().length()+strlen("maps/%03u%02u%02u.map")+1;
tmp = new char[len]; tmp = new char[len];
snprintf(tmp, len, (char *)(sWorld->GetDataPath()+"maps/%03u%02u%02u.map").c_str(), GetId(), gx, gy); snprintf(tmp, len, (char *)(sWorld->GetDataPath()+"maps/%03u%02u%02u.map").c_str(), GetId(), gx, gy);
;//sLog->outDetail("Loading map %s", tmp); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("Loading map %s", tmp);
#endif
// loading data // loading data
GridMaps[gx][gy] = new GridMap(); GridMaps[gx][gy] = new GridMap();
if (!GridMaps[gx][gy]->loadData(tmp)) if (!GridMaps[gx][gy]->loadData(tmp))
@@ -300,7 +316,9 @@ void Map::SwitchGridContainers(Creature* obj, bool on)
if (!IsGridLoaded(GridCoord(cell.data.Part.grid_x, cell.data.Part.grid_y))) if (!IsGridLoaded(GridCoord(cell.data.Part.grid_x, cell.data.Part.grid_y)))
return; return;
;//sLog->outStaticDebug("Switch object " UI64FMTD " from grid[%u, %u] %u", obj->GetGUID(), cell.data.Part.grid_x, cell.data.Part.grid_y, on); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug("Switch object " UI64FMTD " from grid[%u, %u] %u", obj->GetGUID(), cell.data.Part.grid_x, cell.data.Part.grid_y, on);
#endif
NGridType *ngrid = getNGrid(cell.GridX(), cell.GridY()); NGridType *ngrid = getNGrid(cell.GridX(), cell.GridY());
ASSERT(ngrid != NULL); ASSERT(ngrid != NULL);
@@ -424,7 +442,9 @@ bool Map::EnsureGridLoaded(const Cell &cell)
{ {
//if (!isGridObjectDataLoaded(cell.GridX(), cell.GridY())) //if (!isGridObjectDataLoaded(cell.GridX(), cell.GridY()))
//{ //{
;//sLog->outDebug(LOG_FILTER_MAPS, "Loading grid[%u, %u] for map %u instance %u", cell.GridX(), cell.GridY(), GetId(), i_InstanceId); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_MAPS, "Loading grid[%u, %u] for map %u instance %u", cell.GridX(), cell.GridY(), GetId(), i_InstanceId);
#endif
setGridObjectDataLoaded(true, cell.GridX(), cell.GridY()); setGridObjectDataLoaded(true, cell.GridX(), cell.GridY());
@@ -1120,7 +1140,9 @@ bool Map::UnloadGrid(NGridType& ngrid)
GridMaps[gx][gy] = NULL; GridMaps[gx][gy] = NULL;
;//sLog->outStaticDebug("Unloading grid[%u, %u] for map %u finished", x, y, GetId()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug("Unloading grid[%u, %u] for map %u finished", x, y, GetId());
#endif
return true; return true;
} }
@@ -1862,7 +1884,9 @@ bool Map::IsOutdoors(float x, float y, float z) const
WMOAreaTableEntry const* wmoEntry= GetWMOAreaTableEntryByTripple(rootId, adtId, groupId); WMOAreaTableEntry const* wmoEntry= GetWMOAreaTableEntryByTripple(rootId, adtId, groupId);
if (wmoEntry) if (wmoEntry)
{ {
;//sLog->outStaticDebug("Got WMOAreaTableEntry! flag %u, areaid %u", wmoEntry->Flags, wmoEntry->areaId); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug("Got WMOAreaTableEntry! flag %u, areaid %u", wmoEntry->Flags, wmoEntry->areaId);
#endif
atEntry = GetAreaEntryByAreaID(wmoEntry->areaId); atEntry = GetAreaEntryByAreaID(wmoEntry->areaId);
} }
return IsOutdoorWMO(mogpFlags, adtId, rootId, groupId, wmoEntry, atEntry); return IsOutdoorWMO(mogpFlags, adtId, rootId, groupId, wmoEntry, atEntry);
@@ -1943,7 +1967,9 @@ ZLiquidStatus Map::getLiquidStatus(float x, float y, float z, uint8 ReqLiquidTyp
uint32 liquid_type = 0; uint32 liquid_type = 0;
if (vmgr->GetLiquidLevel(GetId(), x, y, z, ReqLiquidType, liquid_level, ground_level, liquid_type)) if (vmgr->GetLiquidLevel(GetId(), x, y, z, ReqLiquidType, liquid_level, ground_level, liquid_type))
{ {
;//sLog->outDebug(LOG_FILTER_MAPS, "getLiquidStatus(): vmap liquid level: %f ground: %f type: %u", liquid_level, ground_level, liquid_type); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_MAPS, "getLiquidStatus(): vmap liquid level: %f ground: %f type: %u", liquid_level, ground_level, liquid_type);
#endif
// Check water level and ground level // Check water level and ground level
if (liquid_level > ground_level && z > ground_level - 2) if (liquid_level > ground_level && z > ground_level - 2)
{ {
@@ -2102,7 +2128,9 @@ char const* Map::GetMapName() const
void Map::SendInitSelf(Player* player) void Map::SendInitSelf(Player* player)
{ {
;//sLog->outDetail("Creating player data for himself %u", player->GetGUIDLow()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("Creating player data for himself %u", player->GetGUIDLow());
#endif
UpdateData data; UpdateData data;
@@ -2435,7 +2463,9 @@ bool InstanceMap::CanEnter(Player* player, bool loginCheck)
uint32 maxPlayers = GetMaxPlayers(); uint32 maxPlayers = GetMaxPlayers();
if (GetPlayersCountExceptGMs() >= (loginCheck ? maxPlayers+1 : maxPlayers)) if (GetPlayersCountExceptGMs() >= (loginCheck ? maxPlayers+1 : maxPlayers))
{ {
;//sLog->outDetail("MAP: Instance '%u' of map '%s' cannot have more than '%u' players. Player '%s' rejected", GetInstanceId(), GetMapName(), maxPlayers, player->GetName().c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("MAP: Instance '%u' of map '%s' cannot have more than '%u' players. Player '%s' rejected", GetInstanceId(), GetMapName(), maxPlayers, player->GetName().c_str());
#endif
player->SendTransferAborted(GetId(), TRANSFER_ABORT_MAX_PLAYERS); player->SendTransferAborted(GetId(), TRANSFER_ABORT_MAX_PLAYERS);
return false; return false;
} }
src/game/Maps/MapInstanced.cpp
+6 -2
View File
@@ -190,7 +190,9 @@ InstanceMap* MapInstanced::CreateInstance(uint32 InstanceId, InstanceSave* save,
// some instances only have one difficulty // some instances only have one difficulty
GetDownscaledMapDifficultyData(GetId(), difficulty); GetDownscaledMapDifficultyData(GetId(), difficulty);
;//sLog->outDebug(LOG_FILTER_MAPS, "MapInstanced::CreateInstance: %s map instance %d for %d created with difficulty %s", save?"":"new ", InstanceId, GetId(), difficulty?"heroic":"normal"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_MAPS, "MapInstanced::CreateInstance: %s map instance %d for %d created with difficulty %s", save?"":"new ", InstanceId, GetId(), difficulty?"heroic":"normal");
#endif
InstanceMap* map = new InstanceMap(GetId(), InstanceId, difficulty, this); InstanceMap* map = new InstanceMap(GetId(), InstanceId, difficulty, this);
ASSERT(map->IsDungeon()); ASSERT(map->IsDungeon());
@@ -214,7 +216,9 @@ BattlegroundMap* MapInstanced::CreateBattleground(uint32 InstanceId, Battlegroun
// load/create a map // load/create a map
TRINITY_GUARD(ACE_Thread_Mutex, Lock); TRINITY_GUARD(ACE_Thread_Mutex, Lock);
;//sLog->outDebug(LOG_FILTER_MAPS, "MapInstanced::CreateBattleground: map bg %d for %d created.", InstanceId, GetId()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_MAPS, "MapInstanced::CreateBattleground: map bg %d for %d created.", InstanceId, GetId());
#endif
PvPDifficultyEntry const* bracketEntry = GetBattlegroundBracketByLevel(bg->GetMapId(), bg->GetMinLevel()); PvPDifficultyEntry const* bracketEntry = GetBattlegroundBracketByLevel(bg->GetMapId(), bg->GetMinLevel());
src/game/Maps/MapManager.cpp
+12 -4
View File
@@ -151,7 +151,9 @@ bool MapManager::CanPlayerEnter(uint32 mapid, Player* player, bool loginCheck)
// probably there must be special opcode, because client has this string constant in GlobalStrings.lua // probably there must be special opcode, because client has this string constant in GlobalStrings.lua
// TODO: this is not a good place to send the message // TODO: this is not a good place to send the message
player->GetSession()->SendAreaTriggerMessage(player->GetSession()->GetTrinityString(LANG_INSTANCE_RAID_GROUP_ONLY), mapName); player->GetSession()->SendAreaTriggerMessage(player->GetSession()->GetTrinityString(LANG_INSTANCE_RAID_GROUP_ONLY), mapName);
;//sLog->outDebug(LOG_FILTER_MAPS, "MAP: Player '%s' must be in a raid group to enter instance '%s'", player->GetName().c_str(), mapName); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_MAPS, "MAP: Player '%s' must be in a raid group to enter instance '%s'", player->GetName().c_str(), mapName);
#endif
return false; return false;
} }
} }
@@ -184,15 +186,21 @@ bool MapManager::CanPlayerEnter(uint32 mapid, Player* player, bool loginCheck)
{ {
WorldPacket data(SMSG_CORPSE_NOT_IN_INSTANCE, 0); WorldPacket data(SMSG_CORPSE_NOT_IN_INSTANCE, 0);
player->GetSession()->SendPacket(&data); player->GetSession()->SendPacket(&data);
;//sLog->outDebug(LOG_FILTER_MAPS, "MAP: Player '%s' does not have a corpse in instance '%s' and cannot enter.", player->GetName().c_str(), mapName); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_MAPS, "MAP: Player '%s' does not have a corpse in instance '%s' and cannot enter.", player->GetName().c_str(), mapName);
#endif
return false; return false;
} }
;//sLog->outDebug(LOG_FILTER_MAPS, "MAP: Player '%s' has corpse in instance '%s' and can enter.", player->GetName().c_str(), mapName); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_MAPS, "MAP: Player '%s' has corpse in instance '%s' and can enter.", player->GetName().c_str(), mapName);
#endif
player->ResurrectPlayer(0.5f, false); player->ResurrectPlayer(0.5f, false);
player->SpawnCorpseBones(); player->SpawnCorpseBones();
} }
else else
;//sLog->outDebug(LOG_FILTER_MAPS, "Map::CanPlayerEnter - player '%s' is dead but does not have a corpse!", player->GetName().c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_MAPS, "Map::CanPlayerEnter - player '%s' is dead but does not have a corpse!", player->GetName().c_str());
#endif
} }
// if map exists - check for being full, etc. // if map exists - check for being full, etc.
src/game/Movement/MotionMaster.cpp
+84 -28
View File
@@ -225,7 +225,9 @@ void MotionMaster::MoveRandom(float spawndist)
if (_owner->GetTypeId() == TYPEID_UNIT) if (_owner->GetTypeId() == TYPEID_UNIT)
{ {
;//sLog->outStaticDebug("Creature (GUID: %u) start moving random", _owner->GetGUIDLow()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug("Creature (GUID: %u) start moving random", _owner->GetGUIDLow());
#endif
Mutate(new RandomMovementGenerator<Creature>(spawndist), MOTION_SLOT_IDLE); Mutate(new RandomMovementGenerator<Creature>(spawndist), MOTION_SLOT_IDLE);
} }
} }
@@ -236,7 +238,9 @@ void MotionMaster::MoveTargetedHome()
if (_owner->GetTypeId() == TYPEID_UNIT && !_owner->ToCreature()->GetCharmerOrOwnerGUID()) if (_owner->GetTypeId() == TYPEID_UNIT && !_owner->ToCreature()->GetCharmerOrOwnerGUID())
{ {
;//sLog->outStaticDebug("Creature (Entry: %u GUID: %u) targeted home", _owner->GetEntry(), _owner->GetGUIDLow()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug("Creature (Entry: %u GUID: %u) targeted home", _owner->GetEntry(), _owner->GetGUIDLow());
#endif
Mutate(new HomeMovementGenerator<Creature>(), MOTION_SLOT_ACTIVE); Mutate(new HomeMovementGenerator<Creature>(), MOTION_SLOT_ACTIVE);
} }
else if (_owner->GetTypeId() == TYPEID_UNIT && _owner->ToCreature()->GetCharmerOrOwnerGUID()) else if (_owner->GetTypeId() == TYPEID_UNIT && _owner->ToCreature()->GetCharmerOrOwnerGUID())
@@ -246,11 +250,15 @@ void MotionMaster::MoveTargetedHome()
if (_owner->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE)) if (_owner->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE))
return; return;
;//sLog->outStaticDebug("Pet or controlled creature (Entry: %u GUID: %u) targeting home", _owner->GetEntry(), _owner->GetGUIDLow()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug("Pet or controlled creature (Entry: %u GUID: %u) targeting home", _owner->GetEntry(), _owner->GetGUIDLow());
#endif
Unit* target = _owner->ToCreature()->GetCharmerOrOwner(); Unit* target = _owner->ToCreature()->GetCharmerOrOwner();
if (target) if (target)
{ {
;//sLog->outStaticDebug("Following %s (GUID: %u)", target->GetTypeId() == TYPEID_PLAYER ? "player" : "creature", target->GetTypeId() == TYPEID_PLAYER ? target->GetGUIDLow() : ((Creature*)target)->GetDBTableGUIDLow()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug("Following %s (GUID: %u)", target->GetTypeId() == TYPEID_PLAYER ? "player" : "creature", target->GetTypeId() == TYPEID_PLAYER ? target->GetGUIDLow() : ((Creature*)target)->GetDBTableGUIDLow());
#endif
Mutate(new FollowMovementGenerator<Creature>(target, PET_FOLLOW_DIST, _owner->GetFollowAngle()), MOTION_SLOT_ACTIVE); Mutate(new FollowMovementGenerator<Creature>(target, PET_FOLLOW_DIST, _owner->GetFollowAngle()), MOTION_SLOT_ACTIVE);
} }
} }
@@ -268,12 +276,16 @@ void MotionMaster::MoveConfused()
if (_owner->GetTypeId() == TYPEID_PLAYER) if (_owner->GetTypeId() == TYPEID_PLAYER)
{ {
;//sLog->outStaticDebug("Player (GUID: %u) move confused", _owner->GetGUIDLow()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug("Player (GUID: %u) move confused", _owner->GetGUIDLow());
#endif
Mutate(new ConfusedMovementGenerator<Player>(), MOTION_SLOT_CONTROLLED); Mutate(new ConfusedMovementGenerator<Player>(), MOTION_SLOT_CONTROLLED);
} }
else else
{ {
;//sLog->outStaticDebug("Creature (Entry: %u GUID: %u) move confused", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug("Creature (Entry: %u GUID: %u) move confused",
#endif
// _owner->GetEntry(), _owner->GetGUIDLow()); // _owner->GetEntry(), _owner->GetGUIDLow());
Mutate(new ConfusedMovementGenerator<Creature>(), MOTION_SLOT_CONTROLLED); Mutate(new ConfusedMovementGenerator<Creature>(), MOTION_SLOT_CONTROLLED);
} }
@@ -289,7 +301,9 @@ void MotionMaster::MoveChase(Unit* target, float dist, float angle)
//_owner->ClearUnitState(UNIT_STATE_FOLLOW); //_owner->ClearUnitState(UNIT_STATE_FOLLOW);
if (_owner->GetTypeId() == TYPEID_PLAYER) if (_owner->GetTypeId() == TYPEID_PLAYER)
{ {
;//sLog->outStaticDebug("Player (GUID: %u) chase to %s (GUID: %u)", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug("Player (GUID: %u) chase to %s (GUID: %u)",
#endif
// _owner->GetGUIDLow(), // _owner->GetGUIDLow(),
// target->GetTypeId() == TYPEID_PLAYER ? "player" : "creature", // target->GetTypeId() == TYPEID_PLAYER ? "player" : "creature",
// target->GetTypeId() == TYPEID_PLAYER ? target->GetGUIDLow() : target->ToCreature()->GetDBTableGUIDLow()); // target->GetTypeId() == TYPEID_PLAYER ? target->GetGUIDLow() : target->ToCreature()->GetDBTableGUIDLow());
@@ -297,7 +311,9 @@ void MotionMaster::MoveChase(Unit* target, float dist, float angle)
} }
else else
{ {
;//sLog->outStaticDebug("Creature (Entry: %u GUID: %u) chase to %s (GUID: %u)", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug("Creature (Entry: %u GUID: %u) chase to %s (GUID: %u)",
#endif
// _owner->GetEntry(), _owner->GetGUIDLow(), // _owner->GetEntry(), _owner->GetGUIDLow(),
// target->GetTypeId() == TYPEID_PLAYER ? "player" : "creature", // target->GetTypeId() == TYPEID_PLAYER ? "player" : "creature",
// target->GetTypeId() == TYPEID_PLAYER ? target->GetGUIDLow() : target->ToCreature()->GetDBTableGUIDLow()); // target->GetTypeId() == TYPEID_PLAYER ? target->GetGUIDLow() : target->ToCreature()->GetDBTableGUIDLow());
@@ -315,14 +331,18 @@ void MotionMaster::MoveFollow(Unit* target, float dist, float angle, MovementSlo
//_owner->AddUnitState(UNIT_STATE_FOLLOW); //_owner->AddUnitState(UNIT_STATE_FOLLOW);
if (_owner->GetTypeId() == TYPEID_PLAYER) if (_owner->GetTypeId() == TYPEID_PLAYER)
{ {
;//sLog->outStaticDebug("Player (GUID: %u) follow to %s (GUID: %u)", _owner->GetGUIDLow(), #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug("Player (GUID: %u) follow to %s (GUID: %u)", _owner->GetGUIDLow(),
#endif
// target->GetTypeId() == TYPEID_PLAYER ? "player" : "creature", // target->GetTypeId() == TYPEID_PLAYER ? "player" : "creature",
// target->GetTypeId() == TYPEID_PLAYER ? target->GetGUIDLow() : target->ToCreature()->GetDBTableGUIDLow()); // target->GetTypeId() == TYPEID_PLAYER ? target->GetGUIDLow() : target->ToCreature()->GetDBTableGUIDLow());
Mutate(new FollowMovementGenerator<Player>(target, dist, angle), slot); Mutate(new FollowMovementGenerator<Player>(target, dist, angle), slot);
} }
else else
{ {
;//sLog->outStaticDebug("Creature (Entry: %u GUID: %u) follow to %s (GUID: %u)", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug("Creature (Entry: %u GUID: %u) follow to %s (GUID: %u)",
#endif
// _owner->GetEntry(), _owner->GetGUIDLow(), // _owner->GetEntry(), _owner->GetGUIDLow(),
// target->GetTypeId() == TYPEID_PLAYER ? "player" : "creature", // target->GetTypeId() == TYPEID_PLAYER ? "player" : "creature",
// target->GetTypeId() == TYPEID_PLAYER ? target->GetGUIDLow() : target->ToCreature()->GetDBTableGUIDLow()); // target->GetTypeId() == TYPEID_PLAYER ? target->GetGUIDLow() : target->ToCreature()->GetDBTableGUIDLow());
@@ -338,12 +358,16 @@ void MotionMaster::MovePoint(uint32 id, float x, float y, float z, bool generate
if (_owner->GetTypeId() == TYPEID_PLAYER) if (_owner->GetTypeId() == TYPEID_PLAYER)
{ {
;//sLog->outStaticDebug("Player (GUID: %u) targeted point (Id: %u X: %f Y: %f Z: %f)", _owner->GetGUIDLow(), id, x, y, z); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug("Player (GUID: %u) targeted point (Id: %u X: %f Y: %f Z: %f)", _owner->GetGUIDLow(), id, x, y, z);
#endif
Mutate(new PointMovementGenerator<Player>(id, x, y, z, 0.0f, NULL, generatePath, forceDestination), slot); Mutate(new PointMovementGenerator<Player>(id, x, y, z, 0.0f, NULL, generatePath, forceDestination), slot);
} }
else else
{ {
;//sLog->outStaticDebug("Creature (Entry: %u GUID: %u) targeted point (ID: %u X: %f Y: %f Z: %f)", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug("Creature (Entry: %u GUID: %u) targeted point (ID: %u X: %f Y: %f Z: %f)",
#endif
// _owner->GetEntry(), _owner->GetGUIDLow(), id, x, y, z); // _owner->GetEntry(), _owner->GetGUIDLow(), id, x, y, z);
Mutate(new PointMovementGenerator<Creature>(id, x, y, z, 0.0f, NULL, generatePath, forceDestination), slot); Mutate(new PointMovementGenerator<Creature>(id, x, y, z, 0.0f, NULL, generatePath, forceDestination), slot);
} }
@@ -357,12 +381,16 @@ void MotionMaster::MoveSplinePath(Movement::PointsArray* path)
if (_owner->GetTypeId() == TYPEID_PLAYER) if (_owner->GetTypeId() == TYPEID_PLAYER)
{ {
;//sLog->outStaticDebug("Player (GUID: %u) targeted point (Id: %u X: %f Y: %f Z: %f)", _owner->GetGUIDLow(), id, x, y, z); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug("Player (GUID: %u) targeted point (Id: %u X: %f Y: %f Z: %f)", _owner->GetGUIDLow(), id, x, y, z);
#endif
Mutate(new EscortMovementGenerator<Player>(path), MOTION_SLOT_ACTIVE); Mutate(new EscortMovementGenerator<Player>(path), MOTION_SLOT_ACTIVE);
} }
else else
{ {
;//sLog->outStaticDebug("Creature (Entry: %u GUID: %u) targeted point (ID: %u X: %f Y: %f Z: %f)", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug("Creature (Entry: %u GUID: %u) targeted point (ID: %u X: %f Y: %f Z: %f)",
#endif
// _owner->GetEntry(), _owner->GetGUIDLow(), id, x, y, z); // _owner->GetEntry(), _owner->GetGUIDLow(), id, x, y, z);
Mutate(new EscortMovementGenerator<Creature>(path), MOTION_SLOT_ACTIVE); Mutate(new EscortMovementGenerator<Creature>(path), MOTION_SLOT_ACTIVE);
} }
@@ -377,7 +405,9 @@ void MotionMaster::MoveLand(uint32 id, Position const& pos, float speed)
float x, y, z; float x, y, z;
pos.GetPosition(x, y, z); pos.GetPosition(x, y, z);
;//sLog->outStaticDebug("Creature (Entry: %u) landing point (ID: %u X: %f Y: %f Z: %f)", _owner->GetEntry(), id, x, y, z); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug("Creature (Entry: %u) landing point (ID: %u X: %f Y: %f Z: %f)", _owner->GetEntry(), id, x, y, z);
#endif
Movement::MoveSplineInit init(_owner); Movement::MoveSplineInit init(_owner);
init.MoveTo(x, y, z); init.MoveTo(x, y, z);
@@ -402,7 +432,9 @@ void MotionMaster::MoveTakeoff(uint32 id, Position const& pos, float speed)
float x, y, z; float x, y, z;
pos.GetPosition(x, y, z); pos.GetPosition(x, y, z);
;//sLog->outStaticDebug("Creature (Entry: %u) landing point (ID: %u X: %f Y: %f Z: %f)", _owner->GetEntry(), id, x, y, z); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug("Creature (Entry: %u) landing point (ID: %u X: %f Y: %f Z: %f)", _owner->GetEntry(), id, x, y, z);
#endif
Movement::MoveSplineInit init(_owner); Movement::MoveSplineInit init(_owner);
init.MoveTo(x, y, z); init.MoveTo(x, y, z);
@@ -466,7 +498,9 @@ void MotionMaster::MoveJumpTo(float angle, float speedXY, float speedZ)
void MotionMaster::MoveJump(float x, float y, float z, float speedXY, float speedZ, uint32 id, Unit const* target) void MotionMaster::MoveJump(float x, float y, float z, float speedXY, float speedZ, uint32 id, Unit const* target)
{ {
;//sLog->outStaticDebug("Unit (GUID: %u) jump to point (X: %f Y: %f Z: %f)", _owner->GetGUIDLow(), x, y, z); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug("Unit (GUID: %u) jump to point (X: %f Y: %f Z: %f)", _owner->GetGUIDLow(), x, y, z);
#endif
if (speedXY <= 0.1f) if (speedXY <= 0.1f)
return; return;
@@ -494,7 +528,9 @@ void MotionMaster::MoveFall(uint32 id /*=0*/, bool addFlagForNPC)
float tz = _owner->GetMap()->GetHeight(_owner->GetPhaseMask(), _owner->GetPositionX(), _owner->GetPositionY(), _owner->GetPositionZ(), true, MAX_FALL_DISTANCE); float tz = _owner->GetMap()->GetHeight(_owner->GetPhaseMask(), _owner->GetPositionX(), _owner->GetPositionY(), _owner->GetPositionZ(), true, MAX_FALL_DISTANCE);
if (tz <= INVALID_HEIGHT) if (tz <= INVALID_HEIGHT)
{ {
;//sLog->outStaticDebug("MotionMaster::MoveFall: unable retrive a proper height at map %u (x: %f, y: %f, z: %f).", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug("MotionMaster::MoveFall: unable retrive a proper height at map %u (x: %f, y: %f, z: %f).",
#endif
// _owner->GetMap()->GetId(), _owner->GetPositionX(), _owner->GetPositionX(), _owner->GetPositionZ()); // _owner->GetMap()->GetId(), _owner->GetPositionX(), _owner->GetPositionX(), _owner->GetPositionZ());
return; return;
} }
@@ -536,12 +572,16 @@ void MotionMaster::MoveCharge(float x, float y, float z, float speed, uint32 id,
if (_owner->GetTypeId() == TYPEID_PLAYER) if (_owner->GetTypeId() == TYPEID_PLAYER)
{ {
;//sLog->outStaticDebug("Player (GUID: %u) charge point (X: %f Y: %f Z: %f)", _owner->GetGUIDLow(), x, y, z); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug("Player (GUID: %u) charge point (X: %f Y: %f Z: %f)", _owner->GetGUIDLow(), x, y, z);
#endif
Mutate(new PointMovementGenerator<Player>(id, x, y, z, speed, path, generatePath, generatePath), MOTION_SLOT_CONTROLLED); Mutate(new PointMovementGenerator<Player>(id, x, y, z, speed, path, generatePath, generatePath), MOTION_SLOT_CONTROLLED);
} }
else else
{ {
;//sLog->outStaticDebug("Creature (Entry: %u GUID: %u) charge point (X: %f Y: %f Z: %f)", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug("Creature (Entry: %u GUID: %u) charge point (X: %f Y: %f Z: %f)",
#endif
// _owner->GetEntry(), _owner->GetGUIDLow(), x, y, z); // _owner->GetEntry(), _owner->GetGUIDLow(), x, y, z);
Mutate(new PointMovementGenerator<Creature>(id, x, y, z, speed, path, generatePath, generatePath), MOTION_SLOT_CONTROLLED); Mutate(new PointMovementGenerator<Creature>(id, x, y, z, speed, path, generatePath, generatePath), MOTION_SLOT_CONTROLLED);
} }
@@ -559,7 +599,9 @@ void MotionMaster::MoveSeekAssistance(float x, float y, float z)
} }
else else
{ {
;//sLog->outStaticDebug("Creature (Entry: %u GUID: %u) seek assistance (X: %f Y: %f Z: %f)", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug("Creature (Entry: %u GUID: %u) seek assistance (X: %f Y: %f Z: %f)",
#endif
// _owner->GetEntry(), _owner->GetGUIDLow(), x, y, z); // _owner->GetEntry(), _owner->GetGUIDLow(), x, y, z);
_owner->AttackStop(); _owner->AttackStop();
_owner->CastStop(0, false); _owner->CastStop(0, false);
@@ -580,7 +622,9 @@ void MotionMaster::MoveSeekAssistanceDistract(uint32 time)
} }
else else
{ {
;//sLog->outStaticDebug("Creature (Entry: %u GUID: %u) is distracted after assistance call (Time: %u)", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug("Creature (Entry: %u GUID: %u) is distracted after assistance call (Time: %u)",
#endif
// _owner->GetEntry(), _owner->GetGUIDLow(), time); // _owner->GetEntry(), _owner->GetGUIDLow(), time);
Mutate(new AssistanceDistractMovementGenerator(time), MOTION_SLOT_ACTIVE); Mutate(new AssistanceDistractMovementGenerator(time), MOTION_SLOT_ACTIVE);
} }
@@ -597,14 +641,18 @@ void MotionMaster::MoveFleeing(Unit* enemy, uint32 time)
if (_owner->GetTypeId() == TYPEID_PLAYER) if (_owner->GetTypeId() == TYPEID_PLAYER)
{ {
;//sLog->outStaticDebug("Player (GUID: %u) flee from %s (GUID: %u)", _owner->GetGUIDLow(), #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug("Player (GUID: %u) flee from %s (GUID: %u)", _owner->GetGUIDLow(),
#endif
// enemy->GetTypeId() == TYPEID_PLAYER ? "player" : "creature", // enemy->GetTypeId() == TYPEID_PLAYER ? "player" : "creature",
// enemy->GetTypeId() == TYPEID_PLAYER ? enemy->GetGUIDLow() : enemy->ToCreature()->GetDBTableGUIDLow()); // enemy->GetTypeId() == TYPEID_PLAYER ? enemy->GetGUIDLow() : enemy->ToCreature()->GetDBTableGUIDLow());
Mutate(new FleeingMovementGenerator<Player>(enemy->GetGUID()), MOTION_SLOT_CONTROLLED); Mutate(new FleeingMovementGenerator<Player>(enemy->GetGUID()), MOTION_SLOT_CONTROLLED);
} }
else else
{ {
;//sLog->outStaticDebug("Creature (Entry: %u GUID: %u) flee from %s (GUID: %u)%s", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug("Creature (Entry: %u GUID: %u) flee from %s (GUID: %u)%s",
#endif
// _owner->GetEntry(), _owner->GetGUIDLow(), // _owner->GetEntry(), _owner->GetGUIDLow(),
// enemy->GetTypeId() == TYPEID_PLAYER ? "player" : "creature", // enemy->GetTypeId() == TYPEID_PLAYER ? "player" : "creature",
// enemy->GetTypeId() == TYPEID_PLAYER ? enemy->GetGUIDLow() : enemy->ToCreature()->GetDBTableGUIDLow(), // enemy->GetTypeId() == TYPEID_PLAYER ? enemy->GetGUIDLow() : enemy->ToCreature()->GetDBTableGUIDLow(),
@@ -622,7 +670,9 @@ void MotionMaster::MoveTaxiFlight(uint32 path, uint32 pathnode)
{ {
if (path < sTaxiPathNodesByPath.size()) if (path < sTaxiPathNodesByPath.size())
{ {
;//sLog->outStaticDebug("%s taxi to (Path %u node %u)", _owner->GetName().c_str(), path, pathnode); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug("%s taxi to (Path %u node %u)", _owner->GetName().c_str(), path, pathnode);
#endif
FlightPathMovementGenerator* mgen = new FlightPathMovementGenerator(pathnode); FlightPathMovementGenerator* mgen = new FlightPathMovementGenerator(pathnode);
mgen->LoadPath(_owner->ToPlayer()); mgen->LoadPath(_owner->ToPlayer());
Mutate(mgen, MOTION_SLOT_CONTROLLED); Mutate(mgen, MOTION_SLOT_CONTROLLED);
@@ -651,11 +701,15 @@ void MotionMaster::MoveDistract(uint32 timer)
/*if (_owner->GetTypeId() == TYPEID_PLAYER) /*if (_owner->GetTypeId() == TYPEID_PLAYER)
{ {
;//sLog->outStaticDebug("Player (GUID: %u) distracted (timer: %u)", _owner->GetGUIDLow(), timer); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug("Player (GUID: %u) distracted (timer: %u)", _owner->GetGUIDLow(), timer);
#endif
} }
else else
{ {
;//sLog->outStaticDebug("Creature (Entry: %u GUID: %u) (timer: %u)", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug("Creature (Entry: %u GUID: %u) (timer: %u)",
#endif
_owner->GetEntry(), _owner->GetGUIDLow(), timer); _owner->GetEntry(), _owner->GetGUIDLow(), timer);
}*/ }*/
@@ -717,7 +771,9 @@ void MotionMaster::MovePath(uint32 path_id, bool repeatable)
//Mutate(new WaypointMovementGenerator<Player>(path_id, repeatable)): //Mutate(new WaypointMovementGenerator<Player>(path_id, repeatable)):
Mutate(new WaypointMovementGenerator<Creature>(path_id, repeatable), MOTION_SLOT_IDLE); Mutate(new WaypointMovementGenerator<Creature>(path_id, repeatable), MOTION_SLOT_IDLE);
;//sLog->outStaticDebug("%s (GUID: %u) start moving over path(Id:%u, repeatable: %s)", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug("%s (GUID: %u) start moving over path(Id:%u, repeatable: %s)",
#endif
// _owner->GetTypeId() == TYPEID_PLAYER ? "Player" : "Creature", // _owner->GetTypeId() == TYPEID_PLAYER ? "Player" : "Creature",
// _owner->GetGUIDLow(), path_id, repeatable ? "YES" : "NO"); // _owner->GetGUIDLow(), path_id, repeatable ? "YES" : "NO");
} }
src/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
+12 -4
View File
@@ -68,7 +68,9 @@ void WaypointMovementGenerator<Creature>::OnArrived(Creature* creature)
if (i_path->at(i_currentNode)->event_id && urand(0, 99) < i_path->at(i_currentNode)->event_chance) if (i_path->at(i_currentNode)->event_id && urand(0, 99) < i_path->at(i_currentNode)->event_chance)
{ {
;//sLog->outDebug(LOG_FILTER_MAPSCRIPTS, "Creature movement start script %u at point %u for " UI64FMTD ".", i_path->at(i_currentNode)->event_id, i_currentNode, creature->GetGUID()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_MAPSCRIPTS, "Creature movement start script %u at point %u for " UI64FMTD ".", i_path->at(i_currentNode)->event_id, i_currentNode, creature->GetGUID());
#endif
creature->ClearUnitState(UNIT_STATE_ROAMING_MOVE); creature->ClearUnitState(UNIT_STATE_ROAMING_MOVE);
creature->GetMap()->ScriptsStart(sWaypointScripts, i_path->at(i_currentNode)->event_id, creature, NULL); creature->GetMap()->ScriptsStart(sWaypointScripts, i_path->at(i_currentNode)->event_id, creature, NULL);
} }
@@ -439,7 +441,9 @@ void FlightPathMovementGenerator::DoEventIfAny(Player* player, TaxiPathNodeEntry
{ {
if (uint32 eventid = departure ? node->departureEventID : node->arrivalEventID) if (uint32 eventid = departure ? node->departureEventID : node->arrivalEventID)
{ {
;//sLog->outDebug(LOG_FILTER_MAPSCRIPTS, "Taxi %s event %u of node %u of path %u for player %s", departure ? "departure" : "arrival", eventid, node.index, node.path, player.GetName().c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_MAPSCRIPTS, "Taxi %s event %u of node %u of path %u for player %s", departure ? "departure" : "arrival", eventid, node.index, node.path, player.GetName().c_str());
#endif
player->GetMap()->ScriptsStart(sEventScripts, eventid, player, player); player->GetMap()->ScriptsStart(sEventScripts, eventid, player, player);
} }
} }
@@ -475,9 +479,13 @@ void FlightPathMovementGenerator::PreloadEndGrid()
// Load the grid // Load the grid
if (endMap) if (endMap)
{ {
;//sLog->outDetail("Preloading rid (%f, %f) for map %u at node index %u/%u", _endGridX, _endGridY, _endMapId, _preloadTargetNode, (uint32)(i_path->size()-1)); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("Preloading rid (%f, %f) for map %u at node index %u/%u", _endGridX, _endGridY, _endMapId, _preloadTargetNode, (uint32)(i_path->size()-1));
#endif
endMap->LoadGrid(_endGridX, _endGridY); endMap->LoadGrid(_endGridX, _endGridY);
} }
else else
;//sLog->outDetail("Unable to determine map to preload flightmaster grid"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("Unable to determine map to preload flightmaster grid");
#endif
} }
src/game/OutdoorPvP/OutdoorPvP.cpp
+12 -4
View File
@@ -105,7 +105,9 @@ bool OPvPCapturePoint::AddCreature(uint32 type, uint32 entry, uint32 map, float
bool OPvPCapturePoint::SetCapturePointData(uint32 entry, uint32 map, float x, float y, float z, float o, float rotation0, float rotation1, float rotation2, float rotation3) bool OPvPCapturePoint::SetCapturePointData(uint32 entry, uint32 map, float x, float y, float z, float o, float rotation0, float rotation1, float rotation2, float rotation3)
{ {
;//sLog->outDebug(LOG_FILTER_OUTDOORPVP, "Creating capture point %u", entry); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_OUTDOORPVP, "Creating capture point %u", entry);
#endif
// check info existence // check info existence
GameObjectTemplate const* goinfo = sObjectMgr->GetGameObjectTemplate(entry); GameObjectTemplate const* goinfo = sObjectMgr->GetGameObjectTemplate(entry);
@@ -132,7 +134,9 @@ bool OPvPCapturePoint::DelCreature(uint32 type)
{ {
if (!m_Creatures[type]) if (!m_Creatures[type])
{ {
;//sLog->outDebug(LOG_FILTER_OUTDOORPVP, "opvp creature type %u was already deleted", type); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_OUTDOORPVP, "opvp creature type %u was already deleted", type);
#endif
return false; return false;
} }
@@ -143,7 +147,9 @@ bool OPvPCapturePoint::DelCreature(uint32 type)
m_Creatures[type] = 0; m_Creatures[type] = 0;
return false; return false;
} }
;//sLog->outDebug(LOG_FILTER_OUTDOORPVP, "deleting opvp creature type %u", type); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_OUTDOORPVP, "deleting opvp creature type %u", type);
#endif
uint32 guid = cr->GetDBTableGUIDLow(); uint32 guid = cr->GetDBTableGUIDLow();
// Don't save respawn time // Don't save respawn time
cr->SetRespawnTime(0); cr->SetRespawnTime(0);
@@ -241,7 +247,9 @@ void OutdoorPvP::HandlePlayerLeaveZone(Player* player, uint32 /*zone*/)
if (!player->GetSession()->PlayerLogout()) if (!player->GetSession()->PlayerLogout())
SendRemoveWorldStates(player); SendRemoveWorldStates(player);
m_players[player->GetTeamId()].erase(player->GetGUID()); m_players[player->GetTeamId()].erase(player->GetGUID());
;//sLog->outDebug(LOG_FILTER_OUTDOORPVP, "Player %s left an outdoorpvp zone", player->GetName().c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_OUTDOORPVP, "Player %s left an outdoorpvp zone", player->GetName().c_str());
#endif
} }
void OutdoorPvP::HandlePlayerResurrects(Player* /*player*/, uint32 /*zone*/) void OutdoorPvP::HandlePlayerResurrects(Player* /*player*/, uint32 /*zone*/)
src/game/OutdoorPvP/OutdoorPvPMgr.cpp
+6 -2
View File
@@ -116,7 +116,9 @@ void OutdoorPvPMgr::HandlePlayerEnterZone(Player* player, uint32 zoneid)
return; return;
itr->second->HandlePlayerEnterZone(player, zoneid); itr->second->HandlePlayerEnterZone(player, zoneid);
;//sLog->outDebug(LOG_FILTER_OUTDOORPVP, "Player %u entered outdoorpvp id %u", player->GetGUIDLow(), itr->second->GetTypeId()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_OUTDOORPVP, "Player %u entered outdoorpvp id %u", player->GetGUIDLow(), itr->second->GetTypeId());
#endif
} }
void OutdoorPvPMgr::HandlePlayerLeaveZone(Player* player, uint32 zoneid) void OutdoorPvPMgr::HandlePlayerLeaveZone(Player* player, uint32 zoneid)
@@ -132,7 +134,9 @@ void OutdoorPvPMgr::HandlePlayerLeaveZone(Player* player, uint32 zoneid)
return; return;
itr->second->HandlePlayerLeaveZone(player, zoneid); itr->second->HandlePlayerLeaveZone(player, zoneid);
;//sLog->outDebug(LOG_FILTER_OUTDOORPVP, "Player %u left outdoorpvp id %u", player->GetGUIDLow(), itr->second->GetTypeId()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_OUTDOORPVP, "Player %u left outdoorpvp id %u", player->GetGUIDLow(), itr->second->GetTypeId());
#endif
} }
OutdoorPvP* OutdoorPvPMgr::GetOutdoorPvPToZoneId(uint32 zoneid) OutdoorPvP* OutdoorPvPMgr::GetOutdoorPvPToZoneId(uint32 zoneid)
src/game/Pools/PoolMgr.cpp
+9 -3
View File
@@ -409,7 +409,9 @@ void PoolGroup<Quest>::Spawn1Object(PoolObject* obj)
PooledQuestRelationBoundsNC qr = sPoolMgr->mQuestCreatureRelation.equal_range(obj->guid); PooledQuestRelationBoundsNC qr = sPoolMgr->mQuestCreatureRelation.equal_range(obj->guid);
for (PooledQuestRelation::iterator itr = qr.first; itr != qr.second; ++itr) for (PooledQuestRelation::iterator itr = qr.first; itr != qr.second; ++itr)
{ {
;//sLog->outDebug(LOG_FILTER_POOLSYS, "PoolGroup<Quest>: Adding quest %u to creature %u", itr->first, itr->second); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_POOLSYS, "PoolGroup<Quest>: Adding quest %u to creature %u", itr->first, itr->second);
#endif
questMap->insert(QuestRelations::value_type(itr->second, itr->first)); questMap->insert(QuestRelations::value_type(itr->second, itr->first));
} }
@@ -418,7 +420,9 @@ void PoolGroup<Quest>::Spawn1Object(PoolObject* obj)
qr = sPoolMgr->mQuestGORelation.equal_range(obj->guid); qr = sPoolMgr->mQuestGORelation.equal_range(obj->guid);
for (PooledQuestRelation::iterator itr = qr.first; itr != qr.second; ++itr) for (PooledQuestRelation::iterator itr = qr.first; itr != qr.second; ++itr)
{ {
;//sLog->outDebug(LOG_FILTER_POOLSYS, "PoolGroup<Quest>: Adding quest %u to GO %u", itr->first, itr->second); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_POOLSYS, "PoolGroup<Quest>: Adding quest %u to GO %u", itr->first, itr->second);
#endif
questMap->insert(QuestRelations::value_type(itr->second, itr->first)); questMap->insert(QuestRelations::value_type(itr->second, itr->first));
} }
} }
@@ -426,7 +430,9 @@ void PoolGroup<Quest>::Spawn1Object(PoolObject* obj)
template <> template <>
void PoolGroup<Quest>::SpawnObject(ActivePoolData& spawns, uint32 limit, uint32 triggerFrom) void PoolGroup<Quest>::SpawnObject(ActivePoolData& spawns, uint32 limit, uint32 triggerFrom)
{ {
;//sLog->outDebug(LOG_FILTER_POOLSYS, "PoolGroup<Quest>: Spawning pool %u", poolId); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_POOLSYS, "PoolGroup<Quest>: Spawning pool %u", poolId);
#endif
// load state from db // load state from db
if (!triggerFrom) if (!triggerFrom)
{ {
src/game/Server/WorldSession.cpp
+30 -10
View File
@@ -193,8 +193,12 @@ void WorldSession::SendPacket(WorldPacket const* packet)
{ {
uint64 minTime = uint64(cur_time - lastTime); uint64 minTime = uint64(cur_time - lastTime);
uint64 fullTime = uint64(lastTime - firstTime); uint64 fullTime = uint64(lastTime - firstTime);
;//sLog->outDetail("Send all time packets count: " UI64FMTD " bytes: " UI64FMTD " avr.count/sec: %f avr.bytes/sec: %f time: %u", sendPacketCount, sendPacketBytes, float(sendPacketCount)/fullTime, float(sendPacketBytes)/fullTime, uint32(fullTime)); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
;//sLog->outDetail("Send last min packets count: " UI64FMTD " bytes: " UI64FMTD " avr.count/sec: %f avr.bytes/sec: %f", sendLastPacketCount, sendLastPacketBytes, float(sendLastPacketCount)/minTime, float(sendLastPacketBytes)/minTime); sLog->outDetail("Send all time packets count: " UI64FMTD " bytes: " UI64FMTD " avr.count/sec: %f avr.bytes/sec: %f time: %u", sendPacketCount, sendPacketBytes, float(sendPacketCount)/fullTime, float(sendPacketBytes)/fullTime, uint32(fullTime));
#endif
#ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("Send last min packets count: " UI64FMTD " bytes: " UI64FMTD " avr.count/sec: %f avr.bytes/sec: %f", sendLastPacketCount, sendLastPacketBytes, float(sendLastPacketCount)/minTime, float(sendLastPacketBytes)/minTime);
#endif
lastTime = cur_time; lastTime = cur_time;
sendLastPacketCount = 1; sendLastPacketCount = 1;
@@ -543,7 +547,9 @@ void WorldSession::LogoutPlayer(bool save)
//! Client will respond by sending 3x CMSG_CANCEL_TRADE, which we currently dont handle //! Client will respond by sending 3x CMSG_CANCEL_TRADE, which we currently dont handle
WorldPacket data(SMSG_LOGOUT_COMPLETE, 0); WorldPacket data(SMSG_LOGOUT_COMPLETE, 0);
SendPacket(&data); SendPacket(&data);
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "SESSION: Sent SMSG_LOGOUT_COMPLETE Message"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "SESSION: Sent SMSG_LOGOUT_COMPLETE Message");
#endif
//! Since each account can only have one online character at any given time, ensure all characters for active account are marked as offline //! Since each account can only have one online character at any given time, ensure all characters for active account are marked as offline
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_UPD_ACCOUNT_ONLINE); PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_UPD_ACCOUNT_ONLINE);
@@ -969,7 +975,9 @@ void WorldSession::ReadAddonsInfo(WorldPacket &data)
addonInfo >> enabled >> crc >> unk1; addonInfo >> enabled >> crc >> unk1;
;//sLog->outDetail("ADDON: Name: %s, Enabled: 0x%x, CRC: 0x%x, Unknown2: 0x%x", addonName.c_str(), enabled, crc, unk1); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("ADDON: Name: %s, Enabled: 0x%x, CRC: 0x%x, Unknown2: 0x%x", addonName.c_str(), enabled, crc, unk1);
#endif
AddonInfo addon(addonName, enabled, crc, 2, true); AddonInfo addon(addonName, enabled, crc, 2, true);
@@ -982,15 +990,21 @@ void WorldSession::ReadAddonsInfo(WorldPacket &data)
match = false; match = false;
if (!match) if (!match)
;//sLog->outDetail("ADDON: %s was known, but didn't match known CRC (0x%x)!", addon.Name.c_str(), savedAddon->CRC); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("ADDON: %s was known, but didn't match known CRC (0x%x)!", addon.Name.c_str(), savedAddon->CRC);
#endif
else else
;//sLog->outDetail("ADDON: %s was known, CRC is correct (0x%x)", addon.Name.c_str(), savedAddon->CRC); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("ADDON: %s was known, CRC is correct (0x%x)", addon.Name.c_str(), savedAddon->CRC);
#endif
} }
else else
{ {
AddonMgr::SaveAddon(addon); AddonMgr::SaveAddon(addon);
;//sLog->outDetail("ADDON: %s (0x%x) was not known, saving...", addon.Name.c_str(), addon.CRC); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("ADDON: %s (0x%x) was not known, saving...", addon.Name.c_str(), addon.CRC);
#endif
} }
// TODO: Find out when to not use CRC/pubkey, and other possible states. // TODO: Find out when to not use CRC/pubkey, and other possible states.
@@ -999,10 +1013,14 @@ void WorldSession::ReadAddonsInfo(WorldPacket &data)
uint32 currentTime; uint32 currentTime;
addonInfo >> currentTime; addonInfo >> currentTime;
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "ADDON: CurrentTime: %u", currentTime); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "ADDON: CurrentTime: %u", currentTime);
#endif
//if (addonInfo.rpos() != addonInfo.size()) //if (addonInfo.rpos() != addonInfo.size())
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "packet under-read!"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "packet under-read!");
#endif
} }
else else
sLog->outError("Addon packet uncompress error!"); sLog->outError("Addon packet uncompress error!");
@@ -1044,7 +1062,9 @@ void WorldSession::SendAddonsInfo()
data << uint8(usepk); data << uint8(usepk);
if (usepk) // if CRC is wrong, add public key (client need it) if (usepk) // if CRC is wrong, add public key (client need it)
{ {
;//sLog->outDetail("ADDON: CRC (0x%x) for addon %s is wrong (does not match expected 0x%x), sending pubkey", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("ADDON: CRC (0x%x) for addon %s is wrong (does not match expected 0x%x), sending pubkey",
#endif
// itr->CRC, itr->Name.c_str(), STANDARD_ADDON_CRC); // itr->CRC, itr->Name.c_str(), STANDARD_ADDON_CRC);
data.append(addonPublicKey, sizeof(addonPublicKey)); data.append(addonPublicKey, sizeof(addonPublicKey));
src/game/Server/WorldSocket.cpp
+18 -6
View File
@@ -282,14 +282,18 @@ int WorldSocket::handle_input (ACE_HANDLE)
return Update(); // interesting line, isn't it ? return Update(); // interesting line, isn't it ?
} }
;//sLog->outStaticDebug("WorldSocket::handle_input: Peer error closing connection errno = %s", ACE_OS::strerror (errno)); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug("WorldSocket::handle_input: Peer error closing connection errno = %s", ACE_OS::strerror (errno));
#endif
errno = ECONNRESET; errno = ECONNRESET;
return -1; return -1;
} }
case 0: case 0:
{ {
;//sLog->outStaticDebug("WorldSocket::handle_input: Peer has closed connection"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug("WorldSocket::handle_input: Peer has closed connection");
#endif
errno = ECONNRESET; errno = ECONNRESET;
return -1; return -1;
@@ -752,7 +756,9 @@ int WorldSocket::HandleAuthSession(WorldPacket& recvPacket)
recvPacket >> unk4; recvPacket >> unk4;
recvPacket.read(digest, 20); recvPacket.read(digest, 20);
;//sLog->outStaticDebug ("WorldSocket::HandleAuthSession: client %u, unk2 %u, account %s, unk3 %u, clientseed %u", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug ("WorldSocket::HandleAuthSession: client %u, unk2 %u, account %s, unk3 %u, clientseed %u",
#endif
// BuiltNumberClient, // BuiltNumberClient,
// unk2, // unk2,
// account.c_str(), // account.c_str(),
@@ -878,7 +884,9 @@ int WorldSocket::HandleAuthSession(WorldPacket& recvPacket)
// Check locked state for server // Check locked state for server
AccountTypes allowedAccountType = sWorld->GetPlayerSecurityLimit(); AccountTypes allowedAccountType = sWorld->GetPlayerSecurityLimit();
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "Allowed Level: %u Player Level %u", allowedAccountType, AccountTypes(security)); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_NETWORKIO, "Allowed Level: %u Player Level %u", allowedAccountType, AccountTypes(security));
#endif
if (AccountTypes(security) < allowedAccountType) if (AccountTypes(security) < allowedAccountType)
{ {
WorldPacket Packet (SMSG_AUTH_RESPONSE, 1); WorldPacket Packet (SMSG_AUTH_RESPONSE, 1);
@@ -886,7 +894,9 @@ int WorldSocket::HandleAuthSession(WorldPacket& recvPacket)
SendPacket(packet); SendPacket(packet);
;//sLog->outDetail("WorldSocket::HandleAuthSession: User tries to login but his security level is not enough"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("WorldSocket::HandleAuthSession: User tries to login but his security level is not enough");
#endif
return -1; return -1;
} }
@@ -914,7 +924,9 @@ int WorldSocket::HandleAuthSession(WorldPacket& recvPacket)
return -1; return -1;
} }
;//sLog->outStaticDebug("WorldSocket::HandleAuthSession: Client '%s' authenticated successfully from %s.", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug("WorldSocket::HandleAuthSession: Client '%s' authenticated successfully from %s.",
#endif
// account.c_str(), // account.c_str(),
// address.c_str()); // address.c_str());
src/game/Server/WorldSocketMgr.cpp
+6 -2
View File
@@ -143,7 +143,9 @@ class ReactorRunnable : protected ACE_Task_Base
virtual int svc() virtual int svc()
{ {
;//sLog->outStaticDebug ("Network Thread Starting"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug ("Network Thread Starting");
#endif
ACE_ASSERT (m_Reactor); ACE_ASSERT (m_Reactor);
@@ -180,7 +182,9 @@ class ReactorRunnable : protected ACE_Task_Base
} }
} }
;//sLog->outStaticDebug ("Network Thread exits"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug ("Network Thread exits");
#endif
return 0; return 0;
} }
src/game/Spells/Auras/SpellAuraEffects.cpp
+57 -19
View File
@@ -5991,7 +5991,9 @@ void AuraEffect::HandlePeriodicTriggerSpellAuraTick(Unit* target, Unit* caster)
triggerFlags = TriggerCastFlags(TRIGGERED_FULL_MASK&~TRIGGERED_IGNORE_POWER_AND_REAGENT_COST); triggerFlags = TriggerCastFlags(TRIGGERED_FULL_MASK&~TRIGGERED_IGNORE_POWER_AND_REAGENT_COST);
triggerCaster->CastSpell(targets, triggeredSpellInfo, NULL, triggerFlags, NULL, this); triggerCaster->CastSpell(targets, triggeredSpellInfo, NULL, triggerFlags, NULL, this);
;//sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "AuraEffect::HandlePeriodicTriggerSpellAuraTick: Spell %u Trigger %u", GetId(), triggeredSpellInfo->Id); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "AuraEffect::HandlePeriodicTriggerSpellAuraTick: Spell %u Trigger %u", GetId(), triggeredSpellInfo->Id);
#endif
} }
} }
} }
@@ -6015,11 +6017,15 @@ void AuraEffect::HandlePeriodicTriggerSpellWithValueAuraTick(Unit* target, Unit*
values.AddSpellMod(SPELLVALUE_BASE_POINT0, GetAmount()); values.AddSpellMod(SPELLVALUE_BASE_POINT0, GetAmount());
triggerCaster->CastSpell(targets, triggeredSpellInfo, &values, TRIGGERED_FULL_MASK, NULL, this); triggerCaster->CastSpell(targets, triggeredSpellInfo, &values, TRIGGERED_FULL_MASK, NULL, this);
;//sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "AuraEffect::HandlePeriodicTriggerSpellWithValueAuraTick: Spell %u Trigger %u", GetId(), triggeredSpellInfo->Id); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "AuraEffect::HandlePeriodicTriggerSpellWithValueAuraTick: Spell %u Trigger %u", GetId(), triggeredSpellInfo->Id);
#endif
} }
} }
else else
;//sLog->outDebug(LOG_FILTER_SPELLS_AURAS,"AuraEffect::HandlePeriodicTriggerSpellWithValueAuraTick: Spell %u has non-existent spell %u in EffectTriggered[%d] and is therefor not triggered.", GetId(), triggerSpellId, GetEffIndex()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_SPELLS_AURAS,"AuraEffect::HandlePeriodicTriggerSpellWithValueAuraTick: Spell %u has non-existent spell %u in EffectTriggered[%d] and is therefor not triggered.", GetId(), triggerSpellId, GetEffIndex());
#endif
} }
void AuraEffect::HandlePeriodicDamageAurasTick(Unit* target, Unit* caster) const void AuraEffect::HandlePeriodicDamageAurasTick(Unit* target, Unit* caster) const
@@ -6132,7 +6138,9 @@ void AuraEffect::HandlePeriodicDamageAurasTick(Unit* target, Unit* caster) const
Unit::CalcAbsorbResist(caster, target, GetSpellInfo()->GetSchoolMask(), DOT, damage, &absorb, &resist, GetSpellInfo()); Unit::CalcAbsorbResist(caster, target, GetSpellInfo()->GetSchoolMask(), DOT, damage, &absorb, &resist, GetSpellInfo());
;//sLog->outDetail("PeriodicTick: %u (TypeId: %u) attacked %u (TypeId: %u) for %u dmg inflicted by %u abs is %u", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("PeriodicTick: %u (TypeId: %u) attacked %u (TypeId: %u) for %u dmg inflicted by %u abs is %u",
#endif
// GUID_LOPART(GetCasterGUID()), GuidHigh2TypeId(GUID_HIPART(GetCasterGUID())), target->GetGUIDLow(), target->GetTypeId(), damage, GetId(), absorb); // GUID_LOPART(GetCasterGUID()), GuidHigh2TypeId(GUID_HIPART(GetCasterGUID())), target->GetGUIDLow(), target->GetTypeId(), damage, GetId(), absorb);
Unit::DealDamageMods(target, damage, &absorb); Unit::DealDamageMods(target, damage, &absorb);
@@ -6227,7 +6235,9 @@ void AuraEffect::HandlePeriodicHealthLeechAuraTick(Unit* target, Unit* caster) c
if (target->GetHealth() < damage) if (target->GetHealth() < damage)
damage = target->GetHealth(); damage = target->GetHealth();
;//sLog->outDetail("PeriodicTick: %u (TypeId: %u) health leech of %u (TypeId: %u) for %u dmg inflicted by %u abs is %u", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("PeriodicTick: %u (TypeId: %u) health leech of %u (TypeId: %u) for %u dmg inflicted by %u abs is %u",
#endif
// GUID_LOPART(GetCasterGUID()), GuidHigh2TypeId(GUID_HIPART(GetCasterGUID())), target->GetGUIDLow(), target->GetTypeId(), damage, GetId(), absorb); // GUID_LOPART(GetCasterGUID()), GuidHigh2TypeId(GUID_HIPART(GetCasterGUID())), target->GetGUIDLow(), target->GetTypeId(), damage, GetId(), absorb);
if (caster) if (caster)
@@ -6271,7 +6281,9 @@ void AuraEffect::HandlePeriodicHealthFunnelAuraTick(Unit* target, Unit* caster)
return; return;
caster->ModifyHealth(-(int32)damage); caster->ModifyHealth(-(int32)damage);
;//sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "PeriodicTick: donator %u target %u damage %u.", caster->GetEntry(), target->GetEntry(), damage); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "PeriodicTick: donator %u target %u damage %u.", caster->GetEntry(), target->GetEntry(), damage);
#endif
float gainMultiplier = GetSpellInfo()->Effects[GetEffIndex()].CalcValueMultiplier(caster); float gainMultiplier = GetSpellInfo()->Effects[GetEffIndex()].CalcValueMultiplier(caster);
@@ -6372,7 +6384,9 @@ void AuraEffect::HandlePeriodicHealAurasTick(Unit* target, Unit* caster) const
if (crit = roll_chance_f(GetCritChance())) if (crit = roll_chance_f(GetCritChance()))
damage = Unit::SpellCriticalHealingBonus(caster, GetSpellInfo(), damage, target); damage = Unit::SpellCriticalHealingBonus(caster, GetSpellInfo(), damage, target);
;//sLog->outDetail("PeriodicTick: %u (TypeId: %u) heal of %u (TypeId: %u) for %u health inflicted by %u", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("PeriodicTick: %u (TypeId: %u) heal of %u (TypeId: %u) for %u health inflicted by %u",
#endif
// GUID_LOPART(GetCasterGUID()), GuidHigh2TypeId(GUID_HIPART(GetCasterGUID())), target->GetGUIDLow(), target->GetTypeId(), damage, GetId()); // GUID_LOPART(GetCasterGUID()), GuidHigh2TypeId(GUID_HIPART(GetCasterGUID())), target->GetGUIDLow(), target->GetTypeId(), damage, GetId());
uint32 absorb = 0; uint32 absorb = 0;
@@ -6451,7 +6465,9 @@ void AuraEffect::HandlePeriodicManaLeechAuraTick(Unit* target, Unit* caster) con
drainAmount = maxmana; drainAmount = maxmana;
} }
;//sLog->outDetail("PeriodicTick: %u (TypeId: %u) power leech of %u (TypeId: %u) for %u dmg inflicted by %u", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("PeriodicTick: %u (TypeId: %u) power leech of %u (TypeId: %u) for %u dmg inflicted by %u",
#endif
// GUID_LOPART(GetCasterGUID()), GuidHigh2TypeId(GUID_HIPART(GetCasterGUID())), target->GetGUIDLow(), target->GetTypeId(), drainAmount, GetId()); // GUID_LOPART(GetCasterGUID()), GuidHigh2TypeId(GUID_HIPART(GetCasterGUID())), target->GetGUIDLow(), target->GetTypeId(), drainAmount, GetId());
// resilience reduce mana draining effect at spell crit damage reduction (added in 2.4) // resilience reduce mana draining effect at spell crit damage reduction (added in 2.4)
@@ -6517,7 +6533,9 @@ void AuraEffect::HandleObsModPowerAuraTick(Unit* target, Unit* caster) const
// ignore negative values (can be result apply spellmods to aura damage // ignore negative values (can be result apply spellmods to aura damage
uint32 amount = std::max(m_amount, 0) * target->GetMaxPower(powerType) /100; uint32 amount = std::max(m_amount, 0) * target->GetMaxPower(powerType) /100;
;//sLog->outDetail("PeriodicTick: %u (TypeId: %u) energize %u (TypeId: %u) for %u dmg inflicted by %u", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("PeriodicTick: %u (TypeId: %u) energize %u (TypeId: %u) for %u dmg inflicted by %u",
#endif
// GUID_LOPART(GetCasterGUID()), GuidHigh2TypeId(GUID_HIPART(GetCasterGUID())), target->GetGUIDLow(), target->GetTypeId(), amount, GetId()); // GUID_LOPART(GetCasterGUID()), GuidHigh2TypeId(GUID_HIPART(GetCasterGUID())), target->GetGUIDLow(), target->GetTypeId(), amount, GetId());
SpellPeriodicAuraLogInfo pInfo(this, amount, 0, 0, 0, 0.0f, false); SpellPeriodicAuraLogInfo pInfo(this, amount, 0, 0, 0, 0.0f, false);
@@ -6555,7 +6573,9 @@ void AuraEffect::HandlePeriodicEnergizeAuraTick(Unit* target, Unit* caster) cons
SpellPeriodicAuraLogInfo pInfo(this, amount, 0, 0, 0, 0.0f, false); SpellPeriodicAuraLogInfo pInfo(this, amount, 0, 0, 0, 0.0f, false);
target->SendPeriodicAuraLog(&pInfo); target->SendPeriodicAuraLog(&pInfo);
;//sLog->outDetail("PeriodicTick: %u (TypeId: %u) energize %u (TypeId: %u) for %u dmg inflicted by %u", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("PeriodicTick: %u (TypeId: %u) energize %u (TypeId: %u) for %u dmg inflicted by %u",
#endif
// GUID_LOPART(GetCasterGUID()), GuidHigh2TypeId(GUID_HIPART(GetCasterGUID())), target->GetGUIDLow(), target->GetTypeId(), amount, GetId()); // GUID_LOPART(GetCasterGUID()), GuidHigh2TypeId(GUID_HIPART(GetCasterGUID())), target->GetGUIDLow(), target->GetTypeId(), amount, GetId());
int32 gain = target->ModifyPower(powerType, amount); int32 gain = target->ModifyPower(powerType, amount);
@@ -6617,11 +6637,15 @@ void AuraEffect::HandleProcTriggerSpellAuraProc(AuraApplication* aurApp, ProcEve
uint32 triggerSpellId = GetSpellInfo()->Effects[GetEffIndex()].TriggerSpell; uint32 triggerSpellId = GetSpellInfo()->Effects[GetEffIndex()].TriggerSpell;
if (SpellInfo const* triggeredSpellInfo = sSpellMgr->GetSpellInfo(triggerSpellId)) if (SpellInfo const* triggeredSpellInfo = sSpellMgr->GetSpellInfo(triggerSpellId))
{ {
;//sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "AuraEffect::HandleProcTriggerSpellAuraProc: Triggering spell %u from aura %u proc", triggeredSpellInfo->Id, GetId()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "AuraEffect::HandleProcTriggerSpellAuraProc: Triggering spell %u from aura %u proc", triggeredSpellInfo->Id, GetId());
#endif
triggerCaster->CastSpell(triggerTarget, triggeredSpellInfo, true, NULL, this); triggerCaster->CastSpell(triggerTarget, triggeredSpellInfo, true, NULL, this);
} }
else else
;//sLog->outDebug(LOG_FILTER_SPELLS_AURAS,"AuraEffect::HandleProcTriggerSpellAuraProc: Could not trigger spell %u from aura %u proc, because the spell does not have an entry in Spell.dbc.", triggerSpellId, GetId()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_SPELLS_AURAS,"AuraEffect::HandleProcTriggerSpellAuraProc: Could not trigger spell %u from aura %u proc, because the spell does not have an entry in Spell.dbc.", triggerSpellId, GetId());
#endif
} }
void AuraEffect::HandleProcTriggerSpellWithValueAuraProc(AuraApplication* aurApp, ProcEventInfo& eventInfo) void AuraEffect::HandleProcTriggerSpellWithValueAuraProc(AuraApplication* aurApp, ProcEventInfo& eventInfo)
@@ -6633,11 +6657,15 @@ void AuraEffect::HandleProcTriggerSpellWithValueAuraProc(AuraApplication* aurApp
if (SpellInfo const* triggeredSpellInfo = sSpellMgr->GetSpellInfo(triggerSpellId)) if (SpellInfo const* triggeredSpellInfo = sSpellMgr->GetSpellInfo(triggerSpellId))
{ {
int32 basepoints0 = GetAmount(); int32 basepoints0 = GetAmount();
;//sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "AuraEffect::HandleProcTriggerSpellWithValueAuraProc: Triggering spell %u with value %d from aura %u proc", triggeredSpellInfo->Id, basepoints0, GetId()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "AuraEffect::HandleProcTriggerSpellWithValueAuraProc: Triggering spell %u with value %d from aura %u proc", triggeredSpellInfo->Id, basepoints0, GetId());
#endif
triggerCaster->CastCustomSpell(triggerTarget, triggerSpellId, &basepoints0, NULL, NULL, true, NULL, this); triggerCaster->CastCustomSpell(triggerTarget, triggerSpellId, &basepoints0, NULL, NULL, true, NULL, this);
} }
else else
;//sLog->outDebug(LOG_FILTER_SPELLS_AURAS,"AuraEffect::HandleProcTriggerSpellWithValueAuraProc: Could not trigger spell %u from aura %u proc, because the spell does not have an entry in Spell.dbc.", triggerSpellId, GetId()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_SPELLS_AURAS,"AuraEffect::HandleProcTriggerSpellWithValueAuraProc: Could not trigger spell %u from aura %u proc, because the spell does not have an entry in Spell.dbc.", triggerSpellId, GetId());
#endif
} }
void AuraEffect::HandleProcTriggerDamageAuraProc(AuraApplication* aurApp, ProcEventInfo& eventInfo) void AuraEffect::HandleProcTriggerDamageAuraProc(AuraApplication* aurApp, ProcEventInfo& eventInfo)
@@ -6650,7 +6678,9 @@ void AuraEffect::HandleProcTriggerDamageAuraProc(AuraApplication* aurApp, ProcEv
target->CalculateSpellDamageTaken(&damageInfo, damage, GetSpellInfo()); target->CalculateSpellDamageTaken(&damageInfo, damage, GetSpellInfo());
Unit::DealDamageMods(damageInfo.target, damageInfo.damage, &damageInfo.absorb); Unit::DealDamageMods(damageInfo.target, damageInfo.damage, &damageInfo.absorb);
target->SendSpellNonMeleeDamageLog(&damageInfo); target->SendSpellNonMeleeDamageLog(&damageInfo);
;//sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "AuraEffect::HandleProcTriggerDamageAuraProc: Triggering %u spell damage from aura %u proc", damage, GetId()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "AuraEffect::HandleProcTriggerDamageAuraProc: Triggering %u spell damage from aura %u proc", damage, GetId());
#endif
target->DealSpellDamage(&damageInfo, true); target->DealSpellDamage(&damageInfo, true);
} }
@@ -6672,7 +6702,9 @@ void AuraEffect::HandleRaidProcFromChargeAuraProc(AuraApplication* aurApp, ProcE
triggerSpellId = 43594; triggerSpellId = 43594;
break; break;
default: default:
;//sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "AuraEffect::HandleRaidProcFromChargeAuraProc: received not handled spell: %u", GetId()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "AuraEffect::HandleRaidProcFromChargeAuraProc: received not handled spell: %u", GetId());
#endif
return; return;
} }
@@ -6698,7 +6730,9 @@ void AuraEffect::HandleRaidProcFromChargeAuraProc(AuraApplication* aurApp, ProcE
} }
} }
;//sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "AuraEffect::HandleRaidProcFromChargeAuraProc: Triggering spell %u from aura %u proc", triggerSpellId, GetId()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "AuraEffect::HandleRaidProcFromChargeAuraProc: Triggering spell %u from aura %u proc", triggerSpellId, GetId());
#endif
target->CastSpell(target, triggerSpellId, true, NULL, this, GetCasterGUID()); target->CastSpell(target, triggerSpellId, true, NULL, this, GetCasterGUID());
} }
@@ -6710,7 +6744,9 @@ void AuraEffect::HandleRaidProcFromChargeWithValueAuraProc(AuraApplication* aurA
// Currently only Prayer of Mending // Currently only Prayer of Mending
if (!(GetSpellInfo()->SpellFamilyName == SPELLFAMILY_PRIEST && GetSpellInfo()->SpellFamilyFlags[1] & 0x20)) if (!(GetSpellInfo()->SpellFamilyName == SPELLFAMILY_PRIEST && GetSpellInfo()->SpellFamilyFlags[1] & 0x20))
{ {
;//sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "AuraEffect::HandleRaidProcFromChargeWithValueAuraProc: received not handled spell: %u", GetId()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "AuraEffect::HandleRaidProcFromChargeWithValueAuraProc: received not handled spell: %u", GetId());
#endif
return; return;
} }
uint32 triggerSpellId = 33110; uint32 triggerSpellId = 33110;
@@ -6739,6 +6775,8 @@ void AuraEffect::HandleRaidProcFromChargeWithValueAuraProc(AuraApplication* aurA
} }
} }
;//sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "AuraEffect::HandleRaidProcFromChargeWithValueAuraProc: Triggering spell %u from aura %u proc", triggerSpellId, GetId()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "AuraEffect::HandleRaidProcFromChargeWithValueAuraProc: Triggering spell %u from aura %u proc", triggerSpellId, GetId());
#endif
target->CastCustomSpell(target, triggerSpellId, &value, NULL, NULL, true, NULL, this, GetCasterGUID()); target->CastCustomSpell(target, triggerSpellId, &value, NULL, NULL, true, NULL, this, GetCasterGUID());
} }
src/game/Spells/Auras/SpellAuras.cpp
+12 -4
View File
@@ -62,10 +62,14 @@ _flags(AFLAG_NONE), _effectsToApply(effMask), _needClientUpdate(false), _disable
_slot = slot; _slot = slot;
GetTarget()->SetVisibleAura(slot, this); GetTarget()->SetVisibleAura(slot, this);
SetNeedClientUpdate(); SetNeedClientUpdate();
;//sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "Aura: %u Effect: %d put to unit visible auras slot: %u", GetBase()->GetId(), GetEffectMask(), slot); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "Aura: %u Effect: %d put to unit visible auras slot: %u", GetBase()->GetId(), GetEffectMask(), slot);
#endif
} }
else else
;//sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "Aura: %u Effect: %d could not find empty unit visible slot", GetBase()->GetId(), GetEffectMask()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "Aura: %u Effect: %d could not find empty unit visible slot", GetBase()->GetId(), GetEffectMask());
#endif
} }
_InitFlags(caster, effMask); _InitFlags(caster, effMask);
@@ -144,7 +148,9 @@ void AuraApplication::_HandleEffect(uint8 effIndex, bool apply)
ASSERT(aurEff); ASSERT(aurEff);
ASSERT(HasEffect(effIndex) == (!apply)); ASSERT(HasEffect(effIndex) == (!apply));
ASSERT((1<<effIndex) & _effectsToApply); ASSERT((1<<effIndex) & _effectsToApply);
;//sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "AuraApplication::_HandleEffect: %u, apply: %u: amount: %u", aurEff->GetAuraType(), apply, aurEff->GetAmount()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "AuraApplication::_HandleEffect: %u, apply: %u: amount: %u", aurEff->GetAuraType(), apply, aurEff->GetAmount());
#endif
if (apply) if (apply)
{ {
@@ -2172,7 +2178,9 @@ void Aura::LoadScripts()
m_loadedScripts.erase(bitr); m_loadedScripts.erase(bitr);
continue; continue;
} }
;//sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "Aura::LoadScripts: Script `%s` for aura `%u` is loaded now", (*itr)->_GetScriptName()->c_str(), m_spellInfo->Id); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "Aura::LoadScripts: Script `%s` for aura `%u` is loaded now", (*itr)->_GetScriptName()->c_str(), m_spellInfo->Id);
#endif
(*itr)->Register(); (*itr)->Register();
++itr; ++itr;
} }
src/game/Spells/Spell.cpp
+48 -16
View File
@@ -959,7 +959,9 @@ void Spell::SelectEffectImplicitTargets(SpellEffIndex effIndex, SpellImplicitTar
} }
break; break;
case TARGET_SELECT_CATEGORY_NYI: case TARGET_SELECT_CATEGORY_NYI:
;//sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "SPELL: target type %u, found in spellID %u, effect %u is not implemented yet!", m_spellInfo->Id, effIndex, targetType.GetTarget()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "SPELL: target type %u, found in spellID %u, effect %u is not implemented yet!", m_spellInfo->Id, effIndex, targetType.GetTarget());
#endif
break; break;
default: default:
ASSERT(false && "Spell::SelectEffectImplicitTargets: received not implemented select target category"); ASSERT(false && "Spell::SelectEffectImplicitTargets: received not implemented select target category");
@@ -989,7 +991,9 @@ void Spell::SelectImplicitChannelTargets(SpellEffIndex effIndex, SpellImplicitTa
AddUnitTarget(target->ToUnit(), 1 << effIndex); AddUnitTarget(target->ToUnit(), 1 << effIndex);
} }
else else
;//sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "SPELL: cannot find channel spell target for spell ID %u, effect %u", m_spellInfo->Id, effIndex); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "SPELL: cannot find channel spell target for spell ID %u, effect %u", m_spellInfo->Id, effIndex);
#endif
break; break;
} }
case TARGET_DEST_CHANNEL_TARGET: case TARGET_DEST_CHANNEL_TARGET:
@@ -1002,7 +1006,9 @@ void Spell::SelectImplicitChannelTargets(SpellEffIndex effIndex, SpellImplicitTa
m_targets.SetDst(*target); m_targets.SetDst(*target);
} }
else //if (!m_targets.HasDst()) else //if (!m_targets.HasDst())
;//sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "SPELL: cannot find channel spell destination for spell ID %u, effect %u", m_spellInfo->Id, effIndex); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "SPELL: cannot find channel spell destination for spell ID %u, effect %u", m_spellInfo->Id, effIndex);
#endif
break; break;
case TARGET_DEST_CHANNEL_CASTER: case TARGET_DEST_CHANNEL_CASTER:
if (GetOriginalCaster()) if (GetOriginalCaster())
@@ -1048,7 +1054,9 @@ void Spell::SelectImplicitNearbyTargets(SpellEffIndex effIndex, SpellImplicitTar
// handle emergency case - try to use other provided targets if no conditions provided // handle emergency case - try to use other provided targets if no conditions provided
if (targetType.GetCheckType() == TARGET_CHECK_ENTRY && (!condList || condList->empty())) if (targetType.GetCheckType() == TARGET_CHECK_ENTRY && (!condList || condList->empty()))
{ {
;//sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "Spell::SelectImplicitNearbyTargets: no conditions entry for target with TARGET_CHECK_ENTRY of spell ID %u, effect %u - selecting default targets", m_spellInfo->Id, effIndex); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "Spell::SelectImplicitNearbyTargets: no conditions entry for target with TARGET_CHECK_ENTRY of spell ID %u, effect %u - selecting default targets", m_spellInfo->Id, effIndex);
#endif
switch (targetType.GetObjectType()) switch (targetType.GetObjectType())
{ {
case TARGET_OBJECT_TYPE_GOBJ: case TARGET_OBJECT_TYPE_GOBJ:
@@ -1075,7 +1083,9 @@ void Spell::SelectImplicitNearbyTargets(SpellEffIndex effIndex, SpellImplicitTar
WorldObject* target = SearchNearbyTarget(range, targetType.GetObjectType(), targetType.GetCheckType(), condList); WorldObject* target = SearchNearbyTarget(range, targetType.GetObjectType(), targetType.GetCheckType(), condList);
if (!target) if (!target)
{ {
;//sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "Spell::SelectImplicitNearbyTargets: cannot find nearby target for spell ID %u, effect %u", m_spellInfo->Id, effIndex); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "Spell::SelectImplicitNearbyTargets: cannot find nearby target for spell ID %u, effect %u", m_spellInfo->Id, effIndex);
#endif
return; return;
} }
@@ -1278,7 +1288,9 @@ void Spell::SelectImplicitCasterDestTargets(SpellEffIndex effIndex, SpellImplici
} }
else else
{ {
;//sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "SPELL: unknown target coordinates for spell ID %u", m_spellInfo->Id); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "SPELL: unknown target coordinates for spell ID %u", m_spellInfo->Id);
#endif
if (WorldObject* target = m_targets.GetObjectTarget()) if (WorldObject* target = m_targets.GetObjectTarget())
dest = SpellDestination(*target); dest = SpellDestination(*target);
} }
@@ -3097,7 +3109,9 @@ void Spell::DoTriggersOnSpellHit(Unit* unit, uint8 effMask)
if (CanExecuteTriggersOnHit(effMask, i->triggeredByAura) && roll_chance_i(i->chance)) if (CanExecuteTriggersOnHit(effMask, i->triggeredByAura) && roll_chance_i(i->chance))
{ {
m_caster->CastSpell(unit, i->triggeredSpell, true); m_caster->CastSpell(unit, i->triggeredSpell, true);
;//sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "Spell %d triggered spell %d by SPELL_AURA_ADD_TARGET_TRIGGER aura", m_spellInfo->Id, i->triggeredSpell->Id); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "Spell %d triggered spell %d by SPELL_AURA_ADD_TARGET_TRIGGER aura", m_spellInfo->Id, i->triggeredSpell->Id);
#endif
// SPELL_AURA_ADD_TARGET_TRIGGER auras shouldn't trigger auras without duration // SPELL_AURA_ADD_TARGET_TRIGGER auras shouldn't trigger auras without duration
// set duration of current aura to the triggered spell // set duration of current aura to the triggered spell
@@ -3397,7 +3411,9 @@ void Spell::prepare(SpellCastTargets const* targets, AuraEffect const* triggered
// set timer base at cast time // set timer base at cast time
ReSetTimer(); ReSetTimer();
;//sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "Spell::prepare: spell id %u source %u caster %d customCastFlags %u mask %u", m_spellInfo->Id, m_caster->GetEntry(), m_originalCaster ? m_originalCaster->GetEntry() : -1, _triggeredCastFlags, m_targets.GetTargetMask()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "Spell::prepare: spell id %u source %u caster %d customCastFlags %u mask %u", m_spellInfo->Id, m_caster->GetEntry(), m_originalCaster ? m_originalCaster->GetEntry() : -1, _triggeredCastFlags, m_targets.GetTargetMask());
#endif
//Containers for channeled spells have to be set //Containers for channeled spells have to be set
//TODO:Apply this to all casted spells if needed //TODO:Apply this to all casted spells if needed
@@ -3990,7 +4006,9 @@ void Spell::update(uint32 difftime)
if (m_targets.GetUnitTargetGUID() && !m_targets.GetUnitTarget()) if (m_targets.GetUnitTargetGUID() && !m_targets.GetUnitTarget())
{ {
;//sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "Spell %u is cancelled due to removal of target.", m_spellInfo->Id); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "Spell %u is cancelled due to removal of target.", m_spellInfo->Id);
#endif
cancel(); cancel();
return; return;
} }
@@ -4048,7 +4066,9 @@ void Spell::update(uint32 difftime)
// Xinef: so the aura can be removed in different updates for all units // Xinef: so the aura can be removed in different updates for all units
else if ((m_timer < 0 || m_timer > 300) && !UpdateChanneledTargetList()) else if ((m_timer < 0 || m_timer > 300) && !UpdateChanneledTargetList())
{ {
;//sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "Channeled spell %d is removed due to lack of targets", m_spellInfo->Id); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "Channeled spell %d is removed due to lack of targets", m_spellInfo->Id);
#endif
SendChannelUpdate(0); SendChannelUpdate(0);
finish(); finish();
} }
@@ -4112,7 +4132,9 @@ void Spell::finish(bool ok)
SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(spell); SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(spell);
if (spellInfo && spellInfo->SpellIconID == 2056) if (spellInfo && spellInfo->SpellIconID == 2056)
{ {
;//sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "Statue %d is unsummoned in spell %d finish", m_caster->GetGUIDLow(), m_spellInfo->Id); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "Statue %d is unsummoned in spell %d finish", m_caster->GetGUIDLow(), m_spellInfo->Id);
#endif
m_caster->setDeathState(JUST_DIED); m_caster->setDeathState(JUST_DIED);
return; return;
} }
@@ -5148,7 +5170,9 @@ void Spell::HandleThreatSpells()
else if (!m_spellInfo->_IsPositiveSpell() && !IsFriendly && target->CanHaveThreatList()) else if (!m_spellInfo->_IsPositiveSpell() && !IsFriendly && target->CanHaveThreatList())
target->AddThreat(m_caster, threatToAdd, m_spellInfo->GetSchoolMask(), m_spellInfo); target->AddThreat(m_caster, threatToAdd, m_spellInfo->GetSchoolMask(), m_spellInfo);
} }
;//sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "Spell %u, added an additional %f threat for %s %u target(s)", m_spellInfo->Id, threat, m_spellInfo->_IsPositiveSpell() ? "assisting" : "harming", uint32(m_UniqueTargetInfo.size())); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "Spell %u, added an additional %f threat for %s %u target(s)", m_spellInfo->Id, threat, m_spellInfo->_IsPositiveSpell() ? "assisting" : "harming", uint32(m_UniqueTargetInfo.size()));
#endif
} }
void Spell::HandleEffects(Unit* pUnitTarget, Item* pItemTarget, GameObject* pGOTarget, uint32 i, SpellEffectHandleMode mode) void Spell::HandleEffects(Unit* pUnitTarget, Item* pItemTarget, GameObject* pGOTarget, uint32 i, SpellEffectHandleMode mode)
@@ -5161,7 +5185,9 @@ void Spell::HandleEffects(Unit* pUnitTarget, Item* pItemTarget, GameObject* pGOT
uint8 eff = m_spellInfo->Effects[i].Effect; uint8 eff = m_spellInfo->Effects[i].Effect;
;//sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "Spell: %u Effect : %u", m_spellInfo->Id, eff); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "Spell: %u Effect : %u", m_spellInfo->Id, eff);
#endif
// we do not need DamageMultiplier here. // we do not need DamageMultiplier here.
damage = CalculateSpellDamage(i, NULL); damage = CalculateSpellDamage(i, NULL);
@@ -7161,7 +7187,9 @@ void Spell::Delayed() // only called in DealDamage()
else else
m_timer += delaytime; m_timer += delaytime;
;//sLog->outDetail("Spell %u partially interrupted for (%d) ms at damage", m_spellInfo->Id, delaytime); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("Spell %u partially interrupted for (%d) ms at damage", m_spellInfo->Id, delaytime);
#endif
WorldPacket data(SMSG_SPELL_DELAYED, 8+4); WorldPacket data(SMSG_SPELL_DELAYED, 8+4);
data.append(m_caster->GetPackGUID()); data.append(m_caster->GetPackGUID());
@@ -7199,7 +7227,9 @@ void Spell::DelayedChannel()
else else
m_timer -= delaytime; m_timer -= delaytime;
;//sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "Spell %u partially interrupted for %i ms, new duration: %u ms", m_spellInfo->Id, delaytime, m_timer); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "Spell %u partially interrupted for %i ms, new duration: %u ms", m_spellInfo->Id, delaytime, m_timer);
#endif
for (std::list<TargetInfo>::const_iterator ihit = m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end(); ++ihit) for (std::list<TargetInfo>::const_iterator ihit = m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end(); ++ihit)
if ((*ihit).missCondition == SPELL_MISS_NONE) if ((*ihit).missCondition == SPELL_MISS_NONE)
@@ -7856,7 +7886,9 @@ void Spell::LoadScripts()
m_loadedScripts.erase(bitr); m_loadedScripts.erase(bitr);
continue; continue;
} }
;//sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "Spell::LoadScripts: Script `%s` for spell `%u` is loaded now", (*itr)->_GetScriptName()->c_str(), m_spellInfo->Id); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "Spell::LoadScripts: Script `%s` for spell `%u` is loaded now", (*itr)->_GetScriptName()->c_str(), m_spellInfo->Id);
#endif
(*itr)->Register(); (*itr)->Register();
++itr; ++itr;
} }
src/game/Spells/SpellEffects.cpp
+63 -21
View File
@@ -229,7 +229,9 @@ pEffect SpellEffects[TOTAL_SPELL_EFFECTS]=
void Spell::EffectNULL(SpellEffIndex /*effIndex*/) void Spell::EffectNULL(SpellEffIndex /*effIndex*/)
{ {
;//sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "WORLD: Spell Effect DUMMY"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "WORLD: Spell Effect DUMMY");
#endif
} }
void Spell::EffectUnused(SpellEffIndex /*effIndex*/) void Spell::EffectUnused(SpellEffIndex /*effIndex*/)
@@ -767,7 +769,9 @@ void Spell::EffectDummy(SpellEffIndex effIndex)
} }
// normal DB scripted effect // normal DB scripted effect
;//sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "Spell ScriptStart spellid %u in EffectDummy(%u)", m_spellInfo->Id, effIndex); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "Spell ScriptStart spellid %u in EffectDummy(%u)", m_spellInfo->Id, effIndex);
#endif
m_caster->GetMap()->ScriptsStart(sSpellScripts, uint32(m_spellInfo->Id | (effIndex << 24)), m_caster, unitTarget); m_caster->GetMap()->ScriptsStart(sSpellScripts, uint32(m_spellInfo->Id | (effIndex << 24)), m_caster, unitTarget);
} }
@@ -901,7 +905,9 @@ void Spell::EffectTriggerSpell(SpellEffIndex effIndex)
SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(triggered_spell_id); SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(triggered_spell_id);
if (!spellInfo) if (!spellInfo)
{ {
;//sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "Spell::EffectTriggerSpell spell %u tried to trigger unknown spell %u", m_spellInfo->Id, triggered_spell_id); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "Spell::EffectTriggerSpell spell %u tried to trigger unknown spell %u", m_spellInfo->Id, triggered_spell_id);
#endif
return; return;
} }
@@ -957,7 +963,9 @@ void Spell::EffectTriggerMissileSpell(SpellEffIndex effIndex)
SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(triggered_spell_id); SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(triggered_spell_id);
if (!spellInfo) if (!spellInfo)
{ {
;//sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "Spell::EffectTriggerMissileSpell spell %u tried to trigger unknown spell %u", m_spellInfo->Id, triggered_spell_id); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "Spell::EffectTriggerMissileSpell spell %u tried to trigger unknown spell %u", m_spellInfo->Id, triggered_spell_id);
#endif
return; return;
} }
@@ -1180,7 +1188,9 @@ void Spell::EffectTeleportUnits(SpellEffIndex /*effIndex*/)
destTarget->GetPosition(x, y, z, orientation); destTarget->GetPosition(x, y, z, orientation);
if (!orientation && m_targets.GetUnitTarget()) if (!orientation && m_targets.GetUnitTarget())
orientation = m_targets.GetUnitTarget()->GetOrientation(); orientation = m_targets.GetUnitTarget()->GetOrientation();
;//sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "Spell::EffectTeleportUnits - teleport unit to %u %f %f %f %f\n", mapid, x, y, z, orientation); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "Spell::EffectTeleportUnits - teleport unit to %u %f %f %f %f\n", mapid, x, y, z, orientation);
#endif
if (mapid == unitTarget->GetMapId()) if (mapid == unitTarget->GetMapId())
{ {
@@ -1333,7 +1343,9 @@ void Spell::EffectUnlearnSpecialization(SpellEffIndex effIndex)
uint32 spellToUnlearn = m_spellInfo->Effects[effIndex].TriggerSpell; uint32 spellToUnlearn = m_spellInfo->Effects[effIndex].TriggerSpell;
player->removeSpell(spellToUnlearn, SPEC_MASK_ALL, false); player->removeSpell(spellToUnlearn, SPEC_MASK_ALL, false);
;//sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "Spell: Player %u has unlearned spell %u from NpcGUID: %u", player->GetGUIDLow(), spellToUnlearn, m_caster->GetGUIDLow()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "Spell: Player %u has unlearned spell %u from NpcGUID: %u", player->GetGUIDLow(), spellToUnlearn, m_caster->GetGUIDLow());
#endif
} }
void Spell::EffectPowerDrain(SpellEffIndex effIndex) void Spell::EffectPowerDrain(SpellEffIndex effIndex)
@@ -1405,7 +1417,9 @@ void Spell::EffectSendEvent(SpellEffIndex effIndex)
// TODO: there should be a possibility to pass dest target to event script // TODO: there should be a possibility to pass dest target to event script
} }
;//sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "Spell ScriptStart %u for spellid %u in EffectSendEvent ", m_spellInfo->Effects[effIndex].MiscValue, m_spellInfo->Id); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "Spell ScriptStart %u for spellid %u in EffectSendEvent ", m_spellInfo->Effects[effIndex].MiscValue, m_spellInfo->Id);
#endif
if (ZoneScript* zoneScript = m_caster->GetZoneScript()) if (ZoneScript* zoneScript = m_caster->GetZoneScript())
zoneScript->ProcessEvent(target, m_spellInfo->Effects[effIndex].MiscValue); zoneScript->ProcessEvent(target, m_spellInfo->Effects[effIndex].MiscValue);
@@ -1610,7 +1624,9 @@ void Spell::EffectHealthLeech(SpellEffIndex effIndex)
damage = m_caster->SpellDamageBonusDone(unitTarget, m_spellInfo, uint32(damage), SPELL_DIRECT_DAMAGE); damage = m_caster->SpellDamageBonusDone(unitTarget, m_spellInfo, uint32(damage), SPELL_DIRECT_DAMAGE);
damage = unitTarget->SpellDamageBonusTaken(m_caster, m_spellInfo, uint32(damage), SPELL_DIRECT_DAMAGE); damage = unitTarget->SpellDamageBonusTaken(m_caster, m_spellInfo, uint32(damage), SPELL_DIRECT_DAMAGE);
;//sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "HealthLeech :%i", damage); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "HealthLeech :%i", damage);
#endif
// xinef: handled in spell.cpp // xinef: handled in spell.cpp
//float healMultiplier = m_spellInfo->Effects[effIndex].CalcValueMultiplier(m_originalCaster, this); //float healMultiplier = m_spellInfo->Effects[effIndex].CalcValueMultiplier(m_originalCaster, this);
@@ -1976,7 +1992,9 @@ void Spell::SendLoot(uint64 guid, LootType loottype)
// Players shouldn't be able to loot gameobjects that are currently despawned // Players shouldn't be able to loot gameobjects that are currently despawned
if (!gameObjTarget->isSpawned() && !player->IsGameMaster()) if (!gameObjTarget->isSpawned() && !player->IsGameMaster())
{ {
;//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!", #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()); // player->GetName().c_str(), player->GetGUIDLow(), gameObjTarget->GetEntry(), gameObjTarget->GetGUIDLow());
return; return;
} }
@@ -2038,7 +2056,9 @@ void Spell::EffectOpenLock(SpellEffIndex effIndex)
if (m_caster->GetTypeId() != TYPEID_PLAYER) if (m_caster->GetTypeId() != TYPEID_PLAYER)
{ {
;//sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "WORLD: Open Lock - No Player Caster!"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "WORLD: Open Lock - No Player Caster!");
#endif
return; return;
} }
@@ -2096,7 +2116,9 @@ void Spell::EffectOpenLock(SpellEffIndex effIndex)
} }
else else
{ {
;//sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "WORLD: Open Lock - No GameObject/Item Target!"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "WORLD: Open Lock - No GameObject/Item Target!");
#endif
return; return;
} }
@@ -2498,7 +2520,9 @@ void Spell::EffectLearnSpell(SpellEffIndex effIndex)
uint32 spellToLearn = (m_spellInfo->Id == 483 || m_spellInfo->Id == 55884) ? damage : m_spellInfo->Effects[effIndex].TriggerSpell; uint32 spellToLearn = (m_spellInfo->Id == 483 || m_spellInfo->Id == 55884) ? damage : m_spellInfo->Effects[effIndex].TriggerSpell;
player->learnSpell(spellToLearn); player->learnSpell(spellToLearn);
;//sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "Spell: Player %u has learned spell %u from NpcGUID=%u", player->GetGUIDLow(), spellToLearn, m_caster->GetGUIDLow()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "Spell: Player %u has learned spell %u from NpcGUID=%u", player->GetGUIDLow(), spellToLearn, m_caster->GetGUIDLow());
#endif
} }
typedef std::list< std::pair<uint32, uint64> > DispelList; typedef std::list< std::pair<uint32, uint64> > DispelList;
@@ -2746,7 +2770,9 @@ void Spell::EffectAddHonor(SpellEffIndex /*effIndex*/)
if (m_CastItem) if (m_CastItem)
{ {
unitTarget->ToPlayer()->RewardHonor(NULL, 1, damage/10, false); unitTarget->ToPlayer()->RewardHonor(NULL, 1, damage/10, false);
;//sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "SpellEffect::AddHonor (spell_id %u) rewards %d honor points (item %u) for player: %u", m_spellInfo->Id, damage/10, m_CastItem->GetEntry(), unitTarget->ToPlayer()->GetGUIDLow()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "SpellEffect::AddHonor (spell_id %u) rewards %d honor points (item %u) for player: %u", m_spellInfo->Id, damage/10, m_CastItem->GetEntry(), unitTarget->ToPlayer()->GetGUIDLow());
#endif
return; return;
} }
@@ -2755,13 +2781,17 @@ void Spell::EffectAddHonor(SpellEffIndex /*effIndex*/)
{ {
uint32 honor_reward = Trinity::Honor::hk_honor_at_level(unitTarget->getLevel(), float(damage)); uint32 honor_reward = Trinity::Honor::hk_honor_at_level(unitTarget->getLevel(), float(damage));
unitTarget->ToPlayer()->RewardHonor(NULL, 1, honor_reward, false); unitTarget->ToPlayer()->RewardHonor(NULL, 1, honor_reward, false);
;//sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "SpellEffect::AddHonor (spell_id %u) rewards %u honor points (scale) to player: %u", m_spellInfo->Id, honor_reward, unitTarget->ToPlayer()->GetGUIDLow()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "SpellEffect::AddHonor (spell_id %u) rewards %u honor points (scale) to player: %u", m_spellInfo->Id, honor_reward, unitTarget->ToPlayer()->GetGUIDLow());
#endif
} }
else else
{ {
//maybe we have correct honor_gain in damage already //maybe we have correct honor_gain in damage already
unitTarget->ToPlayer()->RewardHonor(NULL, 1, damage, false); unitTarget->ToPlayer()->RewardHonor(NULL, 1, damage, false);
;//sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "SpellEffect::AddHonor (spell_id %u) rewards %u honor points (non scale) for player: %u", m_spellInfo->Id, damage, unitTarget->ToPlayer()->GetGUIDLow()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "SpellEffect::AddHonor (spell_id %u) rewards %u honor points (non scale) for player: %u", m_spellInfo->Id, damage, unitTarget->ToPlayer()->GetGUIDLow());
#endif
} }
} }
@@ -4100,7 +4130,9 @@ void Spell::EffectScriptEffect(SpellEffIndex effIndex)
} }
// normal DB scripted effect // normal DB scripted effect
;//sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "Spell ScriptStart spellid %u in EffectScriptEffect(%u)", m_spellInfo->Id, effIndex); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "Spell ScriptStart spellid %u in EffectScriptEffect(%u)", m_spellInfo->Id, effIndex);
#endif
m_caster->GetMap()->ScriptsStart(sSpellScripts, uint32(m_spellInfo->Id | (effIndex << 24)), m_caster, unitTarget); m_caster->GetMap()->ScriptsStart(sSpellScripts, uint32(m_spellInfo->Id | (effIndex << 24)), m_caster, unitTarget);
} }
@@ -5380,7 +5412,9 @@ void Spell::EffectTransmitted(SpellEffIndex effIndex)
ExecuteLogEffectSummonObject(effIndex, pGameObj); ExecuteLogEffectSummonObject(effIndex, pGameObj);
;//sLog->outStaticDebug("AddObject at SpellEfects.cpp EffectTransmitted"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug("AddObject at SpellEfects.cpp EffectTransmitted");
#endif
//m_caster->AddGameObject(pGameObj); //m_caster->AddGameObject(pGameObj);
//m_ObjToDel.push_back(pGameObj); //m_ObjToDel.push_back(pGameObj);
@@ -5464,7 +5498,9 @@ void Spell::EffectSkill(SpellEffIndex /*effIndex*/)
if (effectHandleMode != SPELL_EFFECT_HANDLE_HIT) if (effectHandleMode != SPELL_EFFECT_HANDLE_HIT)
return; return;
;//sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "WORLD: SkillEFFECT"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "WORLD: SkillEFFECT");
#endif
} }
/* There is currently no need for this effect. We handle it in Battleground.cpp /* There is currently no need for this effect. We handle it in Battleground.cpp
@@ -5495,7 +5531,9 @@ void Spell::EffectSkinPlayerCorpse(SpellEffIndex /*effIndex*/)
if (effectHandleMode != SPELL_EFFECT_HANDLE_HIT_TARGET) if (effectHandleMode != SPELL_EFFECT_HANDLE_HIT_TARGET)
return; return;
;//sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "Effect: SkinPlayerCorpse"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "Effect: SkinPlayerCorpse");
#endif
if ((m_caster->GetTypeId() != TYPEID_PLAYER) || (unitTarget->GetTypeId() != TYPEID_PLAYER) || (unitTarget->IsAlive())) if ((m_caster->GetTypeId() != TYPEID_PLAYER) || (unitTarget->GetTypeId() != TYPEID_PLAYER) || (unitTarget->IsAlive()))
return; return;
@@ -5507,7 +5545,9 @@ void Spell::EffectStealBeneficialBuff(SpellEffIndex effIndex)
if (effectHandleMode != SPELL_EFFECT_HANDLE_HIT_TARGET) if (effectHandleMode != SPELL_EFFECT_HANDLE_HIT_TARGET)
return; return;
;//sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "Effect: StealBeneficialBuff"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "Effect: StealBeneficialBuff");
#endif
if (!unitTarget || unitTarget == m_caster) // can't steal from self if (!unitTarget || unitTarget == m_caster) // can't steal from self
return; return;
@@ -6157,7 +6197,9 @@ void Spell::EffectBind(SpellEffIndex effIndex)
data << uint32(areaId); data << uint32(areaId);
player->SendDirectMessage(&data); player->SendDirectMessage(&data);
;//sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "EffectBind: New homebind X: %f, Y: %f, Z: %f, MapId: %u, AreaId: %u", #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "EffectBind: New homebind X: %f, Y: %f, Z: %f, MapId: %u, AreaId: %u",
#endif
// homeLoc.GetPositionX(), homeLoc.GetPositionY(), homeLoc.GetPositionZ(), homeLoc.GetMapId(), areaId); // homeLoc.GetPositionX(), homeLoc.GetPositionY(), homeLoc.GetPositionZ(), homeLoc.GetMapId(), areaId);
// zone update // zone update
src/game/Spells/SpellInfo.cpp
+3 -1
View File
@@ -2365,7 +2365,9 @@ int32 SpellInfo::CalcPowerCost(Unit const* caster, SpellSchoolMask schoolMask, S
break; break;
case POWER_RUNE: case POWER_RUNE:
case POWER_RUNIC_POWER: case POWER_RUNIC_POWER:
;//sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "CalculateManaCost: Not implemented yet!"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "CalculateManaCost: Not implemented yet!");
#endif
break; break;
default: default:
sLog->outError("CalculateManaCost: Unknown power type '%d' in spell %d", PowerType, Id); sLog->outError("CalculateManaCost: Unknown power type '%d' in spell %d", PowerType, Id);
src/game/Spells/SpellMgr.cpp
+18 -6
View File
@@ -490,13 +490,17 @@ uint32 SpellMgr::GetSpellIdForDifficulty(uint32 spellId, Unit const* caster) con
SpellDifficultyEntry const* difficultyEntry = sSpellDifficultyStore.LookupEntry(difficultyId); SpellDifficultyEntry const* difficultyEntry = sSpellDifficultyStore.LookupEntry(difficultyId);
if (!difficultyEntry) if (!difficultyEntry)
{ {
;//sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "SpellMgr::GetSpellIdForDifficulty: SpellDifficultyEntry not found for spell %u. This should never happen.", spellId); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "SpellMgr::GetSpellIdForDifficulty: SpellDifficultyEntry not found for spell %u. This should never happen.", spellId);
#endif
return spellId; //return source spell return spellId; //return source spell
} }
if (difficultyEntry->SpellID[mode] <= 0 && mode > DUNGEON_DIFFICULTY_HEROIC) if (difficultyEntry->SpellID[mode] <= 0 && mode > DUNGEON_DIFFICULTY_HEROIC)
{ {
;//sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "SpellMgr::GetSpellIdForDifficulty: spell %u mode %u spell is NULL, using mode %u", spellId, mode, mode - 2); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "SpellMgr::GetSpellIdForDifficulty: spell %u mode %u spell is NULL, using mode %u", spellId, mode, mode - 2);
#endif
mode -= 2; mode -= 2;
} }
@@ -506,7 +510,9 @@ uint32 SpellMgr::GetSpellIdForDifficulty(uint32 spellId, Unit const* caster) con
return spellId; return spellId;
} }
;//sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "SpellMgr::GetSpellIdForDifficulty: spellid for spell %u in mode %u is %d", spellId, mode, difficultyEntry->SpellID[mode]); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "SpellMgr::GetSpellIdForDifficulty: spellid for spell %u in mode %u is %d", spellId, mode, difficultyEntry->SpellID[mode]);
#endif
return uint32(difficultyEntry->SpellID[mode]); return uint32(difficultyEntry->SpellID[mode]);
} }
@@ -516,11 +522,15 @@ SpellInfo const* SpellMgr::GetSpellForDifficultyFromSpell(SpellInfo const* spell
SpellInfo const* newSpell = GetSpellInfo(newSpellId); SpellInfo const* newSpell = GetSpellInfo(newSpellId);
if (!newSpell) if (!newSpell)
{ {
;//sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "SpellMgr::GetSpellForDifficultyFromSpell: spell %u not found. Check spelldifficulty_dbc!", newSpellId); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "SpellMgr::GetSpellForDifficultyFromSpell: spell %u not found. Check spelldifficulty_dbc!", newSpellId);
#endif
return spell; return spell;
} }
;//sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "SpellMgr::GetSpellForDifficultyFromSpell: Spell id for instance mode is %u (original %u)", newSpell->Id, spell->Id); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "SpellMgr::GetSpellForDifficultyFromSpell: Spell id for instance mode is %u (original %u)", newSpell->Id, spell->Id);
#endif
return newSpell; return newSpell;
} }
@@ -1546,7 +1556,9 @@ void SpellMgr::LoadSpellTargetPositions()
if (found) if (found)
{ {
if (!sSpellMgr->GetSpellTargetPosition(i)) if (!sSpellMgr->GetSpellTargetPosition(i))
;//sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "Spell (ID: %u) does not have record in `spell_target_position`", i); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "Spell (ID: %u) does not have record in `spell_target_position`", i);
#endif
} }
}*/ }*/
src/game/Texts/CreatureTextMgr.cpp
+6 -2
View File
@@ -429,7 +429,9 @@ bool CreatureTextMgr::TextExist(uint32 sourceEntry, uint8 textGroup)
CreatureTextMap::const_iterator sList = mTextMap.find(sourceEntry); CreatureTextMap::const_iterator sList = mTextMap.find(sourceEntry);
if (sList == mTextMap.end()) if (sList == mTextMap.end())
{ {
;//sLog->outDebug(LOG_FILTER_UNITS, "CreatureTextMgr::TextExist: Could not find Text for Creature (entry %u) in 'creature_text' table.", sourceEntry); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_UNITS, "CreatureTextMgr::TextExist: Could not find Text for Creature (entry %u) in 'creature_text' table.", sourceEntry);
#endif
return false; return false;
} }
@@ -437,7 +439,9 @@ bool CreatureTextMgr::TextExist(uint32 sourceEntry, uint8 textGroup)
CreatureTextHolder::const_iterator itr = textHolder.find(textGroup); CreatureTextHolder::const_iterator itr = textHolder.find(textGroup);
if (itr == textHolder.end()) if (itr == textHolder.end())
{ {
;//sLog->outDebug(LOG_FILTER_UNITS, "CreatureTextMgr::TextExist: Could not find TextGroup %u for Creature (entry %u).", uint32(textGroup), sourceEntry); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_UNITS, "CreatureTextMgr::TextExist: Could not find TextGroup %u for Creature (entry %u).", uint32(textGroup), sourceEntry);
#endif
return false; return false;
} }
src/game/Warden/Warden.cpp
+24 -8
View File
@@ -36,7 +36,9 @@ Warden::~Warden()
void Warden::SendModuleToClient() void Warden::SendModuleToClient()
{ {
;//sLog->outDebug(LOG_FILTER_WARDEN, "Send module to client"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_WARDEN, "Send module to client");
#endif
// Create packet structure // Create packet structure
WardenModuleTransfer packet; WardenModuleTransfer packet;
@@ -62,7 +64,9 @@ void Warden::SendModuleToClient()
void Warden::RequestModule() void Warden::RequestModule()
{ {
;//sLog->outDebug(LOG_FILTER_WARDEN, "Request module"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_WARDEN, "Request module");
#endif
// Create packet structure // Create packet structure
WardenModuleUse request; WardenModuleUse request;
@@ -125,12 +129,16 @@ bool Warden::IsValidCheckSum(uint32 checksum, const uint8* data, const uint16 le
if (checksum != newChecksum) if (checksum != newChecksum)
{ {
;//sLog->outDebug(LOG_FILTER_WARDEN, "CHECKSUM IS NOT VALID"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_WARDEN, "CHECKSUM IS NOT VALID");
#endif
return false; return false;
} }
else else
{ {
;//sLog->outDebug(LOG_FILTER_WARDEN, "CHECKSUM IS VALID"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_WARDEN, "CHECKSUM IS VALID");
#endif
return true; return true;
} }
} }
@@ -237,7 +245,9 @@ void WorldSession::HandleWardenDataOpcode(WorldPacket& recvData)
_warden->DecryptData(recvData.contents(), recvData.size()); _warden->DecryptData(recvData.contents(), recvData.size());
uint8 opcode; uint8 opcode;
recvData >> opcode; recvData >> opcode;
;//sLog->outDebug(LOG_FILTER_WARDEN, "Got packet, opcode %02X, size %u", opcode, uint32(recvData.size())); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_WARDEN, "Got packet, opcode %02X, size %u", opcode, uint32(recvData.size()));
#endif
recvData.hexlike(); recvData.hexlike();
switch (opcode) switch (opcode)
@@ -252,17 +262,23 @@ void WorldSession::HandleWardenDataOpcode(WorldPacket& recvData)
_warden->HandleData(recvData); _warden->HandleData(recvData);
break; break;
case WARDEN_CMSG_MEM_CHECKS_RESULT: case WARDEN_CMSG_MEM_CHECKS_RESULT:
;//sLog->outDebug(LOG_FILTER_WARDEN, "NYI WARDEN_CMSG_MEM_CHECKS_RESULT received!"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_WARDEN, "NYI WARDEN_CMSG_MEM_CHECKS_RESULT received!");
#endif
break; break;
case WARDEN_CMSG_HASH_RESULT: case WARDEN_CMSG_HASH_RESULT:
_warden->HandleHashResult(recvData); _warden->HandleHashResult(recvData);
_warden->InitializeModule(); _warden->InitializeModule();
break; break;
case WARDEN_CMSG_MODULE_FAILED: case WARDEN_CMSG_MODULE_FAILED:
;//sLog->outDebug(LOG_FILTER_WARDEN, "NYI WARDEN_CMSG_MODULE_FAILED received!"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_WARDEN, "NYI WARDEN_CMSG_MODULE_FAILED received!");
#endif
break; break;
default: default:
;//sLog->outDebug(LOG_FILTER_WARDEN, "Got unknown warden opcode %02X of size %u.", opcode, uint32(recvData.size() - 1)); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_WARDEN, "Got unknown warden opcode %02X of size %u.", opcode, uint32(recvData.size() - 1));
#endif
break; break;
} }
} }
src/game/Warden/WardenMac.cpp
+45 -15
View File
@@ -46,16 +46,30 @@ void WardenMac::Init(WorldSession *pClient, BigNumber *K)
_inputCrypto.Init(_inputKey); _inputCrypto.Init(_inputKey);
_outputCrypto.Init(_outputKey); _outputCrypto.Init(_outputKey);
;//sLog->outDebug(LOG_FILTER_WARDEN, "Server side warden for client %u initializing...", pClient->GetAccountId()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
;//sLog->outDebug(LOG_FILTER_WARDEN, "C->S Key: %s", ByteArrayToHexStr(_inputKey, 16).c_str()); sLog->outDebug(LOG_FILTER_WARDEN, "Server side warden for client %u initializing...", pClient->GetAccountId());
;//sLog->outDebug(LOG_FILTER_WARDEN, "S->C Key: %s", ByteArrayToHexStr(_outputKey, 16).c_str()); #endif
;//sLog->outDebug(LOG_FILTER_WARDEN, " Seed: %s", ByteArrayToHexStr(_seed, 16).c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
;//sLog->outDebug(LOG_FILTER_WARDEN, "Loading Module..."); sLog->outDebug(LOG_FILTER_WARDEN, "C->S Key: %s", ByteArrayToHexStr(_inputKey, 16).c_str());
#endif
#ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_WARDEN, "S->C Key: %s", ByteArrayToHexStr(_outputKey, 16).c_str());
#endif
#ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_WARDEN, " Seed: %s", ByteArrayToHexStr(_seed, 16).c_str());
#endif
#ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_WARDEN, "Loading Module...");
#endif
_module = GetModuleForClient(); _module = GetModuleForClient();
;//sLog->outDebug(LOG_FILTER_WARDEN, "Module Key: %s", ByteArrayToHexStr(_module->Key, 16).c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
;//sLog->outDebug(LOG_FILTER_WARDEN, "Module ID: %s", ByteArrayToHexStr(_module->Id, 16).c_str()); sLog->outDebug(LOG_FILTER_WARDEN, "Module Key: %s", ByteArrayToHexStr(_module->Key, 16).c_str());
#endif
#ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_WARDEN, "Module ID: %s", ByteArrayToHexStr(_module->Id, 16).c_str());
#endif
RequestModule(); RequestModule();
} }
@@ -82,12 +96,16 @@ ClientWardenModule* WardenMac::GetModuleForClient()
void WardenMac::InitializeModule() void WardenMac::InitializeModule()
{ {
;//sLog->outDebug(LOG_FILTER_WARDEN, "Initialize module"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_WARDEN, "Initialize module");
#endif
} }
void WardenMac::RequestHash() void WardenMac::RequestHash()
{ {
;//sLog->outDebug(LOG_FILTER_WARDEN, "Request hash"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_WARDEN, "Request hash");
#endif
// Create packet structure // Create packet structure
WardenHashRequest Request; WardenHashRequest Request;
@@ -155,12 +173,16 @@ void WardenMac::HandleHashResult(ByteBuffer &buff)
// Verify key // Verify key
if (memcmp(buff.contents() + 1, sha1.GetDigest(), 20) != 0) if (memcmp(buff.contents() + 1, sha1.GetDigest(), 20) != 0)
{ {
;//sLog->outDebug(LOG_FILTER_WARDEN, "Request hash reply: failed"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_WARDEN, "Request hash reply: failed");
#endif
Penalty(); Penalty();
return; return;
} }
;//sLog->outDebug(LOG_FILTER_WARDEN, "Request hash reply: succeed"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_WARDEN, "Request hash reply: succeed");
#endif
// client 7F96EEFDA5B63D20A4DF8E00CBF48304 // client 7F96EEFDA5B63D20A4DF8E00CBF48304
//const uint8 client_key[16] = { 0x7F, 0x96, 0xEE, 0xFD, 0xA5, 0xB6, 0x3D, 0x20, 0xA4, 0xDF, 0x8E, 0x00, 0xCB, 0xF4, 0x83, 0x04 }; //const uint8 client_key[16] = { 0x7F, 0x96, 0xEE, 0xFD, 0xA5, 0xB6, 0x3D, 0x20, 0xA4, 0xDF, 0x8E, 0x00, 0xCB, 0xF4, 0x83, 0x04 };
@@ -182,7 +204,9 @@ void WardenMac::HandleHashResult(ByteBuffer &buff)
void WardenMac::RequestData() void WardenMac::RequestData()
{ {
;//sLog->outDebug(LOG_FILTER_WARDEN, "Request data"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_WARDEN, "Request data");
#endif
ByteBuffer buff; ByteBuffer buff;
buff << uint8(WARDEN_SMSG_CHEAT_CHECKS_REQUEST); buff << uint8(WARDEN_SMSG_CHEAT_CHECKS_REQUEST);
@@ -206,7 +230,9 @@ void WardenMac::RequestData()
void WardenMac::HandleData(ByteBuffer &buff) void WardenMac::HandleData(ByteBuffer &buff)
{ {
;//sLog->outDebug(LOG_FILTER_WARDEN, "Handle data"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_WARDEN, "Handle data");
#endif
_dataSent = false; _dataSent = false;
_clientResponseTimer = 0; _clientResponseTimer = 0;
@@ -239,7 +265,9 @@ void WardenMac::HandleData(ByteBuffer &buff)
if (memcmp(sha1Hash, sha1.GetDigest(), 20)) if (memcmp(sha1Hash, sha1.GetDigest(), 20))
{ {
;//sLog->outDebug(LOG_FILTER_WARDEN, "Handle data failed: SHA1 hash is wrong!"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_WARDEN, "Handle data failed: SHA1 hash is wrong!");
#endif
//found = true; //found = true;
} }
@@ -254,7 +282,9 @@ void WardenMac::HandleData(ByteBuffer &buff)
if (memcmp(ourMD5Hash, theirsMD5Hash, 16)) if (memcmp(ourMD5Hash, theirsMD5Hash, 16))
{ {
;//sLog->outDebug(LOG_FILTER_WARDEN, "Handle data failed: MD5 hash is wrong!"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_WARDEN, "Handle data failed: MD5 hash is wrong!");
#endif
//found = true; //found = true;
} }
src/game/Warden/WardenWin.cpp
+105 -35
View File
@@ -53,16 +53,30 @@ void WardenWin::Init(WorldSession* session, BigNumber *k)
_inputCrypto.Init(_inputKey); _inputCrypto.Init(_inputKey);
_outputCrypto.Init(_outputKey); _outputCrypto.Init(_outputKey);
;//sLog->outDebug(LOG_FILTER_WARDEN, "Server side warden for client %u initializing...", session->GetAccountId()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
;//sLog->outDebug(LOG_FILTER_WARDEN, "C->S Key: %s", ByteArrayToHexStr(_inputKey, 16).c_str()); sLog->outDebug(LOG_FILTER_WARDEN, "Server side warden for client %u initializing...", session->GetAccountId());
;//sLog->outDebug(LOG_FILTER_WARDEN, "S->C Key: %s", ByteArrayToHexStr(_outputKey, 16).c_str()); #endif
;//sLog->outDebug(LOG_FILTER_WARDEN, " Seed: %s", ByteArrayToHexStr(_seed, 16).c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
;//sLog->outDebug(LOG_FILTER_WARDEN, "Loading Module..."); sLog->outDebug(LOG_FILTER_WARDEN, "C->S Key: %s", ByteArrayToHexStr(_inputKey, 16).c_str());
#endif
#ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_WARDEN, "S->C Key: %s", ByteArrayToHexStr(_outputKey, 16).c_str());
#endif
#ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_WARDEN, " Seed: %s", ByteArrayToHexStr(_seed, 16).c_str());
#endif
#ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_WARDEN, "Loading Module...");
#endif
_module = GetModuleForClient(); _module = GetModuleForClient();
;//sLog->outDebug(LOG_FILTER_WARDEN, "Module Key: %s", ByteArrayToHexStr(_module->Key, 16).c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
;//sLog->outDebug(LOG_FILTER_WARDEN, "Module ID: %s", ByteArrayToHexStr(_module->Id, 16).c_str()); sLog->outDebug(LOG_FILTER_WARDEN, "Module Key: %s", ByteArrayToHexStr(_module->Key, 16).c_str());
#endif
#ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_WARDEN, "Module ID: %s", ByteArrayToHexStr(_module->Id, 16).c_str());
#endif
RequestModule(); RequestModule();
} }
@@ -89,7 +103,9 @@ ClientWardenModule* WardenWin::GetModuleForClient()
void WardenWin::InitializeModule() void WardenWin::InitializeModule()
{ {
;//sLog->outDebug(LOG_FILTER_WARDEN, "Initialize module"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_WARDEN, "Initialize module");
#endif
// Create packet structure // Create packet structure
WardenInitModuleRequest Request; WardenInitModuleRequest Request;
@@ -133,7 +149,9 @@ void WardenWin::InitializeModule()
void WardenWin::RequestHash() void WardenWin::RequestHash()
{ {
;//sLog->outDebug(LOG_FILTER_WARDEN, "Request hash"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_WARDEN, "Request hash");
#endif
// Create packet structure // Create packet structure
WardenHashRequest Request; WardenHashRequest Request;
@@ -155,12 +173,16 @@ void WardenWin::HandleHashResult(ByteBuffer &buff)
// Verify key // Verify key
if (memcmp(buff.contents() + 1, Module.ClientKeySeedHash, 20) != 0) if (memcmp(buff.contents() + 1, Module.ClientKeySeedHash, 20) != 0)
{ {
;//sLog->outDebug(LOG_FILTER_WARDEN, "Request hash reply: failed"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_WARDEN, "Request hash reply: failed");
#endif
Penalty(); Penalty();
return; return;
} }
;//sLog->outDebug(LOG_FILTER_WARDEN, "Request hash reply: succeed"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_WARDEN, "Request hash reply: succeed");
#endif
// Change keys here // Change keys here
memcpy(_inputKey, Module.ClientKeySeed, 16); memcpy(_inputKey, Module.ClientKeySeed, 16);
@@ -176,7 +198,9 @@ void WardenWin::HandleHashResult(ByteBuffer &buff)
void WardenWin::RequestData() void WardenWin::RequestData()
{ {
;//sLog->outDebug(LOG_FILTER_WARDEN, "Request data"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_WARDEN, "Request data");
#endif
// If all checks were done, fill the todo list again // If all checks were done, fill the todo list again
if (_memChecksTodo.empty()) if (_memChecksTodo.empty())
@@ -326,12 +350,16 @@ void WardenWin::RequestData()
for (std::list<uint16>::iterator itr = _currentChecks.begin(); itr != _currentChecks.end(); ++itr) for (std::list<uint16>::iterator itr = _currentChecks.begin(); itr != _currentChecks.end(); ++itr)
stream << *itr << " "; stream << *itr << " ";
;//sLog->outDebug(LOG_FILTER_WARDEN, "%s", stream.str().c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_WARDEN, "%s", stream.str().c_str());
#endif
} }
void WardenWin::HandleData(ByteBuffer &buff) void WardenWin::HandleData(ByteBuffer &buff)
{ {
;//sLog->outDebug(LOG_FILTER_WARDEN, "Handle data"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_WARDEN, "Handle data");
#endif
_dataSent = false; _dataSent = false;
_clientResponseTimer = 0; _clientResponseTimer = 0;
@@ -344,7 +372,9 @@ void WardenWin::HandleData(ByteBuffer &buff)
if (!IsValidCheckSum(Checksum, buff.contents() + buff.rpos(), Length)) if (!IsValidCheckSum(Checksum, buff.contents() + buff.rpos(), Length))
{ {
buff.rpos(buff.wpos()); buff.rpos(buff.wpos());
;//sLog->outDebug(LOG_FILTER_WARDEN, "CHECKSUM FAIL"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_WARDEN, "CHECKSUM FAIL");
#endif
Penalty(); Penalty();
return; return;
} }
@@ -356,7 +386,9 @@ void WardenWin::HandleData(ByteBuffer &buff)
// TODO: test it. // TODO: test it.
if (result == 0x00) if (result == 0x00)
{ {
;//sLog->outDebug(LOG_FILTER_WARDEN, "TIMING CHECK FAIL result 0x00"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_WARDEN, "TIMING CHECK FAIL result 0x00");
#endif
Penalty(); Penalty();
return; return;
} }
@@ -367,10 +399,18 @@ void WardenWin::HandleData(ByteBuffer &buff)
uint32 ticksNow = World::GetGameTimeMS(); uint32 ticksNow = World::GetGameTimeMS();
uint32 ourTicks = newClientTicks + (ticksNow - _serverTicks); uint32 ourTicks = newClientTicks + (ticksNow - _serverTicks);
;//sLog->outDebug(LOG_FILTER_WARDEN, "ServerTicks %u", ticksNow); // Now #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
;//sLog->outDebug(LOG_FILTER_WARDEN, "RequestTicks %u", _serverTicks); // At request sLog->outDebug(LOG_FILTER_WARDEN, "ServerTicks %u", ticksNow); // Now
;//sLog->outDebug(LOG_FILTER_WARDEN, "Ticks %u", newClientTicks); // At response #endif
;//sLog->outDebug(LOG_FILTER_WARDEN, "Ticks diff %u", ourTicks - newClientTicks); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_WARDEN, "RequestTicks %u", _serverTicks); // At request
#endif
#ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_WARDEN, "Ticks %u", newClientTicks); // At response
#endif
#ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_WARDEN, "Ticks diff %u", ourTicks - newClientTicks);
#endif
} }
WardenCheckResult *rs; WardenCheckResult *rs;
@@ -395,21 +435,27 @@ void WardenWin::HandleData(ByteBuffer &buff)
if (Mem_Result != 0) if (Mem_Result != 0)
{ {
;//sLog->outDebug(LOG_FILTER_WARDEN, "RESULT MEM_CHECK not 0x00, CheckId %u account Id %u", *itr, _session->GetAccountId()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_WARDEN, "RESULT MEM_CHECK not 0x00, CheckId %u account Id %u", *itr, _session->GetAccountId());
#endif
checkFailed = *itr; checkFailed = *itr;
continue; continue;
} }
if (memcmp(buff.contents() + buff.rpos(), rs->Result.AsByteArray(0, false).get(), rd->Length) != 0) if (memcmp(buff.contents() + buff.rpos(), rs->Result.AsByteArray(0, false).get(), rd->Length) != 0)
{ {
;//sLog->outDebug(LOG_FILTER_WARDEN, "RESULT MEM_CHECK fail CheckId %u account Id %u", *itr, _session->GetAccountId()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_WARDEN, "RESULT MEM_CHECK fail CheckId %u account Id %u", *itr, _session->GetAccountId());
#endif
checkFailed = *itr; checkFailed = *itr;
buff.rpos(buff.rpos() + rd->Length); buff.rpos(buff.rpos() + rd->Length);
continue; continue;
} }
buff.rpos(buff.rpos() + rd->Length); buff.rpos(buff.rpos() + rd->Length);
;//sLog->outDebug(LOG_FILTER_WARDEN, "RESULT MEM_CHECK passed CheckId %u account Id %u", *itr, _session->GetAccountId()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_WARDEN, "RESULT MEM_CHECK passed CheckId %u account Id %u", *itr, _session->GetAccountId());
#endif
break; break;
} }
case PAGE_CHECK_A: case PAGE_CHECK_A:
@@ -421,11 +467,17 @@ void WardenWin::HandleData(ByteBuffer &buff)
if (memcmp(buff.contents() + buff.rpos(), &byte, sizeof(uint8)) != 0) if (memcmp(buff.contents() + buff.rpos(), &byte, sizeof(uint8)) != 0)
{ {
/*if (type == PAGE_CHECK_A || type == PAGE_CHECK_B) /*if (type == PAGE_CHECK_A || type == PAGE_CHECK_B)
;//sLog->outDebug(LOG_FILTER_WARDEN, "RESULT PAGE_CHECK fail, CheckId %u account Id %u", *itr, _session->GetAccountId()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_WARDEN, "RESULT PAGE_CHECK fail, CheckId %u account Id %u", *itr, _session->GetAccountId());
#endif
if (type == MODULE_CHECK) if (type == MODULE_CHECK)
;//sLog->outDebug(LOG_FILTER_WARDEN, "RESULT MODULE_CHECK fail, CheckId %u account Id %u", *itr, _session->GetAccountId()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_WARDEN, "RESULT MODULE_CHECK fail, CheckId %u account Id %u", *itr, _session->GetAccountId());
#endif
if (type == DRIVER_CHECK) if (type == DRIVER_CHECK)
;//sLog->outDebug(LOG_FILTER_WARDEN, "RESULT DRIVER_CHECK fail, CheckId %u account Id %u", *itr, _session->GetAccountId());*/ #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_WARDEN, "RESULT DRIVER_CHECK fail, CheckId %u account Id %u", *itr, _session->GetAccountId());*/
#endif
checkFailed = *itr; checkFailed = *itr;
buff.rpos(buff.rpos() + 1); buff.rpos(buff.rpos() + 1);
continue; continue;
@@ -433,11 +485,17 @@ void WardenWin::HandleData(ByteBuffer &buff)
buff.rpos(buff.rpos() + 1); buff.rpos(buff.rpos() + 1);
/*if (type == PAGE_CHECK_A || type == PAGE_CHECK_B) /*if (type == PAGE_CHECK_A || type == PAGE_CHECK_B)
;//sLog->outDebug(LOG_FILTER_WARDEN, "RESULT PAGE_CHECK passed CheckId %u account Id %u", *itr, _session->GetAccountId()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_WARDEN, "RESULT PAGE_CHECK passed CheckId %u account Id %u", *itr, _session->GetAccountId());
#endif
else if (type == MODULE_CHECK) else if (type == MODULE_CHECK)
;//sLog->outDebug(LOG_FILTER_WARDEN, "RESULT MODULE_CHECK passed CheckId %u account Id %u", *itr, _session->GetAccountId()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_WARDEN, "RESULT MODULE_CHECK passed CheckId %u account Id %u", *itr, _session->GetAccountId());
#endif
else if (type == DRIVER_CHECK) else if (type == DRIVER_CHECK)
;//sLog->outDebug(LOG_FILTER_WARDEN, "RESULT DRIVER_CHECK passed CheckId %u account Id %u", *itr, _session->GetAccountId());*/ #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_WARDEN, "RESULT DRIVER_CHECK passed CheckId %u account Id %u", *itr, _session->GetAccountId());*/
#endif
break; break;
} }
case LUA_STR_CHECK: case LUA_STR_CHECK:
@@ -447,7 +505,9 @@ void WardenWin::HandleData(ByteBuffer &buff)
if (Lua_Result != 0) if (Lua_Result != 0)
{ {
;//sLog->outDebug(LOG_FILTER_WARDEN, "RESULT LUA_STR_CHECK fail, CheckId %u account Id %u", *itr, _session->GetAccountId()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_WARDEN, "RESULT LUA_STR_CHECK fail, CheckId %u account Id %u", *itr, _session->GetAccountId());
#endif
checkFailed = *itr; checkFailed = *itr;
continue; continue;
} }
@@ -460,11 +520,15 @@ void WardenWin::HandleData(ByteBuffer &buff)
char *str = new char[luaStrLen + 1]; char *str = new char[luaStrLen + 1];
memcpy(str, buff.contents() + buff.rpos(), luaStrLen); memcpy(str, buff.contents() + buff.rpos(), luaStrLen);
str[luaStrLen] = '\0'; // null terminator str[luaStrLen] = '\0'; // null terminator
;//sLog->outDebug(LOG_FILTER_WARDEN, "Lua string: %s", str); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_WARDEN, "Lua string: %s", str);
#endif
delete[] str; delete[] str;
} }
buff.rpos(buff.rpos() + luaStrLen); // Skip string buff.rpos(buff.rpos() + luaStrLen); // Skip string
;//sLog->outDebug(LOG_FILTER_WARDEN, "RESULT LUA_STR_CHECK passed, CheckId %u account Id %u", *itr, _session->GetAccountId()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_WARDEN, "RESULT LUA_STR_CHECK passed, CheckId %u account Id %u", *itr, _session->GetAccountId());
#endif
break; break;
} }
case MPQ_CHECK: case MPQ_CHECK:
@@ -474,21 +538,27 @@ void WardenWin::HandleData(ByteBuffer &buff)
if (Mpq_Result != 0) if (Mpq_Result != 0)
{ {
;//sLog->outDebug(LOG_FILTER_WARDEN, "RESULT MPQ_CHECK not 0x00 account id %u", _session->GetAccountId()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_WARDEN, "RESULT MPQ_CHECK not 0x00 account id %u", _session->GetAccountId());
#endif
checkFailed = *itr; checkFailed = *itr;
continue; continue;
} }
if (memcmp(buff.contents() + buff.rpos(), rs->Result.AsByteArray(0, false).get(), 20) != 0) // SHA1 if (memcmp(buff.contents() + buff.rpos(), rs->Result.AsByteArray(0, false).get(), 20) != 0) // SHA1
{ {
;//sLog->outDebug(LOG_FILTER_WARDEN, "RESULT MPQ_CHECK fail, CheckId %u account Id %u", *itr, _session->GetAccountId()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_WARDEN, "RESULT MPQ_CHECK fail, CheckId %u account Id %u", *itr, _session->GetAccountId());
#endif
checkFailed = *itr; checkFailed = *itr;
buff.rpos(buff.rpos() + 20); // 20 bytes SHA1 buff.rpos(buff.rpos() + 20); // 20 bytes SHA1
continue; continue;
} }
buff.rpos(buff.rpos() + 20); // 20 bytes SHA1 buff.rpos(buff.rpos() + 20); // 20 bytes SHA1
;//sLog->outDebug(LOG_FILTER_WARDEN, "RESULT MPQ_CHECK passed, CheckId %u account Id %u", *itr, _session->GetAccountId()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_WARDEN, "RESULT MPQ_CHECK passed, CheckId %u account Id %u", *itr, _session->GetAccountId());
#endif
break; break;
} }
default: // Should never happen default: // Should never happen
src/game/Weather/Weather.cpp
+9 -3
View File
@@ -26,7 +26,9 @@ Weather::Weather(uint32 zone, WeatherData const* weatherChances)
m_type = WEATHER_TYPE_FINE; m_type = WEATHER_TYPE_FINE;
m_grade = 0; m_grade = 0;
;//sLog->outDetail("WORLD: Starting weather system for zone %u (change every %u minutes).", m_zone, (uint32)(m_timer.GetInterval() / (MINUTE*IN_MILLISECONDS))); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("WORLD: Starting weather system for zone %u (change every %u minutes).", m_zone, (uint32)(m_timer.GetInterval() / (MINUTE*IN_MILLISECONDS)));
#endif
} }
/// Launch a weather update /// Launch a weather update
@@ -87,7 +89,9 @@ bool Weather::ReGenerate()
static char const* seasonName[WEATHER_SEASONS] = { "spring", "summer", "fall", "winter" }; static char const* seasonName[WEATHER_SEASONS] = { "spring", "summer", "fall", "winter" };
;//sLog->outDetail("Generating a change in %s weather for zone %u.", seasonName[season], m_zone); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("Generating a change in %s weather for zone %u.", seasonName[season], m_zone);
#endif
if ((u < 60) && (m_grade < 0.33333334f)) // Get fair if ((u < 60) && (m_grade < 0.33333334f)) // Get fair
{ {
@@ -252,7 +256,9 @@ bool Weather::UpdateWeather()
wthstr = "fine"; wthstr = "fine";
break; break;
} }
;//sLog->outDetail("Change the weather of zone %u to %s.", m_zone, wthstr); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("Change the weather of zone %u to %s.", m_zone, wthstr);
#endif
sScriptMgr->OnWeatherChange(this, state, m_grade); sScriptMgr->OnWeatherChange(this, state, m_grade);
return true; return true;
} }
src/game/World/World.cpp
+18 -6
View File
@@ -2097,7 +2097,9 @@ void World::Update(uint32 diff)
if (m_timers[WUPDATE_PINGDB].Passed()) if (m_timers[WUPDATE_PINGDB].Passed())
{ {
m_timers[WUPDATE_PINGDB].Reset(); m_timers[WUPDATE_PINGDB].Reset();
;//sLog->outDetail("Ping MySQL to keep connection alive"); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("Ping MySQL to keep connection alive");
#endif
CharacterDatabase.KeepAlive(); CharacterDatabase.KeepAlive();
LoginDatabase.KeepAlive(); LoginDatabase.KeepAlive();
WorldDatabase.KeepAlive(); WorldDatabase.KeepAlive();
@@ -2567,7 +2569,9 @@ void World::ShutdownMsg(bool show, Player* player)
ServerMessageType msgid = (m_ShutdownMask & SHUTDOWN_MASK_RESTART) ? SERVER_MSG_RESTART_TIME : SERVER_MSG_SHUTDOWN_TIME; ServerMessageType msgid = (m_ShutdownMask & SHUTDOWN_MASK_RESTART) ? SERVER_MSG_RESTART_TIME : SERVER_MSG_SHUTDOWN_TIME;
SendServerMessage(msgid, str.c_str(), player); SendServerMessage(msgid, str.c_str(), player);
;//sLog->outStaticDebug("Server is %s in %s", (m_ShutdownMask & SHUTDOWN_MASK_RESTART ? "restart" : "shuttingdown"), str.c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug("Server is %s in %s", (m_ShutdownMask & SHUTDOWN_MASK_RESTART ? "restart" : "shuttingdown"), str.c_str());
#endif
} }
} }
@@ -2585,7 +2589,9 @@ void World::ShutdownCancel()
m_ExitCode = SHUTDOWN_EXIT_CODE; // to default value m_ExitCode = SHUTDOWN_EXIT_CODE; // to default value
SendServerMessage(msgid); SendServerMessage(msgid);
;//sLog->outStaticDebug("Server %s cancelled.", (m_ShutdownMask & SHUTDOWN_MASK_RESTART ? "restart" : "shuttingdown")); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug("Server %s cancelled.", (m_ShutdownMask & SHUTDOWN_MASK_RESTART ? "restart" : "shuttingdown"));
#endif
sScriptMgr->OnShutdownCancel(); sScriptMgr->OnShutdownCancel();
} }
@@ -2679,7 +2685,9 @@ void World::ProcessCliCommands()
CliCommandHolder* command = NULL; CliCommandHolder* command = NULL;
while (cliCmdQueue.next(command)) while (cliCmdQueue.next(command))
{ {
;//sLog->outDetail("CLI command under processing..."); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("CLI command under processing...");
#endif
zprint = command->m_print; zprint = command->m_print;
callbackArg = command->m_callbackArg; callbackArg = command->m_callbackArg;
CliHandler handler(callbackArg, zprint); CliHandler handler(callbackArg, zprint);
@@ -2747,7 +2755,9 @@ void World::SendAutoBroadcast()
sWorld->SendGlobalMessage(&data); sWorld->SendGlobalMessage(&data);
} }
;//sLog->outDetail("AutoBroadcast: '%s'", msg.c_str()); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("AutoBroadcast: '%s'", msg.c_str());
#endif
} }
void World::UpdateRealmCharCount(uint32 accountId) void World::UpdateRealmCharCount(uint32 accountId)
@@ -2947,7 +2957,9 @@ void World::ResetEventSeasonalQuests(uint16 event_id)
void World::ResetRandomBG() void World::ResetRandomBG()
{ {
;//sLog->outDetail("Random BG status reset for all characters."); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("Random BG status reset for all characters.");
#endif
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_BATTLEGROUND_RANDOM); PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_BATTLEGROUND_RANDOM);
CharacterDatabase.Execute(stmt); CharacterDatabase.Execute(stmt);

Some files were not shown because too many files have changed in this diff Show More