Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Player: Clean up duel related code. Fix a check for abusive client behavior, code style.

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/7c062db94b1c2d28329c5f0ddc2fee74a6c07c35)
This commit is contained in:
hondacrx
2021-11-15 19:56:36 -05:00
parent 30af4577f8
commit c48696da32
11 changed files with 103 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Handlers/DuelHandler.cs
+20 -20
View File
@@ -50,57 +50,57 @@ namespace Game
void HandleDuelResponse(DuelResponse duelResponse)
{
if (duelResponse.Accepted && !duelResponse.Forfeited)
HandleDuelAccepted();
HandleDuelAccepted(duelResponse.ArbiterGUID);
else
HandleDuelCancelled();
}
void HandleDuelAccepted()
void HandleDuelAccepted(ObjectGuid arbiterGuid)
{
if (GetPlayer().duel == null) // ignore accept from duel-sender
Player player = GetPlayer();
if (player.duel == null || player == player.duel.Initiator || player.duel.State != DuelState.Challenged)
return;
Player player = GetPlayer();
Player plTarget = player.duel.opponent;
if (player == player.duel.initiator || !plTarget || player == plTarget || player.duel.startTime != 0 || plTarget.duel.startTime != 0)
Player target = player.duel.Opponent;
if (target.m_playerData.DuelArbiter != arbiterGuid)
return;
Log.outDebug(LogFilter.Network, "Player 1 is: {0} ({1})", player.GetGUID().ToString(), player.GetName());
Log.outDebug(LogFilter.Network, "Player 2 is: {0} ({1})", plTarget.GetGUID().ToString(), plTarget.GetName());
Log.outDebug(LogFilter.Network, "Player 2 is: {0} ({1})", target.GetGUID().ToString(), target.GetName());
long now = GameTime.GetGameTime();
player.duel.startTimer = now;
plTarget.duel.startTimer = now;
player.duel.StartTime = now + 3;
target.duel.StartTime = now + 3;
DuelCountdown packet = new(3000);
player.SendPacket(packet);
plTarget.SendPacket(packet);
target.SendPacket(packet);
player.EnablePvpRules();
plTarget.EnablePvpRules();
target.EnablePvpRules();
}
void HandleDuelCancelled()
{
Player player = GetPlayer();
// no duel requested
if (GetPlayer().duel == null)
if (player.duel == null || player.duel.State == DuelState.Completed)
return;
// player surrendered in a duel using /forfeit
if (GetPlayer().duel.startTime != 0)
if (player.duel.State == DuelState.InProgress)
{
GetPlayer().CombatStopWithPets(true);
if (GetPlayer().duel.opponent)
GetPlayer().duel.opponent.CombatStopWithPets(true);
player.CombatStopWithPets(true);
player.duel.Opponent.CombatStopWithPets(true);
GetPlayer().CastSpell(GetPlayer(), 7267, true); // beg
GetPlayer().DuelComplete(DuelCompleteType.Won);
player.CastSpell(GetPlayer(), 7267, true); // beg
player.DuelComplete(DuelCompleteType.Won);
return;
}
GetPlayer().DuelComplete(DuelCompleteType.Interrupted);
player.DuelComplete(DuelCompleteType.Interrupted);
}
}
}