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

bug fixes

Browse source
This commit is contained in:
collett 2020-11-09 23:28:58 +09:00
parent 2d788bce66
commit 3cd083809a
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/scripts/quest/subquest/gridania/SubFst008.cpp
View file

@ -123,7 +123,7 @@ private:
{ {
if( result.param2 == 1 ) if( result.param2 == 1 )
{ {
if( player.giveQuestRewards( getId(), 0 ) ) if( player.giveQuestRewards( getId(), result.param3 ) )
{ {
player.setQuestUI8BH( getId(), result.param3 ); player.setQuestUI8BH( getId(), result.param3 );
player.finishQuest( getId() ); player.finishQuest( getId() );

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

@ -598,11 +598,12 @@ void Sapphire::Entity::Chara::removeStatusEffect( uint8_t effectSlotId, bool sen
if( pEffectIt == m_statusEffectMap.end() ) if( pEffectIt == m_statusEffectMap.end() )
return; return;
auto pEffect = pEffectIt->second;
statusEffectFreeSlot( effectSlotId ); statusEffectFreeSlot( effectSlotId );
m_statusEffectMap.erase( effectSlotId ); m_statusEffectMap.erase( effectSlotId );
auto pEffect = pEffectIt->second;
pEffect->removeStatus(); pEffect->removeStatus();
sendToInRangeSet( makeActorControl( getId(), StatusEffectLose, pEffect->getId() ), true ); sendToInRangeSet( makeActorControl( getId(), StatusEffectLose, pEffect->getId() ), true );

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

@ -2153,7 +2153,7 @@ void Sapphire::Entity::Player::updateHuntingLog( uint16_t id )
const auto maxRank = 4; const auto maxRank = 4;
auto& pExdData = Common::Service< Data::ExdDataGenerated >::ref(); auto& pExdData = Common::Service< Data::ExdDataGenerated >::ref();
auto& logEntry = m_huntingLogEntries[ static_cast< uint8_t >( getClass() ) - 1 ]; auto logEntryIndex = static_cast< uint8_t >( getClass() ) - 1;
bool logChanged = false; bool logChanged = false;
@ -2162,6 +2162,10 @@ void Sapphire::Entity::Player::updateHuntingLog( uint16_t id )
auto classJobInfo = pExdData.get< Sapphire::Data::ClassJob >( currentClass ); auto classJobInfo = pExdData.get< Sapphire::Data::ClassJob >( currentClass );
if( !classJobInfo ) if( !classJobInfo )
return; return;
if( classJobInfo->classJobParent > 0 )
logEntryIndex = classJobInfo->classJobParent;
auto& logEntry = m_huntingLogEntries[ logEntryIndex ];
bool allSectionsComplete = true; bool allSectionsComplete = true;
for( int i = 1; i <= 10; ++i ) for( int i = 1; i <= 10; ++i )