josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*Duels - if initiator and opponent are on the same team, or initiator and opponent are not PvP enabled, forcibly stop attacking on DUEL_FLED, otherwise they can continue attacking.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
maximius
2009-10-28 21:44:26 -07:00
parent 12622ee1a2
commit b9fd59683c
1 changed files with 29 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/Player.cpp
+21 -7
View File
@@ -6780,17 +6780,34 @@ void Player::DuelComplete(DuelCompleteType type)
GetSession()->SendPacket(&data); GetSession()->SendPacket(&data);
duel->opponent->GetSession()->SendPacket(&data); duel->opponent->GetSession()->SendPacket(&data);
if(type != DUEL_INTERUPTED) if (type != DUEL_INTERUPTED)
{ {
data.Initialize(SMSG_DUEL_WINNER, (1+20)); // we guess size data.Initialize(SMSG_DUEL_WINNER, (1+20)); // we guess size
data << (uint8)((type==DUEL_WON) ? 0 : 1); // 0 = just won; 1 = fled data << uint8(type == DUEL_WON ? 0 : 1); // 0 = just won; 1 = fled
data << duel->opponent->GetName(); data << duel->opponent->GetName();
data << GetName(); data << GetName();
SendMessageToSet(&data,true); SendMessageToSet(&data,true);
} }
if (type == DUEL_WON) switch (type)
{ {
case DUEL_FLED:
// if initiator and opponent are on the same team
// or initiator and opponent are not PvP enabled, forcibly stop attacking
if (duel->initiator->GetTeam() == duel->opponent->GetTeam())
{
duel->initiator->AttackStop();
duel->opponent->AttackStop();
}
else
{
if (!duel->initiator->IsPvP())
duel->initiator->AttackStop();
if (!duel->opponent->IsPvP())
duel->opponent->AttackStop();
}
break;
case DUEL_WON:
GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_LOSE_DUEL, 1); GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_LOSE_DUEL, 1);
if (duel->opponent) if (duel->opponent)
{ {
@@ -6800,6 +6817,7 @@ void Player::DuelComplete(DuelCompleteType type)
if (getClass() == CLASS_DEATH_KNIGHT && duel->opponent->GetQuestStatus(12733) == QUEST_STATUS_INCOMPLETE) if (getClass() == CLASS_DEATH_KNIGHT && duel->opponent->GetQuestStatus(12733) == QUEST_STATUS_INCOMPLETE)
duel->opponent->CastSpell(duel->opponent, 52994, true); duel->opponent->CastSpell(duel->opponent, 52994, true);
} }
break;
} }
//Remove Duel Flag object //Remove Duel Flag object
@@ -6812,9 +6830,7 @@ void Player::DuelComplete(DuelCompleteType type)
for (AuraMap::iterator i = itsAuras.begin(); i != itsAuras.end(); ) for (AuraMap::iterator i = itsAuras.begin(); i != itsAuras.end(); )
{ {
if (!i->second->IsPositive() && i->second->GetCasterGUID() == GetGUID() && i->second->GetAuraApplyTime() >= duel->startTime) if (!i->second->IsPositive() && i->second->GetCasterGUID() == GetGUID() && i->second->GetAuraApplyTime() >= duel->startTime)
{
duel->opponent->RemoveAura(i); duel->opponent->RemoveAura(i);
}
else else
++i; ++i;
} }
@@ -6823,9 +6839,7 @@ void Player::DuelComplete(DuelCompleteType type)
for (AuraMap::iterator i = myAuras.begin(); i != myAuras.end(); ) for (AuraMap::iterator i = myAuras.begin(); i != myAuras.end(); )
{ {
if (!i->second->IsPositive() && i->second->GetCasterGUID() == duel->opponent->GetGUID() && i->second->GetAuraApplyTime() >= duel->startTime) if (!i->second->IsPositive() && i->second->GetCasterGUID() == duel->opponent->GetGUID() && i->second->GetAuraApplyTime() >= duel->startTime)
{
RemoveAura(i); RemoveAura(i);
}
else else
++i; ++i;
} }