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

Merge pull request #933 from collett8192/3.0_master

Browse source 
fix some PlayerCondition flags
This commit is contained in:
Mordred 2023-05-01 18:14:26 +02:00 • committed by GitHub
commit 4992503308
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/common/Common.h
View file

@ -1373,9 +1373,10 @@ namespace Sapphire::Common
{ {
None1 = 0, None1 = 0,
HideUILockChar = 1, // as the name suggests, hides the ui and logs the char... HideUILockChar = 1, // as the name suggests, hides the ui and logs the char...
InCombat = 2, // in Combat, locks gearchange/return/teleport InCombat = 18, // in Combat, locks gearchange/return/teleport
Casting = 3, Casting = 19,
InNpcEvent = 6, // when talking to an npc, locks ui giving "occupied" message EventAction = 22,
InNpcEvent = 24, // when talking to an npc, locks ui giving "occupied" message
// InNpcEvent1 = 10, // Sent together with InNpcEvent, when waiting for input? just a guess... // InNpcEvent1 = 10, // Sent together with InNpcEvent, when waiting for input? just a guess...

4
src/world/Actor/Player.cpp
View file

@ -1134,6 +1134,7 @@ const std::map< uint32_t, uint8_t >& Player::getActorIdToHateSlotMap()
void Player::onMobAggro( const BNpc& bnpc ) void Player::onMobAggro( const BNpc& bnpc )
{ {
hateListAdd( bnpc ); hateListAdd( bnpc );
setCondition( PlayerCondition::InCombat );
Network::Util::Packet::sendActorControl( *this, getId(), SetBattle, 1 ); Network::Util::Packet::sendActorControl( *this, getId(), SetBattle, 1 );
} }
@ -1141,7 +1142,10 @@ void Player::onMobDeaggro( const BNpc& bnpc )
{ {
hateListRemove( bnpc ); hateListRemove( bnpc );
if( m_actorIdTohateSlotMap.empty() ) if( m_actorIdTohateSlotMap.empty() )
{
removeCondition( PlayerCondition::InCombat );
Network::Util::Packet::sendActorControl( *this, getId(), SetBattle, 0 ); Network::Util::Packet::sendActorControl( *this, getId(), SetBattle, 0 );
}
} }
bool Player::isLogin() const bool Player::isLogin() const