Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-29 05:11:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '64e34cdec837f9375d6d2ba6b12def8a534e08e7' into 4.3.4

Browse Source 
Conflicts:
	sql/base/dev/world_database.sql
	src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp
This commit is contained in:
Carbenium
2015-07-21 18:51:30 +02:00
parent 1940583e36 64e34cdec8
commit 8d47083319
4 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp
View File

@@ -292,7 +292,6 @@ public:
break;
}
player->CLOSE_GOSSIP_MENU();
ai->SetDespawnAtFar(true);
creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
return true;
}
@@ -574,7 +573,6 @@ public:
break;
case 45:
SetRun(true);
SetDespawnAtFar(false);
gossipStep = 4;
me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
SetHoldState(true);
@@ -901,7 +899,6 @@ public:
instance->SetBossState(DATA_ARTHAS, IN_PROGRESS);
me->SetReactState(REACT_DEFENSIVE);
SetDespawnAtFar(false);
JumpToNextStep(5000);
break;
// Summon wave groups - start the Infinite Corruptor timer