aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/server/game/Handlers/MiscHandler.cpp6
-rw-r--r--src/server/game/Server/Packets/CharacterPackets.cpp2
-rw-r--r--src/server/game/Server/Packets/CharacterPackets.h2
3 files changed, 5 insertions, 5 deletions
diff --git a/src/server/game/Handlers/MiscHandler.cpp b/src/server/game/Handlers/MiscHandler.cpp
index 3e2485134eb..6af14d53d50 100644
--- a/src/server/game/Handlers/MiscHandler.cpp
+++ b/src/server/game/Handlers/MiscHandler.cpp
@@ -1163,12 +1163,12 @@ void WorldSession::HandleSetActionBarToggles(WorldPackets::Character::SetActionB
{
if (!GetPlayer()) // ignore until not logged (check needed because STATUS_AUTHED)
{
- if (packet.ActionBar != 0)
- TC_LOG_ERROR("network", "WorldSession::HandleSetActionBarToggles in not logged state with value: %u, ignored", uint32(packet.ActionBar));
+ if (packet.Mask != 0)
+ TC_LOG_ERROR("network", "WorldSession::HandleSetActionBarToggles in not logged state with value: %u, ignored", uint32(packet.Mask));
return;
}
- GetPlayer()->SetByteValue(PLAYER_FIELD_BYTES, 2, packet.ActionBar);
+ GetPlayer()->SetByteValue(PLAYER_FIELD_BYTES, 2, packet.Mask);
}
void WorldSession::HandlePlayedTime(WorldPacket& recvData)
diff --git a/src/server/game/Server/Packets/CharacterPackets.cpp b/src/server/game/Server/Packets/CharacterPackets.cpp
index 0bc3ab7c469..8b3d92dd1ff 100644
--- a/src/server/game/Server/Packets/CharacterPackets.cpp
+++ b/src/server/game/Server/Packets/CharacterPackets.cpp
@@ -392,5 +392,5 @@ WorldPacket const* WorldPackets::Character::InitialSetup::Write()
void WorldPackets::Character::SetActionBarToggles::Read()
{
- _worldPacket >> ActionBar;
+ _worldPacket >> Mask;
}
diff --git a/src/server/game/Server/Packets/CharacterPackets.h b/src/server/game/Server/Packets/CharacterPackets.h
index b1e1e8784db..4479bb3ddaf 100644
--- a/src/server/game/Server/Packets/CharacterPackets.h
+++ b/src/server/game/Server/Packets/CharacterPackets.h
@@ -509,7 +509,7 @@ namespace WorldPackets
void Read() override;
- uint8 ActionBar = 0;
+ uint8 Mask = 0;
};
}
}