diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-07-15 18:04:04 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-07-15 18:04:04 +0200 |
| commit | 56bd42dcf1ffdf0bf8099a1c87dc7a52ca9663ff (patch) | |
| tree | d951e7af2b120fe1ba58373aa528fb1a5f4b5263 /src/server/scripts/EasternKingdoms | |
| parent | 7104e3c70f9849dfbc481084a8bd3c20d99b3036 (diff) | |
| parent | 779a59e7e218e340ac5cefd3297ea970d804239d (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/World/World.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
Diffstat (limited to 'src/server/scripts/EasternKingdoms')
| -rw-r--r-- | src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp | 12 | ||||
| -rw-r--r-- | src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp | 4 |
2 files changed, 11 insertions, 5 deletions
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp index 383b9307523..b0d5b0508eb 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp @@ -246,23 +246,29 @@ class instance_stratholme : public InstanceMapScript case TYPE_BARONESS: EncounterState[1] = data; if (data == IN_PROGRESS) + { HandleGameObject(ziggurat1GUID, true); - if (data == IN_PROGRESS) //change to DONE when crystals implemented + //change to DONE when crystals implemented StartSlaugtherSquare(); + } break; case TYPE_NERUB: EncounterState[2] = data; if (data == IN_PROGRESS) + { HandleGameObject(ziggurat2GUID, true); - if (data == IN_PROGRESS) //change to DONE when crystals implemented + //change to DONE when crystals implemented StartSlaugtherSquare(); + } break; case TYPE_PALLID: EncounterState[3] = data; if (data == IN_PROGRESS) + { HandleGameObject(ziggurat3GUID, true); - if (data == IN_PROGRESS) //change to DONE when crystals implemented + //change to DONE when crystals implemented StartSlaugtherSquare(); + } break; case TYPE_RAMSTEIN: if (data == IN_PROGRESS) diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp index 820f1e7a615..ddcd4c7d824 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp @@ -556,8 +556,8 @@ public: if (i->GetSource() && i->GetSource()->GetPositionZ() < DEMON_REALM_Z + 5) ++SpectralPlayers; } - uint8 MaxSpectralPlayers = MAX_PLAYERS_IN_SPECTRAL_REALM; - if (player->HasAura(AURA_SPECTRAL_EXHAUSTION) || (MaxSpectralPlayers && SpectralPlayers >= MaxSpectralPlayers)) + + if (player->HasAura(AURA_SPECTRAL_EXHAUSTION) || SpectralPlayers >= MAX_PLAYERS_IN_SPECTRAL_REALM) player->GetSession()->SendNotification(GO_FAILED); else player->CastSpell(player, SPELL_TELEPORT_SPECTRAL, true); |