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

Core/Refactor: Part 1

Browse Source
This commit is contained in:
hondacrx
2018-05-07 18:56:09 -04:00
parent b2c1554065
commit 216db1c23a
83 changed files with 298 additions and 296 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/Unit/Unit.Pets.cs
+18 -16
View File
@@ -370,30 +370,32 @@ namespace Game.Entities
// Set charmed
charmer.SetCharm(this, true);
Player player;
if (IsTypeId(TypeId.Unit))
{
ToCreature().GetAI().OnCharmed(true);
GetMotionMaster().MoveIdle();
}
else if (player = ToPlayer())
else
{
if (player.isAFK())
player.ToggleAFK();
Creature creatureCharmer = charmer.ToCreature();
if (charmer.IsTypeId(TypeId.Unit)) // we are charmed by a creature
Player player = ToPlayer();
if (player)
{
// change AI to charmed AI on next Update tick
NeedChangeAI = true;
if (IsAIEnabled)
{
IsAIEnabled = false;
player.GetAI().OnCharmed(true);
}
}
if (player.isAFK())
player.ToggleAFK();
player.SetClientControl(this, false);
if (charmer.IsTypeId(TypeId.Unit)) // we are charmed by a creature
{
// change AI to charmed AI on next Update tick
NeedChangeAI = true;
if (IsAIEnabled)
{
IsAIEnabled = false;
player.GetAI().OnCharmed(true);
}
}
player.SetClientControl(this, false);
}
}
// charm is set by aura, and aura effect remove handler was called during apply handler execution