From 8787c00ca3eda49410cf9ecf2df53c2061628afd Mon Sep 17 00:00:00 2001 From: megamage Date: Thu, 5 Mar 2009 18:48:56 -0600 Subject: *Disable charmed/possessed creature AI. *Use general react states to replace charminfo react states. --HG-- branch : trunk --- src/game/Player.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/game/Player.cpp') diff --git a/src/game/Player.cpp b/src/game/Player.cpp index 4114f4da4ac..971089a11aa 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -16365,7 +16365,7 @@ void Player::PetSpellInitialize() CharmInfo *charmInfo = pet->GetCharmInfo(); //16 - data << (uint64)pet->GetGUID() << uint32(0x00000000) << uint8(charmInfo->GetReactState()) << uint8(charmInfo->GetCommandState()) << uint16(0); + data << (uint64)pet->GetGUID() << uint32(0x00000000) << uint8(pet->GetReactState()) << uint8(charmInfo->GetCommandState()) << uint16(0); for(uint32 i = 0; i < 10; i++) //40 { @@ -16474,7 +16474,7 @@ void Player::CharmSpellInitialize() data << (uint64)charm->GetGUID() << uint32(0x00000000); if(charm->GetTypeId() != TYPEID_PLAYER) - data << uint8(charmInfo->GetReactState()) << uint8(charmInfo->GetCommandState()); + data << uint8(((Creature*)charm)->GetReactState()) << uint8(charmInfo->GetCommandState()); else data << uint8(0) << uint8(0); -- cgit v1.2.3