Misc updates/fixes

This commit is contained in:
hondacrx
2022-01-27 12:36:56 -05:00
parent 169abc1531
commit 6c0e21b4de
36 changed files with 415 additions and 354 deletions
+8 -7
View File
@@ -686,6 +686,7 @@ namespace Game
if (PlayerLoading() || GetPlayer() != null)
{
Log.outError(LogFilter.Network, "Player tries to login again, AccountId = {0}", GetAccountId());
KickPlayer("WorldSession::HandlePlayerLoginOpcode Another client logging in");
return;
}
@@ -695,7 +696,7 @@ namespace Game
if (!_legitCharacters.Contains(playerLogin.Guid))
{
Log.outError(LogFilter.Network, "Account ({0}) can't login with that character ({1}).", GetAccountId(), playerLogin.Guid.ToString());
KickPlayer();
KickPlayer("WorldSession::HandlePlayerLoginOpcode Trying to login with a character of another account");
return;
}
@@ -706,7 +707,7 @@ namespace Game
{
if (!PlayerLoading() || GetPlayer())
{
KickPlayer();
KickPlayer("WorldSession::HandleContinuePlayerLogin incorrect player state when logging in");
return;
}
@@ -726,7 +727,7 @@ namespace Game
if (!pCurrChar.LoadFromDB(playerGuid, holder))
{
SetPlayer(null);
KickPlayer();
KickPlayer("WorldSession::HandlePlayerLogin Player::LoadFromDB failed");
m_playerLoading.Clear();
return;
}
@@ -1061,7 +1062,7 @@ namespace Game
{
if (!PlayerLoading() || GetPlayer())
{
KickPlayer();
KickPlayer("WorldSession::AbortLogin incorrect player state when logging in");
return;
}
@@ -1220,7 +1221,7 @@ namespace Game
{
Log.outError(LogFilter.Network, "Account {0}, IP: {1} tried to rename character {2}, but it does not belong to their account!",
GetAccountId(), GetRemoteAddress(), request.RenameInfo.Guid.ToString());
KickPlayer();
KickPlayer("WorldSession::HandleCharRenameOpcode rename character from a different account");
return;
}
@@ -1402,7 +1403,7 @@ namespace Game
{
Log.outError(LogFilter.Network, "Account {0}, IP: {1} tried to customise {2}, but it does not belong to their account!",
GetAccountId(), GetRemoteAddress(), packet.CustomizeInfo.CharGUID.ToString());
KickPlayer();
KickPlayer("WorldSession::HandleCharCustomize Trying to customise character of another account");
return;
}
@@ -1673,7 +1674,7 @@ namespace Game
{
Log.outError(LogFilter.Network, "Account {0}, IP: {1} tried to factionchange character {2}, but it does not belong to their account!",
GetAccountId(), GetRemoteAddress(), packet.RaceOrFactionChangeInfo.Guid.ToString());
KickPlayer();
KickPlayer("WorldSession::HandleCharFactionOrRaceChange Trying to change faction of character of another account");
return;
}
+3
View File
@@ -73,6 +73,9 @@ namespace Game
if (string.IsNullOrEmpty(packet.Info.Target))
return;
if (!ValidateHyperlinksAndMaybeKick(packet.Info.Subject) || !ValidateHyperlinksAndMaybeKick(packet.Info.Body))
return;
Player player = GetPlayer();
if (player.GetLevel() < WorldConfig.GetIntValue(WorldCfg.MailLevelReq))
{
+2 -2
View File
@@ -541,7 +541,7 @@ namespace Game
{
Log.outDebug(LogFilter.Server, "Player {0} from account id {1} kicked for incorrect speed (must be {2} instead {3})",
GetPlayer().GetName(), GetPlayer().GetSession().GetAccountId(), GetPlayer().GetSpeed(move_type), packet.Speed);
GetPlayer().GetSession().KickPlayer();
GetPlayer().GetSession().KickPlayer("WorldSession::HandleForceSpeedChangeAck Incorrect speed");
}
}
}
@@ -675,7 +675,7 @@ namespace Game
if (Math.Abs(expectedModMagnitude - setModMovementForceMagnitudeAck.Speed) > 0.01f)
{
Log.outDebug(LogFilter.Misc, $"Player {_player.GetName()} from account id {_player.GetSession().GetAccountId()} kicked for incorrect movement force magnitude (must be {expectedModMagnitude} instead {setModMovementForceMagnitudeAck.Speed})");
_player.GetSession().KickPlayer();
_player.GetSession().KickPlayer("WorldSession::HandleMoveSetModMovementForceMagnitudeAck Incorrect magnitude");
return;
}
}