diff --git a/source/cChar.cpp b/source/cChar.cpp index 90bd2bcd0..e59bb52ab 100644 --- a/source/cChar.cpp +++ b/source/cChar.cpp @@ -2924,24 +2924,24 @@ bool CChar::WearItem( CItem *toWear ) } scriptTriggers.clear(); - scriptTriggers.shrink_to_fit(); - scriptTriggers = this->GetScriptTriggers(); - for( auto i : scriptTriggers ) - { - cScript *tScript = JSMapping->GetScript( i ); - if( tScript != nullptr ) - { - // If script returns false, prevent item from being equipped - if( tScript->OnEquipAttempt( this, toWear ) == 0 ) - { - CSocket *mSock = this->GetSocket(); - if( mSock != nullptr ) - { - Bounce( mSock, toWear ); - } - return false; - } - } + scriptTriggers.shrink_to_fit(); + scriptTriggers = this->GetScriptTriggers(); + for( auto i : scriptTriggers ) + { + cScript *tScript = JSMapping->GetScript( i ); + if( tScript != nullptr ) + { + // If script returns false, prevent item from being equipped + if( tScript->OnEquipAttempt( this, toWear ) == 0 ) + { + CSocket *mSock = this->GetSocket(); + if( mSock != nullptr ) + { + Bounce( mSock, toWear ); + } + return false; + } + } } bool rValue = true; @@ -2970,7 +2970,7 @@ bool CChar::WearItem( CItem *toWear ) IncStaminaLeech( itemLayers[tLayer]->GetStaminaLeech() ); IncManaLeech( itemLayers[tLayer]->GetManaLeech() ); - IncHitChance( itemLayers[tLayer]->GetHitChance() ); + IncHitChance( itemLayers[tLayer]->GetHitChance() ); IncDefenseChance( itemLayers[tLayer]->GetDefenseChance() ); IncHealthBonus( itemLayers[tLayer]->GetHealthBonus() ); @@ -3030,20 +3030,20 @@ bool CChar::TakeOffItem( ItemLayers Layer ) } scriptTriggers.clear(); - scriptTriggers.shrink_to_fit(); - scriptTriggers = this->GetScriptTriggers(); - for( auto i : scriptTriggers ) - { - cScript *tScript = JSMapping->GetScript( i ); - if( tScript != nullptr ) - { - // If script returns false, prevent item from being equipped - if( tScript->OnUnequipAttempt( this, itemLayers[Layer] ) == 0 ) - { - return false; - } - } - } + scriptTriggers.shrink_to_fit(); + scriptTriggers = this->GetScriptTriggers(); + for( auto i : scriptTriggers ) + { + cScript *tScript = JSMapping->GetScript( i ); + if( tScript != nullptr ) + { + // If script returns false, prevent item from being equipped + if( tScript->OnUnequipAttempt( this, itemLayers[Layer] ) == 0 ) + { + return false; + } + } + } if( Layer == IL_PACKITEM ) // It's our pack! { @@ -3055,7 +3055,7 @@ bool CChar::TakeOffItem( ItemLayers Layer ) IncSwingSpeedIncrease( -itemLayers[Layer]->GetSwingSpeedIncrease() ); - IncHealthLeech( -itemLayers[Layer]->GetHealthLeech() ); + IncHealthLeech( -itemLayers[Layer]->GetHealthLeech() ); IncStaminaLeech( -itemLayers[Layer]->GetStaminaLeech() ); IncManaLeech( -itemLayers[Layer]->GetManaLeech() );