araxiaonline/TrinityCore
3
0
Fork 0
mirror of https://github.com/araxiaonline/TrinityCore.git synced 2026-06-13 03:32:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Core/PacketIO: Fix some DifficultyID types in packets

Browse Source
This commit is contained in:
Shauren
2026-02-05 11:15:26 +01:00
parent e07137ab23
commit bee853f11f
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/server/game/Server/Packets/CalendarPackets.cpp
View File

@@ -40,10 +40,10 @@ ByteBuffer& operator<<(ByteBuffer& data, CalendarSendCalendarEventInfo const& ev
ByteBuffer& operator<<(ByteBuffer& data, CalendarSendCalendarRaidLockoutInfo const& lockoutInfo)
{
data << uint64(lockoutInfo.InstanceID);
data << int32(lockoutInfo.MapID);
data << uint32(lockoutInfo.DifficultyID);
data << int16(lockoutInfo.DifficultyID);
data << int32(lockoutInfo.ExpireTime);
data << uint64(lockoutInfo.InstanceID);
return data;
}

4
src/server/game/Server/Packets/CalendarPackets.h
View File

@@ -173,10 +173,10 @@ namespace WorldPackets
struct CalendarSendCalendarRaidLockoutInfo
{
uint64 InstanceID = 0;
int32 MapID = 0;
uint32 DifficultyID = 0;
int16 DifficultyID = 0;
int32 ExpireTime = 0;
uint64 InstanceID = 0;
};
struct CalendarSendCalendarEventInfo

2
src/server/game/Server/Packets/ScenarioPackets.cpp
View File

@@ -44,7 +44,7 @@ WorldPacket const* ScenarioState::Write()
_worldPacket << ScenarioGUID;
_worldPacket << int32(ScenarioID);
_worldPacket << int32(CurrentStep);
_worldPacket << uint32(DifficultyID);
_worldPacket << int16(DifficultyID);
_worldPacket << uint32(WaveCurrent);
_worldPacket << uint32(WaveMax);
_worldPacket << uint32(TimerDuration);

4
src/server/game/Server/Packets/ScenarioPackets.h
View File

@@ -50,7 +50,8 @@ public:
ObjectGuid ScenarioGUID;
int32 ScenarioID = 0;
int32 CurrentStep = -1;
uint32 DifficultyID = 0;
bool ScenarioComplete = false;
int16 DifficultyID = 0;
uint32 WaveCurrent = 0;
uint32 WaveMax = 0;
uint32 TimerDuration = 0;
@@ -59,7 +60,6 @@ public:
std::vector<uint32> PickedSteps;
std::vector<ScenarioSpellUpdate> Spells;
ObjectGuid PlayerGUID;
bool ScenarioComplete = false;
};
class ScenarioProgressUpdate final : public ServerPacket