*stop combat on battleground end, so creatures won't kill players
*added enum from BGCreatures --HG-- branch : trunk
This commit is contained in:
@@ -734,6 +734,11 @@ void BattleGround::EndBattleGround(uint32 winner)
|
|||||||
{
|
{
|
||||||
plr->ResurrectPlayer(1.0f);
|
plr->ResurrectPlayer(1.0f);
|
||||||
plr->SpawnCorpseBones();
|
plr->SpawnCorpseBones();
|
||||||
|
}else
|
||||||
|
{
|
||||||
|
//needed cause else in av some creatures will kill the players at the end
|
||||||
|
plr->CombatStop();
|
||||||
|
plr->getHostilRefManager().deleteReferences();
|
||||||
}
|
}
|
||||||
|
|
||||||
//this line is obsolete - team is set ALWAYS
|
//this line is obsolete - team is set ALWAYS
|
||||||
@@ -1642,9 +1647,9 @@ bool BattleGround::AddSpiritGuide(uint32 type, float x, float y, float z, float
|
|||||||
uint32 entry = 0;
|
uint32 entry = 0;
|
||||||
|
|
||||||
if (team == ALLIANCE)
|
if (team == ALLIANCE)
|
||||||
entry = 13116;
|
entry = BG_CREATURE_ENTRY_A_SPIRITGUIDE;
|
||||||
else
|
else
|
||||||
entry = 13117;
|
entry = BG_CREATURE_ENTRY_H_SPIRITGUIDE;
|
||||||
|
|
||||||
Creature* pCreature = AddCreature(entry,type,team,x,y,z,o);
|
Creature* pCreature = AddCreature(entry,type,team,x,y,z,o);
|
||||||
if (!pCreature)
|
if (!pCreature)
|
||||||
|
|||||||
@@ -71,6 +71,12 @@ enum BattleGroundMarksCount
|
|||||||
ITEM_LOSER_COUNT = 1
|
ITEM_LOSER_COUNT = 1
|
||||||
};
|
};
|
||||||
|
|
||||||
|
enum BattleGroundCreatures
|
||||||
|
{
|
||||||
|
BG_CREATURE_ENTRY_A_SPIRITGUIDE = 13116, // alliance
|
||||||
|
BG_CREATURE_ENTRY_H_SPIRITGUIDE = 13117, // horde
|
||||||
|
};
|
||||||
|
|
||||||
enum BattleGroundSpells
|
enum BattleGroundSpells
|
||||||
{
|
{
|
||||||
SPELL_WAITING_FOR_RESURRECT = 2584, // Waiting to Resurrect
|
SPELL_WAITING_FOR_RESURRECT = 2584, // Waiting to Resurrect
|
||||||
|
|||||||
Reference in New Issue
Block a user