Skip to content

Commit

Permalink
Improve error messages in MovementPacketSender (#2892)
Browse files Browse the repository at this point in the history 
Add information about the affected unit and fix wrong function names.
  • Loading branch information
@Stoabrogga
Stoabrogga authored Feb 8, 2025
1 parent 7f01436 commit 6ee7044
Showing 1 changed file with 13 additions and 13 deletions.
26 changes: 13 additions & 13 deletions src/game/Movement/MovementPacketSender.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ void MovementPacketSender::AddSpeedChangeToController(Unit* unit, UnitMoveType m
Player* mover = unit->GetPlayerMovingMe();
if (!mover)
{
sLog.Out(LOG_BASIC, LOG_LVL_ERROR, "MovementPacketSender::SendSpeedChangeToController: Incorrect use of the function. It was called on a unit controlled by the server!");
sLog.Out(LOG_BASIC, LOG_LVL_ERROR, "MovementPacketSender::AddSpeedChangeToController: Incorrect use of the function. It was called on a unit controlled by the server! %s", unit->GetGuidStr().c_str());
return;
}

Expand Down Expand Up @@ -96,7 +96,7 @@ MovementChangeType MovementPacketSender::GetChangeTypeByMoveType(UnitMoveType mo
case MOVE_SWIM_BACK: return SPEED_CHANGE_SWIM_BACK;
case MOVE_TURN_RATE: return RATE_CHANGE_TURN;
default:
ASSERT(false && "MovementPacketSender::SendSpeedChangeToController Unsupported UnitMoveType");
ASSERT(false && "MovementPacketSender::GetChangeTypeByMoveType Unsupported UnitMoveType");
}
}

Expand All @@ -111,7 +111,7 @@ UnitMoveType MovementPacketSender::GetMoveTypeByChangeType(MovementChangeType mo
case SPEED_CHANGE_SWIM_BACK: return MOVE_SWIM_BACK;
case RATE_CHANGE_TURN: return MOVE_TURN_RATE;
default:
ASSERT(false && "MovementPacketSender::SendSpeedChangeToController Unsupported MovementChangeType");
ASSERT(false && "MovementPacketSender::GetMoveTypeByChangeType Unsupported MovementChangeType");
}
}

