josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tabs to spaces...

Browse Source
This commit is contained in:
Nay
2012-09-07 03:33:16 +01:00
parent 0709d67e08
commit 21d43781ac
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/AI/CoreAI/CombatAI.cpp
+1 -1
View File
@@ -111,7 +111,7 @@ void CombatAI::UpdateAI(const uint32 diff)
DoMeleeAttackIfReady(); DoMeleeAttackIfReady();
} }
void CombatAI::SpellInterrupted(uint32 spellId, uint32 unTimeMs) void CombatAI::SpellInterrupted(uint32 spellId, uint32 unTimeMs)
{ {
events.RescheduleEvent(spellId, unTimeMs); events.RescheduleEvent(spellId, unTimeMs);
} }
src/server/game/Entities/Creature/Creature.cpp
+2 -2
View File
@@ -2231,7 +2231,7 @@ bool Creature::HasSpellCooldown(uint32 spell_id) const
return (itr != m_CreatureSpellCooldowns.end() && itr->second > time(NULL)) || HasCategoryCooldown(spell_id); return (itr != m_CreatureSpellCooldowns.end() && itr->second > time(NULL)) || HasCategoryCooldown(spell_id);
} }
void Creature::ProhibitSpellSchool(SpellSchoolMask idSchoolMask, uint32 unTimeMs) void Creature::ProhibitSpellSchool(SpellSchoolMask idSchoolMask, uint32 unTimeMs)
{ {
time_t curTime = time(NULL); time_t curTime = time(NULL);
for (uint8 i = 0; i < CREATURE_MAX_SPELLS; ++i) for (uint8 i = 0; i < CREATURE_MAX_SPELLS; ++i)
@@ -2257,7 +2257,7 @@ void Creature::ProhibitSpellSchool(SpellSchoolMask idSchoolMask, uint32 unTimeMs
if ((idSchoolMask & spellInfo->GetSchoolMask()) && GetCreatureSpellCooldownDelay(unSpellId) < unTimeMs) if ((idSchoolMask & spellInfo->GetSchoolMask()) && GetCreatureSpellCooldownDelay(unSpellId) < unTimeMs)
{ {
_AddCreatureSpellCooldown(unSpellId, curTime + unTimeMs/IN_MILLISECONDS); _AddCreatureSpellCooldown(unSpellId, curTime + unTimeMs/IN_MILLISECONDS);
if (UnitAI* ai = GetAI()) if (UnitAI* ai = GetAI())
ai->SpellInterrupted(unSpellId, unTimeMs); ai->SpellInterrupted(unSpellId, unTimeMs);
} }
} }
src/server/game/Entities/Pet/Pet.cpp
+1 -1
View File
@@ -2034,7 +2034,7 @@ void Pet::SynchronizeLevelWithOwner()
} }
} }
void Pet::ProhibitSpellSchool(SpellSchoolMask idSchoolMask, uint32 unTimeMs) void Pet::ProhibitSpellSchool(SpellSchoolMask idSchoolMask, uint32 unTimeMs)
{ {
WorldPacket data(SMSG_SPELL_COOLDOWN, 8+1+m_spells.size()*8); WorldPacket data(SMSG_SPELL_COOLDOWN, 8+1+m_spells.size()*8);
data << uint64(GetGUID()); data << uint64(GetGUID());
src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp
+2 -2
View File
@@ -350,10 +350,10 @@ class instance_blood_furnace : public InstanceMapScript
++PrisonerCounter8; ++PrisonerCounter8;
} }
else else
return; return;
} }
else else
return; return;
ResetPrisoner(creature); ResetPrisoner(creature);
} }