aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Entities
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2017-11-11 17:11:00 +0100
committerShauren <shauren.trinity@gmail.com>2017-12-30 00:23:43 +0100
commit20a3c9eed2b201e36333a83e3b2d28d6f16d69bd (patch)
tree3b2709f61f841d9b32ced513f7bc5abc04649ff2 /src/server/game/Entities
parent90834606a23a673080c17795f605298835c728af (diff)
Core/PacketIO: Update opcodes to 7.3.2
Diffstat (limited to 'src/server/game/Entities')
-rw-r--r--src/server/game/Entities/Player/Player.cpp1
-rw-r--r--src/server/game/Entities/Player/PlayerTaxi.cpp10
2 files changed, 9 insertions, 2 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 6983f0b8c49..321402ccce3 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -1620,6 +1620,7 @@ bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientati
// send transfer packets
WorldPackets::Movement::TransferPending transferPending;
transferPending.MapID = mapid;
+ transferPending.OldMapPosition = GetPosition();
if (Transport* transport = GetTransport())
{
transferPending.Ship = boost::in_place();
diff --git a/src/server/game/Entities/Player/PlayerTaxi.cpp b/src/server/game/Entities/Player/PlayerTaxi.cpp
index 1b6accbc88a..36b9b688929 100644
--- a/src/server/game/Entities/Player/PlayerTaxi.cpp
+++ b/src/server/game/Entities/Player/PlayerTaxi.cpp
@@ -110,9 +110,15 @@ void PlayerTaxi::LoadTaxiMask(std::string const &data)
void PlayerTaxi::AppendTaximaskTo(WorldPackets::Taxi::ShowTaxiNodes& data, bool all)
{
if (all)
- data.Nodes = &sTaxiNodesMask; // all existed nodes
+ {
+ data.CanLandNodes = &sTaxiNodesMask; // all existed nodes
+ data.CanUseNodes = &sTaxiNodesMask;
+ }
else
- data.Nodes = &m_taximask; // known nodes
+ {
+ data.CanLandNodes = &m_taximask; // known nodes
+ data.CanUseNodes = &m_taximask;
+ }
}
bool PlayerTaxi::LoadTaxiDestinationsFromString(const std::string& values, uint32 team)