Expand All @@ -120,7 +120,7 @@ void MovementPacketSender::SendSpeedChangeToObservers(Unit* unit, UnitMoveType m
Player* mover = unit->GetPlayerMovingMe();
if (!mover)
{
sLog.Out(LOG_BASIC, LOG_LVL_ERROR, "MovementPacketSender::SendSpeedChangeToObservers: Incorrect use of the function. It was called on a unit controlled by the server!");
sLog.Out(LOG_BASIC, LOG_LVL_ERROR, "MovementPacketSender::SendSpeedChangeToObservers: Incorrect use of the function. It was called on a unit controlled by the server! %s", unit->GetGuidStr().c_str());
return;
}

Expand Down Expand Up @@ -171,7 +171,7 @@ void MovementPacketSender::SendTeleportToController(Unit* unit, float x, float y
Player* mover = unit->GetPlayerMovingMe();
if (!mover)
{
sLog.Out(LOG_BASIC, LOG_LVL_ERROR, "MovementPacketSender::SendTeleportToController: Incorrect use of the function. It was called on a unit controlled by the server!");
sLog.Out(LOG_BASIC, LOG_LVL_ERROR, "MovementPacketSender::SendTeleportToController: Incorrect use of the function. It was called on a unit controlled by the server! %s", unit->GetGuidStr().c_str());
return;
}

Expand Down Expand Up @@ -226,7 +226,7 @@ void MovementPacketSender::SendKnockBackToController(Unit* unit, float vcos, flo
Player* mover = unit->GetPlayerMovingMe();
if (!mover)
{
sLog.Out(LOG_BASIC, LOG_LVL_ERROR, "MovementPacketSender::SendKnockBackToController: Incorrect use of the function. It was called on a unit controlled by the server!");
sLog.Out(LOG_BASIC, LOG_LVL_ERROR, "MovementPacketSender::SendKnockBackToController: Incorrect use of the function. It was called on a unit controlled by the server! %s", unit->GetGuidStr().c_str());
return;
}

Expand Down Expand Up @@ -266,7 +266,7 @@ void MovementPacketSender::SendKnockBackToObservers(Unit* unit, float vcos, floa
Player* mover = unit->GetPlayerMovingMe();
if (!mover)
{
sLog.Out(LOG_BASIC, LOG_LVL_ERROR, "MovementPacketSender::SendSpeedChangeToObservers: Incorrect use of the function. It was called on a unit controlled by the server!");
sLog.Out(LOG_BASIC, LOG_LVL_ERROR, "MovementPacketSender::SendKnockBackToObservers: Incorrect use of the function. It was called on a unit controlled by the server! %s", unit->GetGuidStr().c_str());
return;
}

Expand All @@ -291,7 +291,7 @@ void MovementPacketSender::AddMovementFlagChangeToController(Unit* unit, Movemen
Player* mover = unit->GetPlayerMovingMe();
if (!mover)
{
sLog.Out(LOG_BASIC, LOG_LVL_ERROR, "MovementPacketSender::AddMovementFlagChangeToController: Incorrect use of the function. It was called on a unit controlled by the server!");
sLog.Out(LOG_BASIC, LOG_LVL_ERROR, "MovementPacketSender::AddMovementFlagChangeToController: Incorrect use of the function. It was called on a unit controlled by the server! %s", unit->GetGuidStr().c_str());
return;
}

Expand All @@ -303,7 +303,7 @@ void MovementPacketSender::AddMovementFlagChangeToController(Unit* unit, Movemen
case MOVEFLAG_HOVER: movementChangeType = SET_HOVER; break;
case MOVEFLAG_SAFE_FALL: movementChangeType = FEATHER_FALL; break;
default:
sLog.Out(LOG_BASIC, LOG_LVL_ERROR, "MovementPacketSender::AddMovementFlagChangeToController: Unsupported MovementFlag (%d), data not sent to client.", mFlag);
sLog.Out(LOG_BASIC, LOG_LVL_ERROR, "MovementPacketSender::AddMovementFlagChangeToController: Unsupported MovementFlag (%d), data not sent to client. %s", mFlag, unit->GetGuidStr().c_str());
return;
}

Expand All @@ -328,7 +328,7 @@ void MovementPacketSender::SendMovementFlagChangeToController(Unit* unit, Player
case SET_HOVER: opcode = pendingChange.apply ? SMSG_MOVE_SET_HOVER : SMSG_MOVE_UNSET_HOVER; break;
case FEATHER_FALL: opcode = pendingChange.apply ? SMSG_MOVE_FEATHER_FALL : SMSG_MOVE_NORMAL_FALL; break;
default:
sLog.Out(LOG_BASIC, LOG_LVL_ERROR, "MovementPacketSender::SendMovementFlagChangeToController: Unsupported movement change (%u), data not sent to client.", pendingChange.movementChangeType);
sLog.Out(LOG_BASIC, LOG_LVL_ERROR, "MovementPacketSender::SendMovementFlagChangeToController: Unsupported movement change (%u), data not sent to client. %s", pendingChange.movementChangeType, unit->GetGuidStr().c_str());
return;
}

Expand All @@ -353,7 +353,7 @@ void MovementPacketSender::SendMovementFlagChangeToObservers(Unit* unit, Movemen
Player* mover = unit->GetPlayerMovingMe();
if (!mover)
{
sLog.Out(LOG_BASIC, LOG_LVL_ERROR, "MovementPacketSender::AddMovementFlagChangeToController: Incorrect use of the function. It was called on a unit controlled by the server!");
sLog.Out(LOG_BASIC, LOG_LVL_ERROR, "MovementPacketSender::SendMovementFlagChangeToObservers: Incorrect use of the function. It was called on a unit controlled by the server! %s", unit->GetGuidStr().c_str());
return;
}

Expand All @@ -365,7 +365,7 @@ void MovementPacketSender::SendMovementFlagChangeToObservers(Unit* unit, Movemen
case MOVEFLAG_HOVER: opcode = MSG_MOVE_HOVER; break;
case MOVEFLAG_SAFE_FALL: opcode = MSG_MOVE_FEATHER_FALL; break;
default:
sLog.Out(LOG_BASIC, LOG_LVL_ERROR, "MovementPacketSender::SendMovementFlagChangeToObservers: Unsupported MovementFlag (%d), data not sent to client.", mFlag);
sLog.Out(LOG_BASIC, LOG_LVL_ERROR, "MovementPacketSender::SendMovementFlagChangeToObservers: Unsupported MovementFlag (%d), data not sent to client. %s", mFlag, unit->GetGuidStr().c_str());
return;
}

Expand Down Expand Up @@ -415,7 +415,7 @@ void MovementPacketSender::SendMovementFlagChangeToAll(Unit* unit, MovementFlags
case MOVEFLAG_HOVER: opcode = apply ? MSG_MOVE_HOVER : MSG_MOVE_HOVER; break;
#endif
default:
sLog.Out(LOG_BASIC, LOG_LVL_ERROR, "MovementPacketSender::SendMovementFlagChangeToAll: Unsupported MovementFlag (%d), data not sent to client.", mFlag);
sLog.Out(LOG_BASIC, LOG_LVL_ERROR, "MovementPacketSender::SendMovementFlagChangeToAll: Unsupported MovementFlag (%d), data not sent to client. %s", mFlag, unit->GetGuidStr().c_str());
return;
}

Expand Down

0 comments on commit 6ee7044

Please sign in to comment.