Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-19 00:48:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Transport: Prevent creature passengers from teleporting to an invalid grid.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
linencloth
2010-10-25 02:30:50 +02:00
parent 910264070c
commit 3742e8ddec
3 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/server/game/Entities/Transport/Transport.cpp
View File

@@ -236,8 +236,6 @@ bool Transport::Create(uint32 guidlow, uint32 entry, uint32 mapid, float x, floa
if (dynflags)
SetUInt32Value(GAMEOBJECT_DYNAMIC, MAKE_PAIR32(0, dynflags));
setActive(true);
SetName(goinfo->name);
SetZoneScript();
@@ -516,8 +514,6 @@ void Transport::TeleportTransport(uint32 newMapid, float x, float y, float z)
ASSERT (GetMap());
AddToWorld();
setActive(true);
if (oldMap != newMap)
{
UpdateForMap(oldMap);
@@ -526,8 +522,6 @@ void Transport::TeleportTransport(uint32 newMapid, float x, float y, float z)
for (CreatureSet::iterator itr = m_NPCPassengerSet.begin(); itr != m_NPCPassengerSet.end(); ++itr)
(*itr)->FarTeleportTo(newMap, x, y, z, (*itr)->GetOrientation());
UpdateNPCPositions();
}
bool Transport::AddPassenger(Player* passenger)
@@ -708,10 +702,9 @@ void Transport::UpdatePosition(MovementInfo* mi)
void Transport::UpdateNPCPositions()
{
// We update the positions of all NPCs
for(CreatureSet::iterator itr = m_NPCPassengerSet.begin(); itr != m_NPCPassengerSet.end();)
for (CreatureSet::iterator itr = m_NPCPassengerSet.begin(); itr != m_NPCPassengerSet.end(); ++itr)
{
Creature* npc = *(itr++);
Creature* npc = *itr;
float x, y, z, o;
o = GetOrientation() + npc->m_movementInfo.t_pos.m_orientation;
@@ -719,6 +712,6 @@ void Transport::UpdateNPCPositions()
y = GetPositionY() + (npc->m_movementInfo.t_pos.m_positionY * cos(GetOrientation()) + npc->m_movementInfo.t_pos.m_positionX * sin(GetOrientation()));
z = GetPositionZ() + npc->m_movementInfo.t_pos.m_positionZ;
npc->SetHomePosition(x, y, z, o);
GetMap()->CreatureRelocation(npc, x, y, z, o);
GetMap()->CreatureRelocation(npc, x, y, z, o, false);
}
}

5
src/server/game/Maps/Map.cpp
View File

@@ -779,7 +779,7 @@ Map::PlayerRelocation(Player *player, float x, float y, float z, float orientati
}
void
Map::CreatureRelocation(Creature *creature, float x, float y, float z, float ang)
Map::CreatureRelocation(Creature *creature, float x, float y, float z, float ang, bool respawnRelocationOnFail)
{
ASSERT(CheckGridIntegrity(creature,false));
@@ -788,6 +788,9 @@ Map::CreatureRelocation(Creature *creature, float x, float y, float z, float ang
CellPair new_val = Trinity::ComputeCellPair(x, y);
Cell new_cell(new_val);
if (!respawnRelocationOnFail && !getNGrid(new_cell.GridX(), new_cell.GridY()))
return;
// delay creature move for grid/cell to grid/cell moves
if (old_cell.DiffCell(new_cell) || old_cell.DiffGrid(new_cell))
{

2
src/server/game/Maps/Map.h
View File

@@ -276,7 +276,7 @@ class Map : public GridRefManager<NGridType>
virtual void InitVisibilityDistance();
void PlayerRelocation(Player *, float x, float y, float z, float orientation);
void CreatureRelocation(Creature *creature, float x, float y, float z, float ang);
void CreatureRelocation(Creature *creature, float x, float y, float z, float ang, bool respawnRelocationOnFail = true);
template<class T, class CONTAINER> void Visit(const Cell& cell, TypeContainerVisitor<T, CONTAINER> &visitor);