Fix
This commit is contained in:
1 parent
20c9981578
commit
89cc056a50
8 files changed
+14
-14
No files matched your search
@@ -25058,7 +25058,7 @@ void Player::HandleFall(MovementInfo const& movementInfo)
|
||||
if (damageperc > 0)
|
||||
{
|
||||
uint32 damage = (uint32)(damageperc * GetMaxHealth()*sWorld->getRate(RATE_DAMAGE_FALL));
|
||||
|
||||
|
||||
if (GetCommandStatus(CHEAT_GOD))
|
||||
damage = 0;
|
||||
|
||||
|
||||
@@ -5236,7 +5236,7 @@ void ObjectMgr::LoadGossipText()
|
||||
gText.Options[i].Text_0 = fields[cic++].GetString();
|
||||
gText.Options[i].Text_1 = fields[cic++].GetString();
|
||||
|
||||
gText.Options[i].BroadcastTextID = fields[cic++].GetUInt32(); // Need for correct loading order
|
||||
gText.Options[i].BroadcastTextID = fields[cic++].GetUInt32(); // Need for correct loading order
|
||||
|
||||
gText.Options[i].Language = fields[cic++].GetUInt8();
|
||||
gText.Options[i].Probability = fields[cic++].GetFloat();
|
||||
|
||||
@@ -31,7 +31,7 @@ struct GossipTextOption
|
||||
{
|
||||
std::string Text_0;
|
||||
std::string Text_1;
|
||||
uint32 BroadcastTextID;
|
||||
uint32 BroadcastTextID;
|
||||
uint32 Language;
|
||||
float Probability;
|
||||
QEmote Emotes[MAX_GOSSIP_TEXT_EMOTES];
|
||||
|
||||
@@ -388,7 +388,7 @@ class ItemScript : public ScriptObject
|
||||
|
||||
// Called when the item expires (is destroyed).
|
||||
virtual bool OnExpire(Player* /*player*/, ItemTemplate const* /*proto*/) { return false; }
|
||||
|
||||
|
||||
// Called when the item is destroyed.
|
||||
virtual bool OnRemove(Player* /*player*/, Item* /*item*/) { return false; }
|
||||
};
|
||||
|
||||
@@ -784,8 +784,8 @@ bool SpellMgr::IsSpellProcEventCanTriggeredBy(SpellProcEventEntry const* spellPr
|
||||
|
||||
bool hasFamilyMask = false;
|
||||
|
||||
/**
|
||||
|
||||
/**
|
||||
|
||||
* @brief Check auras procced by periodics
|
||||
|
||||
*Only damaging Dots can proc auras with PROC_FLAG_TAKEN_DAMAGE
|
||||
@@ -799,12 +799,12 @@ bool SpellMgr::IsSpellProcEventCanTriggeredBy(SpellProcEventEntry const* spellPr
|
||||
*Only Dots can proc auras with PROC_FLAG_TAKEN_SPELL_MAGIC_DMG_CLASS_NEG or PROC_FLAG_TAKEN_SPELL_NONE_DMG_CLASS_NEG
|
||||
|
||||
*Only Hots can proc auras with PROC_FLAG_TAKEN_SPELL_MAGIC_DMG_CLASS_POS or PROC_FLAG_TAKEN_SPELL_NONE_DMG_CLASS_POS
|
||||
|
||||
|
||||
* @param procSpell the spell proccing the aura
|
||||
* @param procFlags proc_flags of spellProc
|
||||
* @param procExtra proc_EX of procSpell
|
||||
* @param EventProcFlag proc_flags of aura to be procced
|
||||
|
||||
|
||||
|
||||
*/
|
||||
|
||||
|
||||
@@ -691,7 +691,7 @@ class SpellMgr
|
||||
// SpellInfo object management
|
||||
SpellInfo const* GetSpellInfo(uint32 spellId) const { return spellId < GetSpellInfoStoreSize() ? mSpellInfoMap[spellId] : NULL; }
|
||||
// Use this only with 100% valid spellIds
|
||||
SpellInfo const* EnsureSpellInfo(uint32 spellId) const
|
||||
SpellInfo const* EnsureSpellInfo(uint32 spellId) const
|
||||
{
|
||||
ASSERT(spellId < GetSpellInfoStoreSize());
|
||||
SpellInfo const* spellInfo = mSpellInfoMap[spellId];
|
||||
|
||||
@@ -286,8 +286,8 @@ class npc_prince_taldaram_flame_sphere : public CreatureScript
|
||||
|
||||
struct npc_prince_taldaram_flame_sphereAI : public ScriptedAI
|
||||
{
|
||||
npc_prince_taldaram_flame_sphereAI(Creature* creature) : ScriptedAI(creature)
|
||||
{
|
||||
npc_prince_taldaram_flame_sphereAI(Creature* creature) : ScriptedAI(creature)
|
||||
{
|
||||
_flameSphereTargetGUID = 0;
|
||||
}
|
||||
|
||||
|
||||
+3
-3
@@ -438,7 +438,7 @@ class npc_watcher_gashra : public CreatureScript
|
||||
_events.ScheduleEvent(EVENT_WEB_WRAP_GASHRA, 11000);
|
||||
_events.ScheduleEvent(EVENT_INFECTED_BITE_GASHRA, 4000);
|
||||
}
|
||||
|
||||
|
||||
void JustDied(Unit* /*killer*/) OVERRIDE
|
||||
{
|
||||
Creature* krikthir = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_KRIKTHIR_THE_GATEWATCHER));
|
||||
@@ -511,7 +511,7 @@ class npc_watcher_narjil : public CreatureScript
|
||||
_events.ScheduleEvent(EVENT_INFECTED_BITE_NARJIL, 4000);
|
||||
_events.ScheduleEvent(EVENT_BINDING_WEBS, 17000);
|
||||
}
|
||||
|
||||
|
||||
void JustDied(Unit* /*killer*/) OVERRIDE
|
||||
{
|
||||
Creature* krikthir = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_KRIKTHIR_THE_GATEWATCHER));
|
||||
@@ -600,7 +600,7 @@ class npc_watcher_silthik : public CreatureScript
|
||||
{
|
||||
if (!UpdateVictim())
|
||||
return;
|
||||
|
||||
|
||||
_events.Update(diff);
|
||||
|
||||
if (me->HasUnitState(UNIT_STATE_CASTING))
|
||||
|
||||
Reference in new issue
Block a user