From 4a58341e6db4ffb26356cfd7af90385de94128ff Mon Sep 17 00:00:00 2001 From: Vincent-Michael Date: Sun, 24 Aug 2014 18:08:29 +0200 Subject: Core: Fix warnings --- src/server/game/Conditions/ConditionMgr.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/server') diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp index 948dc9b7cb3..03051451193 100644 --- a/src/server/game/Conditions/ConditionMgr.cpp +++ b/src/server/game/Conditions/ConditionMgr.cpp @@ -227,6 +227,8 @@ bool Condition::Meets(ConditionSourceInfo& sourceInfo) case TYPEID_GAMEOBJECT: condMeets &= object->ToGameObject()->GetDBTableGUIDLow() == ConditionValue3; break; + default: + break; } } } -- cgit v1.2.3 From 7fa49c8d62f9284c2a31f939612771ea980246de Mon Sep 17 00:00:00 2001 From: jackpoz Date: Sun, 24 Aug 2014 20:35:44 +0200 Subject: Scripts/Ruby Sanctum: Fix Halion event ai not being updated Fix Halion event ai not being updated due to private member hiding base class member. Fixes #12835 --- .../scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp | 3 --- 1 file changed, 3 deletions(-) (limited to 'src/server') diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp index 43c295d5f64..d08c6f66903 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp @@ -578,9 +578,6 @@ class boss_twilight_halion : public CreatureScript break; } } - - private: - EventMap events; }; CreatureAI* GetAI(Creature* creature) const override -- cgit v1.2.3 From 72b9b50bc76badf3a473d6995abc08c2d512081f Mon Sep 17 00:00:00 2001 From: Vincent-Michael Date: Sun, 24 Aug 2014 22:08:48 +0200 Subject: Core/Unit: Fix some phasing change problems with vehicle --- src/server/game/Entities/Unit/Unit.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/server') diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index aed06441dd7..d75e7db11fe 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -16328,8 +16328,6 @@ void Unit::SetPhaseMask(uint32 newPhaseMask, bool update) if (IsInWorld()) { - RemoveNotOwnSingleTargetAuras(newPhaseMask); // we can lost access to caster or target - // modify hostile references for new phasemask, some special cases deal with hostile references themselves if (GetTypeId() == TYPEID_UNIT || (!ToPlayer()->IsGameMaster() && !ToPlayer()->GetSession()->PlayerLogout())) { @@ -16377,6 +16375,8 @@ void Unit::SetPhaseMask(uint32 newPhaseMask, bool update) if (m_SummonSlot[i]) if (Creature* summon = GetMap()->GetCreature(m_SummonSlot[i])) summon->SetPhaseMask(newPhaseMask, true); + + RemoveNotOwnSingleTargetAuras(newPhaseMask); // we can lost access to caster or target } // Update visibility after phasing pets and summons so they wont despawn -- cgit v1.2.3