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

fix build

Browse source
This commit is contained in:
Tahir 2024-05-09 17:16:18 +01:00
parent 342c30aa43
commit 959df68b63
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/world/Encounter/EncounterTimeline.cpp
View file

@ -142,7 +142,7 @@ namespace Sapphire
PhaseCondition::from_json( json, phase, conditionId ); PhaseCondition::from_json( json, phase, conditionId );
auto paramData = json.at( "paramData" ); auto paramData = json.at( "paramData" );
auto actorRef = paramData.at( "sourceActor" ); auto actorRef = paramData.at( "sourceActor" ).get< std::string >();
// resolve the actor whose hp we are checking // resolve the actor whose hp we are checking
if( auto it = actors.find( actorRef ); it != actors.end() ) if( auto it = actors.find( actorRef ); it != actors.end() )

4
src/world/Encounter/EncounterTimeline.h
View file

@ -311,7 +311,7 @@ namespace Sapphire
{ {
uint64_t phaseElapsed = time - m_startTime; uint64_t phaseElapsed = time - m_startTime;
uint64_t timepointElapsed = time - m_lastTimepointTime; uint64_t timepointElapsed = time - m_lastTimepointTime;
auto& timepoint = m_timepoints[ i ]; auto& timepoint = m_timepoints[ i ];
if( timepoint.canExecute( timepointElapsed ) ) if( timepoint.canExecute( timepointElapsed ) )
{ {
@ -432,7 +432,7 @@ namespace Sapphire
} }
else if( pCondition->inProgress() ) else if( pCondition->inProgress() )
{ {
pCondition->execute( pFight, time ); pCondition->update( pFight, time );
} }
else if( pCondition->isConditionMet( pFight, time ) ) else if( pCondition->isConditionMet( pFight, time ) )
{ {