snadno a rychle
diff -r 9ad0aaf0b0bb src/game/ArenaTeamHandler.cpp
--- a/src/game/ArenaTeamHandler.cpp Sun Feb 14 06:05:41 2010 -0700
+++ b/src/game/ArenaTeamHandler.cpp Wed Mar 17 02:34:28 2010 +0100
@@ -114,14 +114,14 @@
}
// OK result but not send invite
- if(player->GetSocial()->HasIgnore(GetPlayer()->GetGUIDLow()))
- return;
-
- if (!sWorld.getConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_GUILD) && player->GetTeam() != GetPlayer()->GetTeam())
- {
- SendArenaTeamCommandResult(ERR_ARENA_TEAM_INVITE_SS, "", "", ERR_ARENA_TEAM_NOT_ALLIED);
- return;
- }
+// if(player->GetSocial()->HasIgnore(GetPlayer()->GetGUIDLow()))
+// return;
+//
+// if (!sWorld.getConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_GUILD) && player->GetTeam() != GetPlayer()->GetTeam())
+// {
+// SendArenaTeamCommandResult(ERR_ARENA_TEAM_INVITE_SS, "", "", ERR_ARENA_TEAM_NOT_ALLIED);
+// return;
+// }
if(player->GetArenaTeamId(arenateam->GetSlot()))
{
@@ -167,11 +167,11 @@
return;
}
- if (!sWorld.getConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_GUILD) && _player->GetTeam() != objmgr.GetPlayerTeamByGUID(at->GetCaptain()))
- {
- SendArenaTeamCommandResult(ERR_ARENA_TEAM_CREATE_S,"","",ERR_ARENA_TEAM_NOT_ALLIED);// not let enemies sign petition
- return;
- }
+// if (!sWorld.getConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_GUILD) && _player->GetTeam() != objmgr.GetPlayerTeamByGUID(at->GetCaptain()))
+// {
+// SendArenaTeamCommandResult(ERR_ARENA_TEAM_CREATE_S,"","",ERR_ARENA_TEAM_NOT_ALLIED);// not let enemies sign petition
+// return;
+// }
if(!at->AddMember(_player->GetGUID()))
{
diff -r 9ad0aaf0b0bb src/game/Group.cpp
--- a/src/game/Group.cpp Sun Feb 14 06:05:41 2010 -0700
+++ b/src/game/Group.cpp Wed Mar 17 02:34:28 2010 +0100
@@ -1450,8 +1450,8 @@
if(!member)
return BG_JOIN_ERR_OFFLINE_MEMBER;
// don't allow cross-faction join as group
- if(member->GetTeam() != team)
- return BG_JOIN_ERR_MIXED_FACTION;
+// if(member->GetTeam() != team)
+// return BG_JOIN_ERR_MIXED_FACTION;
// not in the same battleground level braket, don't let join
if(member->GetBattleGroundQueueIdFromLevel(bgTypeId) != queue_id)
return BG_JOIN_ERR_MIXED_LEVELS;
diff -r 9ad0aaf0b0bb src/game/PetitionsHandler.cpp
--- a/src/game/PetitionsHandler.cpp Sun Feb 14 06:05:41 2010 -0700
+++ b/src/game/PetitionsHandler.cpp Wed Mar 17 02:34:28 2010 +0100
@@ -469,11 +469,12 @@
// not let enemies sign guild charter
if(!sWorld.getConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_GUILD) && GetPlayer()->GetTeam() != objmgr.GetPlayerTeamByGUID(ownerguid))
{
- if(type != 9)
- SendArenaTeamCommandResult(ERR_ARENA_TEAM_INVITE_SS, "", "", ERR_ARENA_TEAM_NOT_ALLIED);
- else
- SendGuildCommandResult(GUILD_CREATE_S, "", GUILD_NOT_ALLIED);
- return;
+ if(type != 9){
+// SendArenaTeamCommandResult(ERR_ARENA_TEAM_INVITE_SS, "", "", ERR_ARENA_TEAM_NOT_ALLIED);
+ }else{
+ SendGuildCommandResult(GUILD_CREATE_S, "", GUILD_NOT_ALLIED);
+ return;
+ }
}
if(type != 9)
@@ -613,11 +614,12 @@
if (!sWorld.getConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_GUILD) && GetPlayer()->GetTeam() != player->GetTeam() )
{
- if(type != 9)
- SendArenaTeamCommandResult(ERR_ARENA_TEAM_INVITE_SS, "", "", ERR_ARENA_TEAM_NOT_ALLIED);
- else
- SendGuildCommandResult(GUILD_CREATE_S, "", GUILD_NOT_ALLIED);
- return;
+ if(type != 9){
+// SendArenaTeamCommandResult(ERR_ARENA_TEAM_INVITE_SS, "", "", ERR_ARENA_TEAM_NOT_ALLIED);
+ }else{
+ SendGuildCommandResult(GUILD_CREATE_S, "", GUILD_NOT_ALLIED);
+ return;
+ }
}
if(type != 9)
edit: teď sem to zkoušel a funguje.. přidání do týmu, vyžádání podpisu a join arén s opačnou frakcí.