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/Entities/Unit/Unit.cs
+5 -5
View File
@@ -982,7 +982,7 @@ namespace Game.Entities
Player player = ToPlayer();
// If the player is on mounted duel and exits the mount, he should immediatly lose the duel
if (player && player.duel != null && player.duel.isMounted)
if (player && player.duel != null && player.duel.IsMounted)
player.DuelComplete(DuelCompleteType.Fled);
SetControlled(false, UnitState.Root); // SMSG_MOVE_FORCE_UNROOT, ~MOVEMENTFLAG_ROOT
@@ -2422,7 +2422,7 @@ namespace Game.Entities
return 0;
// prevent kill only if killed in duel and killed by opponent or opponent controlled creature
if (victim.ToPlayer().duel.opponent == attacker.GetControllingPlayer())
if (victim.ToPlayer().duel.Opponent == attacker.GetControllingPlayer())
damage = health - 1;
duel_hasEnded = true;
@@ -2430,13 +2430,13 @@ namespace Game.Entities
else if (victim.IsVehicle() && damage >= (health - 1) && victim.GetCharmer() != null && victim.GetCharmer().IsTypeId(TypeId.Player))
{
Player victimRider = victim.GetCharmer().ToPlayer();
if (victimRider != null && victimRider.duel != null && victimRider.duel.isMounted)
if (victimRider != null && victimRider.duel != null && victimRider.duel.IsMounted)
{
if (!attacker)
return 0;
// prevent kill only if killed in duel and killed by opponent or opponent controlled creature
if (victimRider.duel.opponent == attacker.GetControllingPlayer())
if (victimRider.duel.Opponent == attacker.GetControllingPlayer())
damage = health - 1;
duel_wasMounted = true;
@@ -2657,7 +2657,7 @@ namespace Game.Entities
else
he.SetHealth(1);
he.duel.opponent.CombatStopWithPets(true);
he.duel.Opponent.CombatStopWithPets(true);
he.CombatStopWithPets(true);
he.CastSpell(he, 7267, true); // beg