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

Core/Pets: Removed overriding unit class for pets

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/2c702df4e3b25d764a2712577048921008a20671)
This commit is contained in:
Hondacrx
2024-08-04 16:33:41 -04:00
parent cb16de1f15
commit 5b71b59358
3 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/Pet.cs
-1
View File
@@ -220,7 +220,6 @@ namespace Game.Entities
case PetType.Summon:
petlevel = owner.GetLevel();
SetClass(Class.Mage);
ReplaceAllUnitFlags(UnitFlags.PlayerControlled); // this enables popup window (pet dismiss, cancel)
break;
case PetType.Hunter:
Source/Game/Entities/TemporarySummon.cs
+1 -3
View File
@@ -553,7 +553,6 @@ namespace Game.Entities
// Death Knight pets
public bool IsPetGhoul() { return GetEntry() == (uint)PetEntry.Ghoul; } // Ghoul may be guardian or pet
public bool IsPetAbomination() { return GetEntry() == (uint)PetEntry.Abomination; } // Sludge Belcher dk talent
// Shaman pet
public bool IsSpiritWolf() { return GetEntry() == (uint)PetEntry.SpiritWolf; } // Spirit wolf from feral spirits
@@ -684,7 +683,7 @@ namespace Game.Entities
}
// Power
SetPowerType(powerType);
SetPowerType(powerType, true, true);
// Damage
SetBonusDamage(0);
@@ -1240,7 +1239,6 @@ namespace Game.Entities
// Death Knight pets
Ghoul = 26125,
Abomination = 106848,
// Shaman pet
SpiritWolf = 29264
Source/Game/Entities/Unit/Unit.cs
+2 -11
View File
@@ -1760,17 +1760,8 @@ namespace Game.Entities
if (powerDisplay != null)
displayPower = (PowerType)powerDisplay.ActualType;
}
else
{
Pet pet = ToPet();
if (pet != null)
{
if (pet.GetPetType() == PetType.Hunter) // Hunter pets have focus
displayPower = PowerType.Focus;
else if (pet.IsPetGhoul() || pet.IsPetAbomination()) // DK pets have energy
displayPower = PowerType.Energy;
}
}
else if (IsHunterPet())
displayPower = PowerType.Focus;
}
break;
}