aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Server
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2018-11-25 14:28:44 +0100
committerShauren <shauren.trinity@gmail.com>2018-11-25 14:28:44 +0100
commit947771e6bdbeaa8788c373e0659cd8ca95cd96f2 (patch)
tree2bfb80c975e54c9858e9b0fa970e5f51b27e816f /src/server/game/Server
parentb82cb8678db9830d55a975943b0e19905b9ef3f9 (diff)
Core/Taxi: Filter out unreachable nodes from taxi nodes packet
Diffstat (limited to 'src/server/game/Server')
-rw-r--r--src/server/game/Server/Packets/TaxiPackets.cpp8
-rw-r--r--src/server/game/Server/Packets/TaxiPackets.h4
2 files changed, 6 insertions, 6 deletions
diff --git a/src/server/game/Server/Packets/TaxiPackets.cpp b/src/server/game/Server/Packets/TaxiPackets.cpp
index 9e8e552f363..a39e37425f7 100644
--- a/src/server/game/Server/Packets/TaxiPackets.cpp
+++ b/src/server/game/Server/Packets/TaxiPackets.cpp
@@ -36,8 +36,8 @@ WorldPacket const* WorldPackets::Taxi::ShowTaxiNodes::Write()
_worldPacket.WriteBit(WindowInfo.is_initialized());
_worldPacket.FlushBits();
- _worldPacket << uint32(CanLandNodes->size());
- _worldPacket << uint32(CanUseNodes->size());
+ _worldPacket << uint32(CanLandNodes.size());
+ _worldPacket << uint32(CanUseNodes.size());
if (WindowInfo.is_initialized())
{
@@ -45,8 +45,8 @@ WorldPacket const* WorldPackets::Taxi::ShowTaxiNodes::Write()
_worldPacket << uint32(WindowInfo->CurrentNode);
}
- _worldPacket.append(CanLandNodes->data(), CanLandNodes->size());
- _worldPacket.append(CanUseNodes->data(), CanUseNodes->size());
+ _worldPacket.append(CanLandNodes.data(), CanLandNodes.size());
+ _worldPacket.append(CanUseNodes.data(), CanUseNodes.size());
return &_worldPacket;
}
diff --git a/src/server/game/Server/Packets/TaxiPackets.h b/src/server/game/Server/Packets/TaxiPackets.h
index 9e10f7bd442..dbf730a8bd9 100644
--- a/src/server/game/Server/Packets/TaxiPackets.h
+++ b/src/server/game/Server/Packets/TaxiPackets.h
@@ -62,8 +62,8 @@ namespace WorldPackets
WorldPacket const* Write() override;
Optional<ShowTaxiNodesWindowInfo> WindowInfo;
- TaxiMask const* CanLandNodes = nullptr; // Nodes known by player
- TaxiMask const* CanUseNodes = nullptr; // Nodes available for use - this can temporarily disable a known node
+ TaxiMask CanLandNodes; // Nodes known by player
+ TaxiMask CanUseNodes; // Nodes available for use - this can temporarily disable a known node
};
class EnableTaxiNode final : public ClientPacket