mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-15 01:37:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[10562] Cleanup WorldSession::HandlePetAction

Browse source 
Also fixed attack target seelction base at packet content instead direct player selection.
Remove unneded arg for Unit::SendPetAIReaction.
This commit is contained in:
VladimirMangos 2010-09-30 20:37:32 +04:00
parent ab3de84cca
commit 98f36e4652
4 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/game/PetHandler.cpp
View file

@ -31,28 +31,29 @@
void WorldSession::HandlePetAction( WorldPacket & recv_data ) void WorldSession::HandlePetAction( WorldPacket & recv_data )
{ {
uint64 guid1; ObjectGuid petGuid;
uint32 data; uint32 data;
uint64 guid2; ObjectGuid targetGuid;
recv_data >> guid1; //pet guid recv_data >> petGuid;
recv_data >> data; recv_data >> data;
recv_data >> guid2; //tag guid recv_data >> targetGuid;
uint32 spellid = UNIT_ACTION_BUTTON_ACTION(data); uint32 spellid = UNIT_ACTION_BUTTON_ACTION(data);
uint8 flag = UNIT_ACTION_BUTTON_TYPE(data); //delete = 0x07 CastSpell = C1 uint8 flag = UNIT_ACTION_BUTTON_TYPE(data); //delete = 0x07 CastSpell = C1
DETAIL_LOG("HandlePetAction: %s flag is %u, spellid is %u, target %s.", petGuid.GetString().c_str(), uint32(flag), spellid, targetGuid.GetString().c_str());
// used also for charmed creature/player // used also for charmed creature/player
Unit* pet = _player->GetMap()->GetUnit(guid1); Unit* pet = _player->GetMap()->GetUnit(petGuid);
DETAIL_LOG("HandlePetAction.Pet %u flag is %u, spellid is %u, target %u.", uint32(GUID_LOPART(guid1)), uint32(flag), spellid, uint32(GUID_LOPART(guid2)) );
if (!pet) if (!pet)
{ {
sLog.outError( "Pet %u not exist.", uint32(GUID_LOPART(guid1)) ); sLog.outError("HandlePetAction: %s not exist.", petGuid.GetString().c_str());
return; return;
} }
if (pet != GetPlayer()->GetPet() && pet != GetPlayer()->GetCharm()) if (GetPlayer()->GetGUID() != pet->GetCharmerOrOwnerGUID())
{ {
sLog.outError("HandlePetAction.Pet %u isn't pet of player %s.", uint32(GUID_LOPART(guid1)), GetPlayer()->GetName() ); sLog.outError("HandlePetAction: %s isn't controlled by %s.", petGuid.GetString().c_str(), GetPlayer()->GetObjectGuid().GetString().c_str());
return; return;
} }
@ -97,8 +98,7 @@ void WorldSession::HandlePetAction( WorldPacket & recv_data )
break; break;
case COMMAND_ATTACK: //spellid=1792 //ATTACK case COMMAND_ATTACK: //spellid=1792 //ATTACK
{ {
const uint64& selguid = _player->GetSelection(); Unit *TargetUnit = _player->GetMap()->GetUnit(targetGuid);
Unit *TargetUnit = _player->GetMap()->GetUnit(selguid);
if(!TargetUnit) if(!TargetUnit)
return; return;
@ -118,7 +118,7 @@ void WorldSession::HandlePetAction( WorldPacket & recv_data )
if (pet->hasUnitState(UNIT_STAT_CONTROLLED)) if (pet->hasUnitState(UNIT_STAT_CONTROLLED))
{ {
pet->Attack(TargetUnit, true); pet->Attack(TargetUnit, true);
pet->SendPetAIReaction(guid1); pet->SendPetAIReaction();
} }
else else
{ {
@ -133,7 +133,7 @@ void WorldSession::HandlePetAction( WorldPacket & recv_data )
else else
{ {
// 90% chance for pet and 100% chance for charmed creature // 90% chance for pet and 100% chance for charmed creature
pet->SendPetAIReaction(guid1); pet->SendPetAIReaction();
} }
} }
} }
@ -171,12 +171,12 @@ void WorldSession::HandlePetAction( WorldPacket & recv_data )
case ACT_ENABLED: // 0xC1 spell case ACT_ENABLED: // 0xC1 spell
{ {
Unit* unit_target = NULL; Unit* unit_target = NULL;
if(guid2) if (!targetGuid.IsEmpty())
unit_target = _player->GetMap()->GetUnit(guid2); unit_target = _player->GetMap()->GetUnit(targetGuid);
// do not cast unknown spells // do not cast unknown spells
SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellid ); SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellid );
if(!spellInfo) if (!spellInfo)
{ {
sLog.outError("WORLD: unknown PET spell id %i", spellid); sLog.outError("WORLD: unknown PET spell id %i", spellid);
return; return;
@ -234,7 +234,7 @@ void WorldSession::HandlePetAction( WorldPacket & recv_data )
pet->SendPetTalk((uint32)PET_TALK_SPECIAL_SPELL); pet->SendPetTalk((uint32)PET_TALK_SPECIAL_SPELL);
else else
{ {
pet->SendPetAIReaction(guid1); pet->SendPetAIReaction();
} }
if( unit_target && !GetPlayer()->IsFriendlyTo(unit_target) && !pet->HasAuraType(SPELL_AURA_MOD_POSSESS)) if( unit_target && !GetPlayer()->IsFriendlyTo(unit_target) && !pet->HasAuraType(SPELL_AURA_MOD_POSSESS))
@ -652,7 +652,7 @@ void WorldSession::HandlePetCastSpellOpcode( WorldPacket& recvPacket )
if(((Pet*)pet)->getPetType() == SUMMON_PET && (urand(0, 100) < 10)) if(((Pet*)pet)->getPetType() == SUMMON_PET && (urand(0, 100) < 10))
pet->SendPetTalk((uint32)PET_TALK_SPECIAL_SPELL); pet->SendPetTalk((uint32)PET_TALK_SPECIAL_SPELL);
else else
pet->SendPetAIReaction(guid); pet->SendPetAIReaction();
} }
spell->prepare(&(spell->m_targets)); spell->prepare(&(spell->m_targets));

4
src/game/Unit.cpp
View file

@ -9770,14 +9770,14 @@ void Unit::SendPetTalk (uint32 pettalk)
((Player*)owner)->GetSession()->SendPacket(&data); ((Player*)owner)->GetSession()->SendPacket(&data);
} }
void Unit::SendPetAIReaction(uint64 guid) void Unit::SendPetAIReaction()
{ {
Unit* owner = GetOwner(); Unit* owner = GetOwner();
if(!owner || owner->GetTypeId() != TYPEID_PLAYER) if(!owner || owner->GetTypeId() != TYPEID_PLAYER)
return; return;
WorldPacket data(SMSG_AI_REACTION, 8 + 4); WorldPacket data(SMSG_AI_REACTION, 8 + 4);
data << uint64(guid); data << GetObjectGuid();
data << uint32(AI_REACTION_HOSTILE); data << uint32(AI_REACTION_HOSTILE);
((Player*)owner)->GetSession()->SendPacket(&data); ((Player*)owner)->GetSession()->SendPacket(&data);
} }

2
src/game/Unit.h
View file

@ -1895,7 +1895,7 @@ class MANGOS_DLL_SPEC Unit : public WorldObject
void SendPetCastFail(uint32 spellid, SpellCastResult msg); void SendPetCastFail(uint32 spellid, SpellCastResult msg);
void SendPetActionFeedback (uint8 msg); void SendPetActionFeedback (uint8 msg);
void SendPetTalk (uint32 pettalk); void SendPetTalk (uint32 pettalk);
void SendPetAIReaction(uint64 guid); void SendPetAIReaction();
///----------End of Pet responses methods---------- ///----------End of Pet responses methods----------
void propagateSpeedChange() { GetMotionMaster()->propagateSpeedChange(); } void propagateSpeedChange() { GetMotionMaster()->propagateSpeedChange(); }

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "10561" #define REVISION_NR "10562"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__