Merge branch '3.3.5' into 4.3.4
Conflicts: sql/updates/world/2015_07_29_00_world.sql sql/updates/world/2015_07_29_01_world.sql sql/updates/world/2015_08_01_00_world.sql src/server/game/AuctionHouseBot/AuctionHouseBotBuyer.cpp src/server/game/Entities/Player/Player.cpp src/server/game/Entities/Player/Player.h src/server/game/Server/Protocol/Opcodes.cpp src/server/game/Spells/SpellEffects.cpp src/server/game/Spells/SpellMgr.cpp src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp src/server/scripts/EasternKingdoms/zone_hinterlands.cpp src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp src/server/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp src/server/scripts/Spells/spell_hunter.cpp src/server/scripts/Spells/spell_pet.cpp
This commit is contained in:
commit
99ab531e76
14 files changed
+174
-90
No files matched your search
@@ -422,7 +422,7 @@ public:
|
||||
target->ToPlayer()->SendTalentsInfoData(false);
|
||||
return true;
|
||||
}
|
||||
else if (target->ToCreature()->IsPet())
|
||||
else if (target->IsPet())
|
||||
{
|
||||
Unit* owner = target->GetOwner();
|
||||
if (owner && owner->GetTypeId() == TYPEID_PLAYER && ((Pet*)target)->IsPermanentPetFor(owner->ToPlayer()))
|
||||
|
||||
Reference in new issue
Block a user