From fab25aa469aa3688cc90c1dda7539bba7d4552f9 Mon Sep 17 00:00:00 2001 From: Ono Date: Wed, 14 Jun 2017 20:17:15 +0300 Subject: [PATCH] Minor refactor of HandleGroupDisbandOpcode Some local vars caching instead of calls --- src/game/GroupHandler.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/game/GroupHandler.cpp b/src/game/GroupHandler.cpp index 0d70decb5d2..dc0a2aea105 100644 --- a/src/game/GroupHandler.cpp +++ b/src/game/GroupHandler.cpp @@ -361,10 +361,12 @@ void WorldSession::HandleGroupSetLeaderOpcode(WorldPacket& recv_data) void WorldSession::HandleGroupDisbandOpcode(WorldPacket& /*recv_data*/) { - if (!GetPlayer()->GetGroup()) + Player* player = GetPlayer(); + Group* group = player->GetGroup(); + if (!group) return; - if (_player->InBattleGround()) + if (player->InBattleGround()) { SendPartyResult(PARTY_OP_INVITE, "", ERR_INVITE_RESTRICTED); return; @@ -374,9 +376,9 @@ void WorldSession::HandleGroupDisbandOpcode(WorldPacket& /*recv_data*/) /********************/ // everything is fine, do it - SendPartyResult(PARTY_OP_LEAVE, GetPlayer()->GetName(), ERR_PARTY_RESULT_OK); + SendPartyResult(PARTY_OP_LEAVE, player->GetName(), ERR_PARTY_RESULT_OK); - GetPlayer()->RemoveFromGroup(); + player->RemoveFromGroup(); } void WorldSession::HandleMinimapPingOpcode(WorldPacket& recv_data)