From e0f680131ee8ac739f6cf8d67b947331e1e82704 Mon Sep 17 00:00:00 2001 From: Aokromes Date: Sun, 18 Mar 2018 14:09:49 +0100 Subject: [PATCH 1/3] Make travis happy, this time for real --- src/common/DataStores/DBCFileLoader.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/DataStores/DBCFileLoader.h b/src/common/DataStores/DBCFileLoader.h index 377ef8cafc1..1b675452aae 100644 --- a/src/common/DataStores/DBCFileLoader.h +++ b/src/common/DataStores/DBCFileLoader.h @@ -22,7 +22,7 @@ #include "Utilities/ByteConverter.h" #include -class TC_SHARED_API DBCFileLoader +class TC_COMMON_API DBCFileLoader { public: DBCFileLoader(); From e0dd75b62611b5f6249f41ff4505a71d65787996 Mon Sep 17 00:00:00 2001 From: Aokromes Date: Sun, 18 Mar 2018 19:47:39 +0100 Subject: [PATCH 2/3] warning fix --- src/server/game/Entities/Player/Player.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 3a95b677de5..051a15db216 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -2587,7 +2587,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) From 97bd2e2f2fd090a678091400106329ca40a31be8 Mon Sep 17 00:00:00 2001 From: Shauren Date: Mon, 19 Mar 2018 00:22:55 +0100 Subject: [PATCH 3/3] Core/Movement: Fixed transport teleports on the same map (and teleporting on transports too) --- src/server/game/Entities/Transport/Transport.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/server/game/Entities/Transport/Transport.cpp b/src/server/game/Entities/Transport/Transport.cpp index 6df61e1cc8b..a85bcc4aa53 100644 --- a/src/server/game/Entities/Transport/Transport.cpp +++ b/src/server/game/Entities/Transport/Transport.cpp @@ -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; } }