diff --git a/src/game/GroupHandler.cpp b/src/game/GroupHandler.cpp
index 42c14ed44..47fede5c2 100644
--- a/src/game/GroupHandler.cpp
+++ b/src/game/GroupHandler.cpp
@@ -632,7 +632,7 @@ void WorldSession::HandleRaidReadyCheckFinishedOpcode( WorldPacket & /*recv_data
     // Is any reaction need?
 }
 
-bool WorldSession::BuildPartyMemberStatsChangedPacket(Player *player, WorldPacket *data)
+void WorldSession::BuildPartyMemberStatsChangedPacket(Player *player, WorldPacket *data)
 {
     uint32 mask = player->GetGroupUpdateFlag();
 
@@ -786,8 +786,6 @@ bool WorldSession::BuildPartyMemberStatsChangedPacket(Player *player, WorldPacke
         else
             *data << uint64(0);
     }
-
-    return true;
 }
 
 /*this procedure handles clients CMSG_REQUEST_PARTY_MEMBER_STATS request*/
diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index 2e40e867a..fadd58cd8 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -1586,7 +1586,7 @@ bool Player::ToggleAFK()
     bool state = HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_AFK);
 
     // afk player not allowed in battleground
-    if(state && InBattleGround())
+    if (state && InBattleGround() && !InArena())
         LeaveBattleground();
 
     return state;
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index f355953d2..b9c58413c 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "9982"
+ #define REVISION_NR "9983"
 #endif // __REVISION_NR_H__