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

[10214] Small final (as i think ;) ) fixes for restricted flight zone

Browse source 
* Fixed my horriable typo in 58600 effect code. Thanks to zergtmn for pointing to it.
* Remove redundent cast 45472 in 58600 effect code (it casted from 58601 already). Thanks to porteyoplait.
* Prevent restart 58600 debuf timer at temporary leave zone and return to it.
This commit is contained in:
VladimirMangos 2010-07-18 01:05:02 +04:00
parent 73a00a6807
commit 15374bd626
3 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/game/Player.cpp
View file

@ -6643,8 +6643,8 @@ void Player::UpdateArea(uint32 newArea)
if (area) if (area)
{ {
// Dalaran restricted flight zone // Dalaran restricted flight zone
if ((area->flags & AREA_FLAG_CANNOT_FLY) && IsFreeFlying() && !isGameMaster()) if ((area->flags & AREA_FLAG_CANNOT_FLY) && IsFreeFlying() && !isGameMaster() && !HasAura(58600))
CastSpell(this, 58600, true); CastSpell(this, 58600, true); // Restricted Flight Area
// TODO: implement wintergrasp parachute when battle in progress // TODO: implement wintergrasp parachute when battle in progress
/* if ((area->flags & AREA_FLAG_OUTDOOR_PVP) && IsFreeFlying() && <WINTERGRASP_BATTLE_IN_PROGRESS> && !isGameMaster()) /* if ((area->flags & AREA_FLAG_OUTDOOR_PVP) && IsFreeFlying() && <WINTERGRASP_BATTLE_IN_PROGRESS> && !isGameMaster())

7
src/game/SpellAuras.cpp
View file

@ -2172,13 +2172,10 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
AreaTableEntry const* area = GetAreaEntryByAreaID(target->GetAreaId()); AreaTableEntry const* area = GetAreaEntryByAreaID(target->GetAreaId());
// Dalaran restricted flight zone (recheck before apply unmount) // Dalaran restricted flight zone (recheck before apply unmount)
if (area && target->GetTargetGUID() == TYPEID_PLAYER && (area->flags & AREA_FLAG_CANNOT_FLY) && if (area && target->GetTypeId() == TYPEID_PLAYER && (area->flags & AREA_FLAG_CANNOT_FLY) &&
((Player*)target)->IsFreeFlying() && !((Player*)target)->isGameMaster()) ((Player*)target)->IsFreeFlying() && !((Player*)target)->isGameMaster())
{ {
// Remove Flight Auras target->CastSpell(target, 58601, true); // Remove Flight Auras (also triggered Parachute (45472))
target->CastSpell(target, 58601, true);
// Parachute
target->CastSpell(target, 45472, true);
} }
return; return;
} }

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 "10213" #define REVISION_NR "10214"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__