Core/Misc: Finish cleanup of incorrectly merged Raise Ally fix (Branch 3.3.5 only)
This commit is contained in:
1 parent
c5d909693b
commit
6fe7da9cd7
7 files changed
+8
-16
No files matched your search
@@ -7977,7 +7977,7 @@ void Unit::SetMinion(Minion *minion, bool apply)
|
||||
minion->SetSpeed(UnitMoveType(i), m_speed_rate[i], true);
|
||||
|
||||
// Ghoul pets have energy instead of mana (is anywhere better place for this code?)
|
||||
if (minion->IsPetGhoul() || minion->IsRisenAlly())
|
||||
if (minion->IsPetGhoul())
|
||||
minion->setPowerType(POWER_ENERGY);
|
||||
|
||||
// Send infinity cooldown - client does that automatically but after relog cooldown needs to be set again
|
||||
@@ -12011,9 +12011,6 @@ void Unit::RemoveFromWorld()
|
||||
|
||||
RemoveAreaAurasDueToLeaveWorld();
|
||||
|
||||
if (IsCharmed())
|
||||
RemoveCharmedBy(nullptr);
|
||||
|
||||
if (GetCharmerGUID())
|
||||
{
|
||||
TC_LOG_FATAL("entities.unit", "Unit %u has charmer guid when removed from world", GetEntry());
|
||||
|
||||
Reference in new issue
Block a user