aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorHeihachi <gamehacker953@gmail.com>2014-11-11 14:56:26 -0600
committerNayd <dnpd.dd@gmail.com>2014-12-28 15:58:11 +0000
commit62b2ccca13e3e00ca68b4299d0e980b884ddf07d (patch)
tree3eaa7c5e4638baa4b59a20e8488d4e75486bb9d0 /src
parent3cdc66bec68e9dd9bf792f4b37328d4fd67bc266 (diff)
Core/Player: Fix Restes/RaF exp on the exp bar and from kills
Final Time :'( (cherry picked from commit 2d000a42e9a8dbc1f16450143835221d7a7c149a)
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Entities/Player/Player.cpp13
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 9129aca8078..904600a2481 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -20853,12 +20853,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));