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

Core/Pets: Pet management refactoring

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/ca92686b44cc8c53a8991bf02d6e8534797fc115)
This commit is contained in:
hondacrx
2022-03-10 09:39:55 -05:00
parent 9d5dd66215
commit 718302fa18
14 changed files with 549 additions and 378 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Scripts/Spells/Hunter.cs
+15 -5
View File
@@ -407,8 +407,8 @@ namespace Scripts.Spells.Hunter
{
SpellCastResult CheckCast()
{
Unit caster = GetCaster();
if (!caster.IsTypeId(TypeId.Player))
Player caster = GetCaster().ToPlayer();
if (caster == null)
return SpellCastResult.DontReport;
if (!GetExplTargetUnit())
@@ -421,11 +421,21 @@ namespace Scripts.Spells.Hunter
return SpellCastResult.Highlevel;
// use SMSG_PET_TAME_FAILURE?
if (!target.GetCreatureTemplate().IsTameable(caster.ToPlayer().CanTameExoticPets()))
if (!target.GetCreatureTemplate().IsTameable(caster.CanTameExoticPets()))
return SpellCastResult.BadTargets;
if (!caster.GetPetGUID().IsEmpty())
return SpellCastResult.AlreadyHaveSummon;
PetStable petStable = caster.GetPetStable();
if (petStable != null)
{
if (petStable.CurrentPet != null)
return SpellCastResult.AlreadyHaveSummon;
if (petStable.GetUnslottedHunterPet() != null)
{
caster.SendTameFailure(PetTameResult.TooMany);
return SpellCastResult.DontReport;
}
}
if (!caster.GetCharmedGUID().IsEmpty())
return SpellCastResult.AlreadyHaveCharm;