Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-02-14 22:19:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into 4.3.4

Browse Source
This commit is contained in:
Nay
2012-09-04 01:04:31 +01:00
parent 25cc49b489 b2bcc52fda
commit fa29f1bb27
6 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/updates/world/2012_09_03_01_world_gameobject_template.sql Normal file
View File

@@ -0,0 +1 @@
UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=186371; -- Zeppelin

2
sql/updates/world/2012_09_03_02_world_quest_template.sql Normal file
View File

@@ -0,0 +1,2 @@
-- Stalk the Stalker (9719) quest requirements fix
UPDATE `quest_template` SET `RequiredRaces` = 0 WHERE `Id` = 9719;

7
src/server/game/Battlefield/Battlefield.cpp
View File

@@ -62,6 +62,13 @@ Battlefield::Battlefield()
Battlefield::~Battlefield()
{
for (BfCapturePointMap::iterator itr = m_capturePoints.begin(); itr != m_capturePoints.end(); ++itr)
delete itr->second;
for (GraveyardVect::const_iterator itr = m_GraveyardList.begin(); itr != m_GraveyardList.end(); ++itr)
delete *itr;
m_capturePoints.clear();
}
// Called when a player enters the zone

3
src/server/game/Battlefield/Zones/BattlefieldWG.cpp
View File

@@ -37,6 +37,9 @@ BattlefieldWG::~BattlefieldWG()
{
for (Workshop::const_iterator itr = WorkshopsList.begin(); itr != WorkshopsList.end(); ++itr)
delete *itr;
for (GameObjectBuilding::const_iterator itr = BuildingsInZone.begin(); itr != BuildingsInZone.end(); ++itr)
delete *itr;
}
bool BattlefieldWG::SetupBattlefield()

12
src/server/game/Spells/Auras/SpellAuras.cpp
View File

@@ -1331,10 +1331,16 @@ void Aura::HandleAuraSpecificMods(AuraApplication const* aurApp, Unit* caster, b
if (caster->GetTypeId() == TYPEID_PLAYER)
{
if (caster->ToPlayer()->HasSpellCooldown(aura->GetId()))
break;
// and add if needed
caster->ToPlayer()->AddSpellCooldown(aura->GetId(), 0, uint32(time(NULL) + 12));
{
// This additional check is needed to add a minimal delay before cooldown in in effect
// to allow all bubbles broken by a single damage source proc mana return
if (caster->ToPlayer()->GetSpellCooldownDelay(aura->GetId()) <= 11)
break;
}
else // and add if needed
caster->ToPlayer()->AddSpellCooldown(aura->GetId(), 0, uint32(time(NULL) + 12));
}
// effect on caster
if (AuraEffect const* aurEff = aura->GetEffect(0))
{

2
src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp
View File

@@ -133,7 +133,7 @@ class instance_blood_furnace : public InstanceMapScript
}
}
void OnCreatureDeath(Creature* unit)
void OnUnitDeath(Unit* unit)
{
if (unit && unit->GetTypeId() == TYPEID_UNIT && unit->GetEntry() == 17398)
PrisonerDied(unit->GetGUID());