Merge pull request #14491 from doctaweeks/fixes-for-6.x

Fixes for 6.x
This commit is contained in:
Carbenium
2015-04-05 00:16:36 +02:00
59 changed files with 89 additions and 90 deletions
+1 -1
View File
@@ -1957,7 +1957,7 @@ class Unit : public WorldObject
void SetVisible(bool x);
// common function for visibility checks for player/creatures with detection code
bool SetInPhase(uint32 id, bool update, bool apply);
bool SetInPhase(uint32 id, bool update, bool apply) override;
void UpdateObjectVisibility(bool forced = true) override;
SpellImmuneList m_spellImmune[MAX_SPELL_IMMUNITY];