mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-02 00:47:45 +00:00
Code Activity

Friendly bnpcs no longer fight eachother

Browse source
This commit is contained in:
Mordred 2022-01-13 22:51:47 +01:00
parent c19d4d4b25
commit d978197b3d
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -830,6 +830,9 @@ void Sapphire::Entity::BNpc::checkAggro()
return; return;
} }
if( getEnemyType() == 0 && pClosestChara->getAsBNpc()->getEnemyType() == 0 )
return;
// will use this range if chara level is lower than bnpc, otherwise diminishing equation applies // will use this range if chara level is lower than bnpc, otherwise diminishing equation applies
float range = 14.f; float range = 14.f;

2
src/world/Script/ScriptMgr.cpp
View file

@ -207,7 +207,7 @@ bool Sapphire::Scripting::ScriptMgr::onTalk( Entity::Player& player, uint64_t ac
// check if the actor is an eobj and call its script if we have one // check if the actor is an eobj and call its script if we have one
auto& teriMgr = Common::Service< World::Manager::TerritoryMgr >::ref(); auto& teriMgr = Common::Service< World::Manager::TerritoryMgr >::ref();
auto zone = teriMgr.getTerritoryByGuId( player.getTerritoryId() ); auto zone = teriMgr.getTerritoryByGuId( player.getTerritoryId() );
if( auto eobj = zone ? zone->getEObj( actorId ) : nullptr ) if( auto eobj = zone ? zone->getEObj( static_cast< uint32_t >( actorId ) ) : nullptr )
{ {
auto script = m_nativeScriptMgr->getScript< Sapphire::ScriptAPI::EventObjectScript >( eobj->getObjectId() ); auto script = m_nativeScriptMgr->getScript< Sapphire::ScriptAPI::EventObjectScript >( eobj->getObjectId() );
if( script ) if( script )