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

Merge branch '4.3.4' of https://gitlab.com/trinitycore/TrinityCore_434 into 4.3.4

Browse Source
This commit is contained in:
Ovahlord
2018-03-19 12:43:12 +01:00
parent 0729695a56 97bd2e2f2f
commit 09870ef250
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/DataStores/DBCFileLoader.h
View File

@@ -22,7 +22,7 @@
#include "Utilities/ByteConverter.h"
#include <cassert>
class TC_SHARED_API DBCFileLoader
class TC_COMMON_API DBCFileLoader
{
public:
DBCFileLoader();

2
src/server/game/Entities/Player/Player.cpp
View File

@@ -2626,7 +2626,7 @@ bool Player::IsInAreaTriggerRadius(const AreaTriggerEntry* trigger) const
if (!trigger)
return false;
if (int32(GetMapId()) != trigger->mapid && !GetPhaseShift().HasVisibleMapId(trigger->mapid))
if (GetMapId() != trigger->mapid && !GetPhaseShift().HasVisibleMapId(trigger->mapid))
return false;
if (trigger->PhaseID || trigger->PhaseGroupID || trigger->PhaseUseFlags)

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

@@ -507,6 +507,7 @@ void Transport::UpdatePosition(float x, float y, float z, float o)
Cell oldCell(GetPositionX(), GetPositionY());
Relocate(x, y, z, o);
m_stationaryPosition.SetOrientation(o);
UpdateModelPosition();
UpdatePassengerPositions(_passengers);
@@ -619,6 +620,8 @@ bool Transport::TeleportTransport(uint32 newMapid, float x, float y, float z, fl
}
else
{
UpdatePosition(x, y, z, o);
// Teleport players, they need to know it
for (PassengerSet::iterator itr = _passengers.begin(); itr != _passengers.end(); ++itr)
{
@@ -637,7 +640,6 @@ bool Transport::TeleportTransport(uint32 newMapid, float x, float y, float z, fl
}
}
UpdatePosition(x, y, z, o);
return false;
}
}