aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSnapperRy <snapperryen@gmail.com>2016-10-01 14:15:39 +0200
committerjoschiwald <joschiwald.trinity@gmail.com>2017-03-04 19:01:47 +0100
commitdfee7f7301e29c5d423ed0f25aec3a7f3facf536 (patch)
tree8eec5970f1be767b4ab64043ad474ba48623ae0b
parent5d3a5b2375ea0806b49bc45569d4ea6794063f9b (diff)
Core/Script: make creature Webbed Creature spawn creature Expedition Researcher when appropriate.
Also don't allow it to spawn a copy of itself. (cherry picked from commit d59f111cabb0bb6e2709026f03657826f8c96ecb)
-rw-r--r--src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp b/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp
index 8285aa87e6c..09770b58d65 100644
--- a/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp
+++ b/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp
@@ -41,7 +41,7 @@ EndContentData */
######*/
//possible creatures to be spawned
-uint32 const possibleSpawns[32] = {17322, 17661, 17496, 17522, 17340, 17352, 17333, 17524, 17654, 17348, 17339, 17345, 17359, 17353, 17336, 17550, 17330, 17701, 17321, 17680, 17325, 17320, 17683, 17342, 17715, 17334, 17341, 17338, 17337, 17346, 17344, 17327};
+uint32 const possibleSpawns[31] = {17322, 17661, 17496, 17522, 17340, 17352, 17333, 17524, 17654, 17348, 17339, 17345, 17359, 17353, 17336, 17550, 17330, 17701, 17321, 17325, 17320, 17683, 17342, 17715, 17334, 17341, 17338, 17337, 17346, 17344, 17327};
enum WebbedCreature
{
@@ -74,6 +74,7 @@ public:
case 0:
if (Player* player = killer->ToPlayer())
player->KilledMonsterCredit(NPC_EXPEDITION_RESEARCHER);
+ spawnCreatureID = NPC_EXPEDITION_RESEARCHER;
break;
case 1:
case 2:
@@ -81,8 +82,7 @@ public:
break;
}
- if (spawnCreatureID)
- me->SummonCreature(spawnCreatureID, 0.0f, 0.0f, 0.0f, me->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 60000);
+ me->SummonCreature(spawnCreatureID, 0.0f, 0.0f, 0.0f, me->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 60000);
}
};