mirror of
https://github.com/mangosfour/server.git
synced 2025-12-17 07:37:03 +00:00
Updated to 10072 client build.
This commit is contained in:
parent
3089d85035
commit
c9258deb5a
4 changed files with 25 additions and 21 deletions
|
|
@ -723,29 +723,29 @@ void WorldSession::HandleResurrectResponseOpcode(WorldPacket & recv_data)
|
||||||
|
|
||||||
void WorldSession::HandleAreaTriggerOpcode(WorldPacket & recv_data)
|
void WorldSession::HandleAreaTriggerOpcode(WorldPacket & recv_data)
|
||||||
{
|
{
|
||||||
CHECK_PACKET_SIZE(recv_data,4);
|
CHECK_PACKET_SIZE(recv_data, 4);
|
||||||
|
|
||||||
sLog.outDebug("WORLD: Received CMSG_AREATRIGGER");
|
sLog.outDebug("WORLD: Received CMSG_AREATRIGGER");
|
||||||
|
|
||||||
uint32 Trigger_ID;
|
uint32 Trigger_ID;
|
||||||
|
|
||||||
recv_data >> Trigger_ID;
|
recv_data >> Trigger_ID;
|
||||||
sLog.outDebug("Trigger ID:%u",Trigger_ID);
|
sLog.outDebug("Trigger ID: %u", Trigger_ID);
|
||||||
|
|
||||||
if(GetPlayer()->isInFlight())
|
if(GetPlayer()->isInFlight())
|
||||||
{
|
{
|
||||||
sLog.outDebug("Player '%s' (GUID: %u) in flight, ignore Area Trigger ID:%u",GetPlayer()->GetName(),GetPlayer()->GetGUIDLow(), Trigger_ID);
|
sLog.outDebug("Player '%s' (GUID: %u) in flight, ignore Area Trigger ID: %u", GetPlayer()->GetName(), GetPlayer()->GetGUIDLow(), Trigger_ID);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
AreaTriggerEntry const* atEntry = sAreaTriggerStore.LookupEntry(Trigger_ID);
|
AreaTriggerEntry const* atEntry = sAreaTriggerStore.LookupEntry(Trigger_ID);
|
||||||
if(!atEntry)
|
if(!atEntry)
|
||||||
{
|
{
|
||||||
sLog.outDebug("Player '%s' (GUID: %u) send unknown (by DBC) Area Trigger ID:%u",GetPlayer()->GetName(),GetPlayer()->GetGUIDLow(), Trigger_ID);
|
sLog.outDebug("Player '%s' (GUID: %u) send unknown (by DBC) Area Trigger ID: %u", GetPlayer()->GetName(), GetPlayer()->GetGUIDLow(), Trigger_ID);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (GetPlayer()->GetMapId()!=atEntry->mapid)
|
if (GetPlayer()->GetMapId() != atEntry->mapid)
|
||||||
{
|
{
|
||||||
sLog.outDebug("Player '%s' (GUID: %u) too far (trigger map: %u player map: %u), ignore Area Trigger ID: %u", GetPlayer()->GetName(), atEntry->mapid, GetPlayer()->GetMapId(), GetPlayer()->GetGUIDLow(), Trigger_ID);
|
sLog.outDebug("Player '%s' (GUID: %u) too far (trigger map: %u player map: %u), ignore Area Trigger ID: %u", GetPlayer()->GetName(), atEntry->mapid, GetPlayer()->GetMapId(), GetPlayer()->GetGUIDLow(), Trigger_ID);
|
||||||
return;
|
return;
|
||||||
|
|
@ -759,7 +759,7 @@ void WorldSession::HandleAreaTriggerOpcode(WorldPacket & recv_data)
|
||||||
if (atEntry->radius > 0)
|
if (atEntry->radius > 0)
|
||||||
{
|
{
|
||||||
// if we have radius check it
|
// if we have radius check it
|
||||||
float dist = pl->GetDistance(atEntry->x,atEntry->y,atEntry->z);
|
float dist = pl->GetDistance(atEntry->x, atEntry->y, atEntry->z);
|
||||||
if(dist > atEntry->radius + delta)
|
if(dist > atEntry->radius + delta)
|
||||||
{
|
{
|
||||||
sLog.outDebug("Player '%s' (GUID: %u) too far (radius: %f distance: %f), ignore Area Trigger ID: %u",
|
sLog.outDebug("Player '%s' (GUID: %u) too far (radius: %f distance: %f), ignore Area Trigger ID: %u",
|
||||||
|
|
@ -888,7 +888,7 @@ void WorldSession::HandleAreaTriggerOpcode(WorldPacket & recv_data)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
GetPlayer()->TeleportTo(at->target_mapId,at->target_X,at->target_Y,at->target_Z,at->target_Orientation,TELE_TO_NOT_LEAVE_TRANSPORT);
|
GetPlayer()->TeleportTo(at->target_mapId, at->target_X, at->target_Y, at->target_Z, at->target_Orientation, TELE_TO_NOT_LEAVE_TRANSPORT);
|
||||||
}
|
}
|
||||||
|
|
||||||
void WorldSession::HandleUpdateAccountData(WorldPacket &recv_data)
|
void WorldSession::HandleUpdateAccountData(WorldPacket &recv_data)
|
||||||
|
|
|
||||||
|
|
@ -169,7 +169,7 @@ struct ActionButton
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
#define MAX_ACTION_BUTTONS 144 //checked in 2.3.0
|
#define MAX_ACTION_BUTTONS 144 //checked in 3.2.0
|
||||||
|
|
||||||
typedef std::map<uint8,ActionButton> ActionButtonList;
|
typedef std::map<uint8,ActionButton> ActionButtonList;
|
||||||
|
|
||||||
|
|
@ -321,15 +321,19 @@ enum LfgType
|
||||||
LFG_TYPE_RAID = 2,
|
LFG_TYPE_RAID = 2,
|
||||||
LFG_TYPE_QUEST = 3,
|
LFG_TYPE_QUEST = 3,
|
||||||
LFG_TYPE_ZONE = 4,
|
LFG_TYPE_ZONE = 4,
|
||||||
LFG_TYPE_HEROIC_DUNGEON = 5
|
LFG_TYPE_HEROIC_DUNGEON = 5,
|
||||||
|
LFG_TYPE_ANY_DUNGEON = 6,
|
||||||
|
LFG_TYPE_ANY_HEROIC_DUNGEON = 7,
|
||||||
|
LFG_TYPE_DAILY_DUNGEON = 8,
|
||||||
|
LFG_TYPE_DAILY_HEROIC_DUNGEON = 9
|
||||||
};
|
};
|
||||||
|
|
||||||
enum LfgRoles
|
enum LfgRoles
|
||||||
{
|
{
|
||||||
LEADER = 1,
|
LEADER = 0x01,
|
||||||
TANK = 2,
|
TANK = 0x02,
|
||||||
HEALER = 4,
|
HEALER = 0x04,
|
||||||
DAMAGE = 8
|
DAMAGE = 0x08
|
||||||
};
|
};
|
||||||
|
|
||||||
struct LookingForGroupSlot
|
struct LookingForGroupSlot
|
||||||
|
|
|
||||||
|
|
@ -19,7 +19,7 @@
|
||||||
#ifndef _UPDATEFIELDS_AUTO_H
|
#ifndef _UPDATEFIELDS_AUTO_H
|
||||||
#define _UPDATEFIELDS_AUTO_H
|
#define _UPDATEFIELDS_AUTO_H
|
||||||
|
|
||||||
// Auto generated for version 0, 2, 0, 10048
|
// Auto generated for version 0, 2, 0, 10072
|
||||||
|
|
||||||
enum EObjectFields
|
enum EObjectFields
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -66,8 +66,8 @@ enum LoginResult
|
||||||
|
|
||||||
// we need to stick to 1 version or half of the stuff will work for someone
|
// we need to stick to 1 version or half of the stuff will work for someone
|
||||||
// others will not and opposite
|
// others will not and opposite
|
||||||
// will only support WoW, WoW:TBC and WoW:WotLK 3.2.0 client build 10048...
|
// will only support WoW, WoW:TBC and WoW:WotLK 3.2.0 client build 10072...
|
||||||
|
|
||||||
#define EXPECTED_MANGOS_CLIENT_BUILD {10048, 0}
|
#define EXPECTED_MANGOS_CLIENT_BUILD {10072, 0}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue