diff options
| author | Duarte Duarte <dnpd.dd@gmail.com> | 2014-12-28 15:57:28 +0000 |
|---|---|---|
| committer | Duarte Duarte <dnpd.dd@gmail.com> | 2014-12-28 15:57:28 +0000 |
| commit | 32d9a71a4219ea353950979a2491e7879b7fa79a (patch) | |
| tree | 1770aad728d20174279861ad197ffa5a72f89663 /src | |
| parent | b7bacea940514fd3e03503ff433930733e99ebf5 (diff) | |
| parent | 2d000a42e9a8dbc1f16450143835221d7a7c149a (diff) | |
Merge pull request #13547 from heihachi/master
Core/Player: Fix Restes/RaF exp on the exp bar and from kills
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index a4afde217c9..b8abc33f675 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -21236,12 +21236,15 @@ void Player::SetRestBonus(float rest_bonus_new) m_rest_bonus = rest_bonus_new; // update data for client - if (GetSession()->IsARecruiter() || (GetSession()->GetRecruiterId() != 0)) + if ((GetsRecruitAFriendBonus(true) && (GetSession()->IsARecruiter() || GetSession()->GetRecruiterId() != 0))) SetByteValue(PLAYER_BYTES_2, 3, REST_STATE_RAF_LINKED); - else if (m_rest_bonus > 10) - SetByteValue(PLAYER_BYTES_2, 3, REST_STATE_RESTED); // Set Reststate = Rested - else if (m_rest_bonus <= 1) - SetByteValue(PLAYER_BYTES_2, 3, REST_STATE_NOT_RAF_LINKED); // Set Reststate = Normal + else + { + if (m_rest_bonus > 10) + SetByteValue(PLAYER_BYTES_2, 3, REST_STATE_RESTED); + else if (m_rest_bonus <= 1) + SetByteValue(PLAYER_BYTES_2, 3, REST_STATE_NOT_RAF_LINKED); + } //RestTickUpdate SetUInt32Value(PLAYER_REST_STATE_EXPERIENCE, uint32(m_rest_bonus)); |