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

[12214] Fixup problems with recent teleportation changes

Browse source
This commit is contained in:
Schmoozerd 2012-09-12 23:14:42 +02:00 • committed by Antz
parent 732ae88bed
commit c1890ddb44
2 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/game/Player.cpp
View file

@ -1697,28 +1697,36 @@ bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientati
return false; return false;
} }
MapEntry const* mEntry = sMapStore.LookupEntry(mapid); // Validity checked in IsValidMapCoord
// preparing unsummon pet if lost (we must get pet before teleportation or will not find it later) // preparing unsummon pet if lost (we must get pet before teleportation or will not find it later)
Pet* pet = GetPet(); Pet* pet = GetPet();
MapEntry const* mEntry = sMapStore.LookupEntry(mapid);
// don't let enter battlegrounds without assigned battleground id (for example through areatrigger)... // don't let enter battlegrounds without assigned battleground id (for example through areatrigger)...
// don't let gm level > 1 either // don't let gm level > 1 either
if (!InBattleGround() && mEntry->IsBattleGroundOrArena()) if (!InBattleGround() && mEntry->IsBattleGroundOrArena())
return false; return false;
// Get MapEntrance trigger if teleport to other -nonBG- map
bool assignedAreaTrigger = false;
if (GetMapId() != mapid && !mEntry->IsBattleGroundOrArena() && !at)
{
at = sObjectMgr.GetMapEntranceTrigger(mapid);
assignedAreaTrigger = true;
}
// Check requirements for teleport // Check requirements for teleport
if (GetMapId() != mapid || m_transport || at) // NOT(sameCheckAsBelow) OR at if (at)
{ {
uint32 miscRequirement = 0; uint32 miscRequirement = 0;
AreaLockStatus lockStatus = GetAreaTriggerLockStatus(at ? at : sObjectMgr.GetMapEntranceTrigger(mapid), GetDifficulty(mEntry->IsRaid()), miscRequirement); AreaLockStatus lockStatus = GetAreaTriggerLockStatus(at, GetDifficulty(mEntry->IsRaid()), miscRequirement);
if (lockStatus != AREA_LOCKSTATUS_OK) if (lockStatus != AREA_LOCKSTATUS_OK)
{ {
// Teleport not requested by area-trigger // Teleport not requested by area-trigger
// TODO - Assume a player with expansion 0 travels from BootyBay to Ratched, and he is attempted to be teleported to outlands // TODO - Assume a player with expansion 0 travels from BootyBay to Ratched, and he is attempted to be teleported to outlands
// then he will repop near BootyBay instead of normally continuing his journey // then he will repop near BootyBay instead of normally continuing his journey
// This code is probably added to catch passengers on ships to northrend who shouldn't go there // This code is probably added to catch passengers on ships to northrend who shouldn't go there
if (lockStatus == AREA_LOCKSTATUS_INSUFFICIENT_EXPANSION && !at && GetTransport()) if (lockStatus == AREA_LOCKSTATUS_INSUFFICIENT_EXPANSION && !assignedAreaTrigger && GetTransport())
RepopAtGraveyard(); // Teleport to near graveyard if on transport, looks blizz like :) RepopAtGraveyard(); // Teleport to near graveyard if on transport, looks blizz like :)
SendTransferAbortedByLockStatus(mEntry, lockStatus, miscRequirement); SendTransferAbortedByLockStatus(mEntry, lockStatus, miscRequirement);

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "12213" #define REVISION_NR "12214"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__