mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-13 13:37:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[11569] Remove recently added area switch time duel check.

Browse source 
Only duel start expected to be limited by area.
Duel end controlled only distance/map and outOfBound timer
This commit is contained in:
VladimirMangos 2011-05-30 12:00:18 +04:00
parent 5ec1203c4f
commit e17f7bf4d5
3 changed files with 1 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/game/Player.cpp
View file

@ -6791,9 +6791,6 @@ void Player::UpdateArea(uint32 newArea)
if (area) if (area)
{ {
// check leave duel allowed area
CheckDuelArea(area);
// Dalaran restricted flight zone // Dalaran restricted flight zone
if ((area->flags & AREA_FLAG_CANNOT_FLY) && IsFreeFlying() && !isGameMaster() && !HasAura(58600)) if ((area->flags & AREA_FLAG_CANNOT_FLY) && IsFreeFlying() && !isGameMaster() && !HasAura(58600))
CastSpell(this, 58600, true); // Restricted Flight Area CastSpell(this, 58600, true); // Restricted Flight Area
@ -6900,15 +6897,6 @@ void Player::UpdateZone(uint32 newZone, uint32 newArea)
UpdateZoneDependentPets(); UpdateZoneDependentPets();
} }
void Player::CheckDuelArea(AreaTableEntry const* areaEntry)
{
if (!duel)
return;
if (!(areaEntry->flags & AREA_FLAG_DUEL))
DuelComplete(DUEL_FLED);
}
//If players are too far way of duel flag... then player loose the duel //If players are too far way of duel flag... then player loose the duel
void Player::CheckDuelDistance(time_t currTime) void Player::CheckDuelDistance(time_t currTime)
{ {

1
src/game/Player.h
View file

@ -1719,7 +1719,6 @@ class MANGOS_DLL_SPEC Player : public Unit
DuelInfo *duel; DuelInfo *duel;
bool IsInDuelWith(Player const* player) const { return duel && duel->opponent == player && duel->startTime != 0; } bool IsInDuelWith(Player const* player) const { return duel && duel->opponent == player && duel->startTime != 0; }
void UpdateDuelFlag(time_t currTime); void UpdateDuelFlag(time_t currTime);
void CheckDuelArea(AreaTableEntry const* areaEntry);
void CheckDuelDistance(time_t currTime); void CheckDuelDistance(time_t currTime);
void DuelComplete(DuelCompleteType type); void DuelComplete(DuelCompleteType type);
void SendDuelCountdown(uint32 counter); void SendDuelCountdown(uint32 counter);

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "11568" #define REVISION_NR "11569"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__