public/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/liyunfan1223/azerothcore-wotlk.git synced 2026-08-08 15:58:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

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
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; }; DeathState getDeathState() { return m_deathState; };
virtual void setDeathState(DeathState s, bool despawn = false); // overwrited in Creature/Player/Pet 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); void SetOwnerGUID(ObjectGuid owner);
[[nodiscard]] ObjectGuid GetCreatorGUID() const { return GetGuidValue(UNIT_FIELD_CREATEDBY); } [[nodiscard]] ObjectGuid GetCreatorGUID() const { return GetGuidValue(UNIT_FIELD_CREATEDBY); }
void SetCreatorGUID(ObjectGuid creator) { SetGuidValue(UNIT_FIELD_CREATEDBY, creator); } 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); player->SendTameFailure(PET_TAME_ANOTHER_SUMMON_ACTIVE);
return SPELL_FAILED_DONT_REPORT; return SPELL_FAILED_DONT_REPORT;
} }
if (target->GetOwnerGUID())
{
player->SendTameFailure(PET_TAME_CREATURE_ALREADY_OWNED);
return SPELL_FAILED_DONT_REPORT;
}
} }
else else
{ {