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

[Build] Most errors fixed

Browse source
This commit is contained in:
Antz 2015-02-07 22:46:39 +00:00 • committed by Antz
parent 868302dd0b
commit 778052084e
70 changed files with 619 additions and 602 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/game/WorldHandlers/MiscHandler.cpp
View file

@ -56,7 +56,7 @@ void WorldSession::HandleRepopRequestOpcode(WorldPacket& recv_data)
recv_data.read_skip<uint8>();
if (GetPlayer()->isAlive() || GetPlayer()->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_GHOST))
if (GetPlayer()->IsAlive() || GetPlayer()->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_GHOST))
return;
// the world update order is sessions, players, creatures
@ -276,7 +276,7 @@ void WorldSession::HandleLogoutRequestOpcode(WorldPacket & /*recv_data*/)
DoLootRelease(lootGuid);
// Can not logout if...
if (GetPlayer()->isInCombat() || //...is in combat
if (GetPlayer()->IsInCombat() || //...is in combat
GetPlayer()->duel || //...is in Duel
//...is jumping ...is falling
GetPlayer()->m_movementInfo.HasMovementFlag(MovementFlags(MOVEFLAG_FALLING | MOVEFLAG_FALLINGFAR)))
@ -629,7 +629,7 @@ void WorldSession::HandleReclaimCorpseOpcode(WorldPacket& recv_data)
ObjectGuid guid;
recv_data >> guid;
if (GetPlayer()->isAlive())
if (GetPlayer()->IsAlive())
return;
// do not allow corpse reclaim in arena
@ -668,7 +668,7 @@ void WorldSession::HandleResurrectResponseOpcode(WorldPacket& recv_data)
recv_data >> guid;
recv_data >> status;
if (GetPlayer()->isAlive())
if (GetPlayer()->IsAlive())
return;
if (status == 0)
@ -686,7 +686,7 @@ void WorldSession::HandleResurrectResponseOpcode(WorldPacket& recv_data)
void WorldSession::HandleReturnToGraveyard(WorldPacket& /*recvPacket*/)
{
Player* pPlayer = GetPlayer();
if (pPlayer->isAlive() || !pPlayer->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_GHOST))
if (pPlayer->IsAlive() || !pPlayer->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_GHOST))
return;
WorldSafeLocsEntry const* ClosestGrave = NULL;
@ -703,7 +703,7 @@ void WorldSession::HandleReturnToGraveyard(WorldPacket& /*recvPacket*/)
{
bool updateVisibility = pPlayer->IsInWorld() && pPlayer->GetCorpse()->GetMapId() == ClosestGrave->map_id;
pPlayer->TeleportTo(ClosestGrave->map_id, ClosestGrave->x, ClosestGrave->y, ClosestGrave->z, pPlayer->GetOrientation());
if (pPlayer->isDead()) // not send if alive, because it used in TeleportTo()
if (pPlayer->IsDead()) // not send if alive, because it used in TeleportTo()
{
WorldPacket data(SMSG_DEATH_RELEASE_LOC, 4 * 4);// show spirit healer position on minimap
data << ClosestGrave->map_id;
@ -755,7 +755,7 @@ void WorldSession::HandleAreaTriggerOpcode(WorldPacket& recv_data)
return;
uint32 quest_id = sObjectMgr.GetQuestForAreaTrigger(Trigger_ID);
if (quest_id && player->isAlive() && player->IsActiveQuest(quest_id))
if (quest_id && player->IsAlive() && player->IsActiveQuest(quest_id))
{
Quest const* pQuest = sObjectMgr.GetQuestTemplate(quest_id);
if (pQuest)
@ -795,7 +795,7 @@ void WorldSession::HandleAreaTriggerOpcode(WorldPacket& recv_data)
return;
// ghost resurrected at enter attempt to dungeon with corpse (including fail enter cases)
if (!player->isAlive() && targetMapEntry->IsDungeon())
if (!player->IsAlive() && targetMapEntry->IsDungeon())
{
int32 corpseMapId = 0;
if (Corpse* corpse = player->GetCorpse())