Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Misc fixes/missed stuff

Browse Source
This commit is contained in:
hondacrx
2021-12-27 18:11:38 -05:00
parent 1dbe035242
commit 74133edce1
6 changed files with 20 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Maps/Instances/InstanceScript.cs
+2 -56
View File
@@ -639,34 +639,7 @@ namespace Game.Maps
{
var playerList = instance.GetPlayers();
foreach (var player in playerList)
{
player.RemoveAurasDueToSpell(spell);
if (!includePets)
continue;
for (byte i = 0; i < SharedConst.MaxSummonSlot; ++i)
{
ObjectGuid summonGUID = player.m_SummonSlot[i];
if (!summonGUID.IsEmpty())
{
Creature summon = instance.GetCreature(summonGUID);
if (summon != null)
summon.RemoveAurasDueToSpell(spell);
}
}
if (!includeControlled)
continue;
for (var i = 0; i < player.m_Controlled.Count; ++i)
{
Unit controlled = player.m_Controlled[i];
if (controlled != null)
if (controlled.IsInWorld && controlled.IsCreature())
controlled.RemoveAurasDueToSpell(spell);
}
}
DoRemoveAurasDueToSpellOnPlayer(player, spell, includePets, includeControlled);
}
public void DoRemoveAurasDueToSpellOnPlayer(Player player, uint spell, bool includePets = false, bool includeControlled = false)
@@ -707,34 +680,7 @@ namespace Game.Maps
{
var playerList = instance.GetPlayers();
foreach (var player in playerList)
{
player.CastSpell(player, spell, true);
if (!includePets)
continue;
for (var i = 0; i < SharedConst.MaxSummonSlot; ++i)
{
ObjectGuid summonGUID = player.m_SummonSlot[i];
if (!summonGUID.IsEmpty())
{
Creature summon = instance.GetCreature(summonGUID);
if (summon != null)
summon.CastSpell(player, spell, true);
}
}
if (!includeControlled)
continue;
for (var i = 0; i < player.m_Controlled.Count; ++i)
{
Unit controlled = player.m_Controlled[i];
if (controlled != null)
if (controlled.IsInWorld && controlled.IsCreature())
controlled.CastSpell(player, spell, true);
}
}
DoCastSpellOnPlayer(player, spell, includePets, includeControlled);
}
public void DoCastSpellOnPlayer(Player player, uint spell, bool includePets = false, bool includeControlled = false)