ElderShell/EverWrath
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(Scripts/Spell): don't allow to tame an already owned creature (#9005)

Browse source
This commit is contained in:
Kitzunu 2021-11-13 01:00:30 +01:00 • committed by GitHub
parent 87a6d224ec
commit 743636c416
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/server/game/Entities/Unit/Unit.h
View file

@ -1891,7 +1891,7 @@ public:
DeathState getDeathState() { return m_deathState; };
virtual void setDeathState(DeathState s, bool despawn = false); // overwrited in Creature/Player/Pet
[[nodiscard]] ObjectGuid GetOwnerGUID() const { return GetGuidValue(UNIT_FIELD_SUMMONEDBY); }
[[nodiscard]] ObjectGuid GetOwnerGUID() const { return GetGuidValue(UNIT_FIELD_SUMMONEDBY); }
void SetOwnerGUID(ObjectGuid owner);
[[nodiscard]] ObjectGuid GetCreatorGUID() const { return GetGuidValue(UNIT_FIELD_CREATEDBY); }
void SetCreatorGUID(ObjectGuid creator) { SetGuidValue(UNIT_FIELD_CREATEDBY, creator); }

6
src/server/scripts/Spells/spell_hunter.cpp
View file

@ -946,6 +946,12 @@ class spell_hun_tame_beast : public SpellScript
player->SendTameFailure(PET_TAME_ANOTHER_SUMMON_ACTIVE);
return SPELL_FAILED_DONT_REPORT;
}
if (target->GetOwnerGUID())
{
player->SendTameFailure(PET_TAME_CREATURE_ALREADY_OWNED);
return SPELL_FAILED_DONT_REPORT;
}
}
else
{