Skip to content

Commit 9874a47

Browse files
author
Grimdhex
authored
refactor(Core): fix few static analysis (azerothcore#20566)
* refactor(Core): fix few static analysis * fix builds * revert FacingInfo change and fix GraveYard ID use in a log
1 parent 8792cd3 commit 9874a47

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

src/server/game/Combat/ThreatMgr.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ void HostileReference::setOnlineOfflineState(bool isOnline)
217217
{
218218
iOnline = isOnline;
219219

220-
ThreatRefStatusChangeEvent event(UEV_THREAT_REF_ONLINE_STATUS, this);
220+
ThreatRefStatusChangeEvent event(UEV_THREAT_REF_ONLINE_STATUS, this, isOnline);
221221
fireStatusChanged(event);
222222
}
223223
}
@@ -230,7 +230,7 @@ void HostileReference::removeReference()
230230
{
231231
invalidate();
232232

233-
ThreatRefStatusChangeEvent event(UEV_THREAT_REF_REMOVE_FROM_LIST, this);
233+
ThreatRefStatusChangeEvent event(UEV_THREAT_REF_REMOVE_FROM_LIST, this, false);
234234
fireStatusChanged(event);
235235
}
236236

src/server/game/Misc/GameGraveyard.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@ void Graveyard::LoadGraveyardFromDB()
4646

4747
do
4848
{
49-
Field* fields = result->Fetch();
50-
uint32 ID = fields[0].Get<uint32>();
51-
5249
GraveyardStruct Graveyard;
5350

51+
Field* fields = result->Fetch();
52+
53+
Graveyard.ID = fields[0].Get<uint32>();
5454
Graveyard.Map = fields[1].Get<uint32>();
5555
Graveyard.x = fields[2].Get<float>();
5656
Graveyard.y = fields[3].Get<float>();
@@ -59,13 +59,13 @@ void Graveyard::LoadGraveyardFromDB()
5959

6060
if (!Utf8toWStr(Graveyard.name, Graveyard.wnameLow))
6161
{
62-
LOG_ERROR("sql.sql", "Wrong UTF8 name for id {} in `game_graveyard` table, ignoring.", ID);
62+
LOG_ERROR("sql.sql", "Wrong UTF8 name for id {} in `game_graveyard` table, ignoring.", Graveyard.ID);
6363
continue;
6464
}
6565

6666
wstrToLower(Graveyard.wnameLow);
6767

68-
_graveyardStore[ID] = Graveyard;
68+
_graveyardStore[Graveyard.ID] = std::move(Graveyard);
6969

7070
++Count;
7171
} while (result->NextRow());

src/server/game/Server/WorldSocket.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,7 @@ WorldSocket::ReadDataHandlerResult WorldSocket::ReadDataHandler()
476476
OpcodeHandler const* handler = opcodeTable[opcode];
477477
if (!handler)
478478
{
479-
LOG_ERROR("network.opcode", "No defined handler for opcode {} sent by {}", GetOpcodeNameForLogging(static_cast<OpcodeClient>(packet.GetOpcode())), _worldSession->GetPlayerInfo());
479+
LOG_ERROR("network.opcode", "No defined handler for opcode {} sent by {}", GetOpcodeNameForLogging(static_cast<OpcodeClient>(packetToQueue->GetOpcode())), _worldSession->GetPlayerInfo());
480480
delete packetToQueue;
481481
return ReadDataHandlerResult::Error;
482482
}

0 commit comments

Comments
 (0)