mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-16 04:37:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Further reduce of DB access in guild handlers.

Browse source
This commit is contained in:
hunuza 2008-11-06 11:08:31 +01:00
parent cdb2c08e3f
commit 4957d9f335
2 changed files with 27 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

99
src/game/GuildHandler.cpp
View file

@ -150,10 +150,6 @@ void WorldSession::HandleGuildRemoveOpcode(WorldPacket& recvPacket)
CHECK_PACKET_SIZE(recvPacket, 1);
std::string plName;
uint64 plGuid;
uint32 plGuildId;
Guild *guild;
Player *player;
//sLog.outDebug("WORLD: Received CMSG_GUILD_REMOVE");
@ -162,7 +158,7 @@ void WorldSession::HandleGuildRemoveOpcode(WorldPacket& recvPacket)
if(!normalizePlayerName(plName))
return;
guild = objmgr.GetGuildById(GetPlayer()->GetGuildId());
Guild* guild = objmgr.GetGuildById(GetPlayer()->GetGuildId());
if(!guild)
{
SendGuildCommandResult(GUILD_CREATE_S, "", GUILD_PLAYER_NOT_IN_GUILD);
@ -175,17 +171,7 @@ void WorldSession::HandleGuildRemoveOpcode(WorldPacket& recvPacket)
return;
}
player = ObjectAccessor::Instance().FindPlayerByName(plName.c_str());
if(player)
{
plGuid = player->GetGUID();
plGuildId = player->GetGuildId();
}
else
{
plGuid = objmgr.GetPlayerGUIDByName(plName);
plGuildId = Player::GetGuildIdFromDB(plGuid);
}
uint64 plGuid = objmgr.GetPlayerGUIDByName(plName);
if(!plGuid)
{
@ -199,7 +185,7 @@ void WorldSession::HandleGuildRemoveOpcode(WorldPacket& recvPacket)
return;
}
if(GetPlayer()->GetGuildId() != plGuildId)
if(!guild->IsMember(GUID_LOPART(plGuid)))
{
SendGuildCommandResult(GUILD_INVITE_S, plName, GUILD_PLAYER_NOT_IN_GUILD_S);
return;
@ -484,9 +470,6 @@ void WorldSession::HandleGuildLeaderOpcode(WorldPacket& recvPacket)
CHECK_PACKET_SIZE(recvPacket, 1);
std::string name;
Player *newLeader;
uint64 newLeaderGUID;
uint32 newLeaderGuild;
Player *oldLeader = GetPlayer();
Guild *guild;
@ -499,36 +482,26 @@ void WorldSession::HandleGuildLeaderOpcode(WorldPacket& recvPacket)
guild = objmgr.GetGuildById(oldLeader->GetGuildId());
if(!guild)
if (!guild)
{
SendGuildCommandResult(GUILD_CREATE_S, "", GUILD_PLAYER_NOT_IN_GUILD);
return;
}
if(oldLeader->GetGUID() != guild->GetLeader())
if (oldLeader->GetGUID() != guild->GetLeader())
{
SendGuildCommandResult(GUILD_INVITE_S, "", GUILD_PERMISSIONS);
return;
}
newLeader = ObjectAccessor::Instance().FindPlayerByName(name.c_str());
if(newLeader)
{
newLeaderGUID = newLeader->GetGUID();
newLeaderGuild = newLeader->GetGuildId();
}
else
{
newLeaderGUID = objmgr.GetPlayerGUIDByName(name);
newLeaderGuild = Player::GetGuildIdFromDB(newLeaderGUID);
}
uint64 newLeaderGUID = objmgr.GetPlayerGUIDByName(name);
if(!newLeaderGUID)
if (!newLeaderGUID)
{
SendGuildCommandResult(GUILD_INVITE_S, name, GUILD_PLAYER_NOT_FOUND);
return;
}
if(oldLeader->GetGuildId() != newLeaderGuild)
if (!guild->IsMember(GUID_LOPART(newLeaderGUID)))
{
SendGuildCommandResult(GUILD_INVITE_S, name, GUILD_PLAYER_NOT_IN_GUILD_S);
return;
@ -586,10 +559,6 @@ void WorldSession::HandleGuildSetPublicNoteOpcode(WorldPacket& recvPacket)
{
CHECK_PACKET_SIZE(recvPacket, 1);
Guild *guild;
Player *player;
uint64 plGuid;
uint32 plGuildId;
std::string name,PNOTE;
//sLog.outDebug("WORLD: Received CMSG_GUILD_SET_PUBLIC_NOTE");
@ -599,38 +568,29 @@ void WorldSession::HandleGuildSetPublicNoteOpcode(WorldPacket& recvPacket)
if(!normalizePlayerName(name))
return;
guild = objmgr.GetGuildById(GetPlayer()->GetGuildId());
Guild* guild = objmgr.GetGuildById(GetPlayer()->GetGuildId());
if(!guild)
if (!guild)
{
SendGuildCommandResult(GUILD_CREATE_S, "", GUILD_PLAYER_NOT_IN_GUILD);
return;
}
if(!guild->HasRankRight(GetPlayer()->GetRank(), GR_RIGHT_EPNOTE))
if (!guild->HasRankRight(GetPlayer()->GetRank(), GR_RIGHT_EPNOTE))
{
SendGuildCommandResult(GUILD_INVITE_S, "", GUILD_PERMISSIONS);
return;
}
player = ObjectAccessor::Instance().FindPlayerByName(name.c_str());
if(player)
{
plGuid = player->GetGUID();
plGuildId = player->GetGuildId();
}
else
{
plGuid = objmgr.GetPlayerGUIDByName(name);
plGuildId = Player::GetGuildIdFromDB(plGuid);
}
uint64 plGuid = objmgr.GetPlayerGUIDByName(name);
if(!plGuid)
if (!plGuid)
{
SendGuildCommandResult(GUILD_INVITE_S, name, GUILD_PLAYER_NOT_FOUND);
return;
}
else if(GetPlayer()->GetGuildId() != plGuildId)
if (!guild->IsMember(GUID_LOPART(plGuid)))
{
SendGuildCommandResult(GUILD_INVITE_S, name, GUILD_PLAYER_NOT_IN_GUILD_S);
return;
@ -646,50 +606,37 @@ void WorldSession::HandleGuildSetOfficerNoteOpcode(WorldPacket& recvPacket)
{
CHECK_PACKET_SIZE(recvPacket, 1);
Guild *guild;
Player *player;
uint64 plGuid;
uint32 plGuildId;
std::string plName, OFFNOTE;
//sLog.outDebug("WORLD: Received CMSG_GUILD_SET_OFFICER_NOTE");
recvPacket >> plName;
if(!normalizePlayerName(plName))
if (!normalizePlayerName(plName))
return;
guild = objmgr.GetGuildById(GetPlayer()->GetGuildId());
Guild* guild = objmgr.GetGuildById(GetPlayer()->GetGuildId());
if(!guild)
if (!guild)
{
SendGuildCommandResult(GUILD_CREATE_S, "", GUILD_PLAYER_NOT_IN_GUILD);
return;
}
if(!guild->HasRankRight(GetPlayer()->GetRank(), GR_RIGHT_EOFFNOTE))
if (!guild->HasRankRight(GetPlayer()->GetRank(), GR_RIGHT_EOFFNOTE))
{
SendGuildCommandResult(GUILD_INVITE_S, "", GUILD_PERMISSIONS);
return;
}
player = ObjectAccessor::Instance().FindPlayerByName(plName.c_str());
if(player)
{
plGuid = player->GetGUID();
plGuildId = player->GetGuildId();
}
else
{
plGuid = objmgr.GetPlayerGUIDByName(plName);
plGuildId = Player::GetGuildIdFromDB(plGuid);
}
uint64 plGuid = objmgr.GetPlayerGUIDByName(plName);
if( !plGuid )
if (!plGuid)
{
SendGuildCommandResult(GUILD_INVITE_S, plName, GUILD_PLAYER_NOT_FOUND);
return;
}
else if(GetPlayer()->GetGuildId() != plGuildId)
if (!guild->IsMember(GUID_LOPART(plGuid)))
{
SendGuildCommandResult(GUILD_INVITE_S, plName, GUILD_PLAYER_NOT_IN_GUILD_S);
return;