server/mangos
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix wrong PartyResult enum value.

Browse Source 
Probably a backport issue.
This commit is contained in:
cyberium 2016-03-22 12:10:39 +00:00 committed by Antz
parent 082209e8a5
commit ad0ca2e067
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/game/Object/Player.cpp
View File

@ -18659,7 +18659,7 @@ PartyResult Player::CanUninviteFromGroup() const
{ return ERR_NOT_LEADER; } { return ERR_NOT_LEADER; }
if (InBattleGround()) if (InBattleGround())
{ return ERR_INVITE_RESTRICTED; } { return ERR_NOT_IN_GROUP; } // error message is not so appropriated but no other option for classic
return ERR_PARTY_RESULT_OK; return ERR_PARTY_RESULT_OK;
} }

14
src/game/Server/WorldSession.h
View File

@ -70,14 +70,12 @@ enum PartyResult
ERR_PARTY_RESULT_OK = 0, ERR_PARTY_RESULT_OK = 0,
ERR_BAD_PLAYER_NAME_S = 1, ERR_BAD_PLAYER_NAME_S = 1,
ERR_TARGET_NOT_IN_GROUP_S = 2, ERR_TARGET_NOT_IN_GROUP_S = 2,
ERR_TARGET_NOT_IN_INSTANCE_S = 3, ERR_GROUP_FULL = 3,
ERR_GROUP_FULL = 4, ERR_ALREADY_IN_GROUP_S = 4,
ERR_ALREADY_IN_GROUP_S = 5, ERR_NOT_IN_GROUP = 5,
ERR_NOT_IN_GROUP = 6, ERR_NOT_LEADER = 6,
ERR_NOT_LEADER = 7, ERR_PLAYER_WRONG_FACTION = 7,
ERR_PLAYER_WRONG_FACTION = 8, ERR_IGNORING_YOU_S = 8
ERR_IGNORING_YOU_S = 9,
ERR_INVITE_RESTRICTED = 13,
}; };
enum TutorialDataState enum TutorialDataState

4
src/game/WorldHandlers/GroupHandler.cpp
View File

@ -88,7 +88,7 @@ void WorldSession::HandleGroupInviteOpcode(WorldPacket& recv_data)
if (GetPlayer()->GetInstanceId() != 0 && player->GetInstanceId() != 0 && GetPlayer()->GetInstanceId() != player->GetInstanceId() && GetPlayer()->GetMapId() == player->GetMapId()) if (GetPlayer()->GetInstanceId() != 0 && player->GetInstanceId() != 0 && GetPlayer()->GetInstanceId() != player->GetInstanceId() && GetPlayer()->GetMapId() == player->GetMapId())
{ {
SendPartyResult(PARTY_OP_INVITE, membername, ERR_TARGET_NOT_IN_INSTANCE_S); SendPartyResult(PARTY_OP_INVITE, membername, ERR_ALREADY_IN_GROUP_S); // error message is not so appropriated but no other option for classic
return; return;
} }
@ -336,7 +336,7 @@ void WorldSession::HandleGroupDisbandOpcode(WorldPacket& /*recv_data*/)
if (_player->InBattleGround()) if (_player->InBattleGround())
{ {
SendPartyResult(PARTY_OP_INVITE, "", ERR_INVITE_RESTRICTED); SendPartyResult(PARTY_OP_INVITE, "", ERR_NOT_LEADER); // error message is not so appropriated but no other option for classic
return; return;
} }