mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-06-12 18:37:46 +00:00
Code Activity

Claimed mobs will now display in the correct color. Red if owned by self, purple if owned by others

Browse source
This commit is contained in:
Mordred 2019-03-29 17:12:22 +01:00
parent 920ab52508
commit 38701d647c
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/world/Actor/BNpc.cpp
View file

@ -392,12 +392,15 @@ void Sapphire::Entity::BNpc::aggro( Sapphire::Entity::CharaPtr pChara )
setStance( Stance::Active ); setStance( Stance::Active );
m_state = BNpcState::Combat; m_state = BNpcState::Combat;
sendToInRangeSet( makeActorControl142( getId(), ActorControlType::ToggleWeapon, 1, 1, 0 ) );
if( pChara->isPlayer() ) if( pChara->isPlayer() )
{ {
PlayerPtr tmpPlayer = pChara->getAsPlayer(); PlayerPtr tmpPlayer = pChara->getAsPlayer();
tmpPlayer->queuePacket( makeActorControl142( getId(), ActorControlType::ToggleWeapon, 1, 1, 1 ) ); sendToInRangeSet( makeActorControl142( getId(), ActorControlType::ToggleAggro, 1, 0, 0 ) );
tmpPlayer->onMobAggro( getAsBNpc() ); tmpPlayer->onMobAggro( getAsBNpc() );
} }
} }
void Sapphire::Entity::BNpc::deaggro( Sapphire::Entity::CharaPtr pChara ) void Sapphire::Entity::BNpc::deaggro( Sapphire::Entity::CharaPtr pChara )
@ -676,14 +679,14 @@ void Sapphire::Entity::BNpc::setOwner( Sapphire::Entity::CharaPtr m_pChara )
{ {
auto setOwnerPacket = makeZonePacket< FFXIVIpcActorOwner >( m_pChara->getId() ); auto setOwnerPacket = makeZonePacket< FFXIVIpcActorOwner >( m_pChara->getId() );
setOwnerPacket->data().type = 0x01; setOwnerPacket->data().type = 0x01;
setOwnerPacket->data().actorId2 = m_pChara->getId(); setOwnerPacket->data().actorId = m_pChara->getId();
sendToInRangeSet( setOwnerPacket ); sendToInRangeSet( setOwnerPacket );
} }
else else
{ {
auto setOwnerPacket = makeZonePacket< FFXIVIpcActorOwner >( m_pChara->getId() ); auto setOwnerPacket = makeZonePacket< FFXIVIpcActorOwner >( getId() );
setOwnerPacket->data().type = 0x01; setOwnerPacket->data().type = 0x01;
setOwnerPacket->data().actorId2 = INVALID_GAME_OBJECT_ID; setOwnerPacket->data().actorId = 0;
sendToInRangeSet( setOwnerPacket ); sendToInRangeSet( setOwnerPacket );
} }
} }