Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Conflicts:
	sql/base/dev/world_database.sql
	src/server/game/Entities/Player/Player.h
This commit is contained in:
Vincent-Michael committed 2014-09-22 06:41:14 +02:00
commit 15520e38d0
72 files changed
+1453 -1775

No files matched your search

+11 -1
View File
@@ -6571,7 +6571,7 @@ bool Unit::HandleAuraProc(Unit* victim, uint32 /*damage*/, Aura* triggeredByAura
player->GetBaseRune(i) != RUNE_BLOOD)
continue;
}
if (player->GetRuneCooldown(i) != player->GetRuneBaseCooldown(i))
if (player->GetRuneCooldown(i) != (player->GetRuneBaseCooldown(i) - player->GetLastRuneGraceTimer(i)))
continue;
--runesLeft;
@@ -10167,6 +10167,16 @@ void Unit::ClearInCombat()
m_CombatTimer = 0;
RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IN_COMBAT);
// Reset rune flags after combat
if (GetTypeId() == TYPEID_PLAYER && getClass() == CLASS_DEATH_KNIGHT)
{
for (uint8 i = 0; i < MAX_RUNES; ++i)
{
ToPlayer()->SetRuneTimer(i, 0xFFFFFFFF);
ToPlayer()->SetLastRuneGraceTimer(i, 0);
}
}
// Player's state will be cleared in Player::UpdateContestedPvP
if (Creature* creature = ToCreature())
{