sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(Core/Packets): Rewrite various instance packets to modern class. (#22762)

Browse Source
This commit is contained in:
Benjamin Jackson
2026-02-13 09:22:45 -05:00
committed by GitHub
parent c251b46892
commit 24f5f289f0
8 changed files with 258 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Entities/Player/Player.h
+8 -1
View File
@@ -794,6 +794,13 @@ enum InstanceResetWarningType
RAID_INSTANCE_EXPIRED = 5
};
enum InstanceResetFailureReason : uint32
{
INSTANCE_RESET_FAILED = 0, // Cannot reset %s. There are players still inside the instance.
INSTANCE_RESET_FAILED_OFFLINE = 1, // Cannot reset %s. There are players offline in your party.
INSTANCE_RESET_FAILED_ZONING = 2, // Cannot reset %s. There are players in your party attempting to zone into an instance.
};
class InstanceSave;
enum RestFlag
@@ -2010,7 +2017,7 @@ public:
void SendRaidDifficulty(bool IsInGroup, int32 forcedDifficulty = -1);
static void ResetInstances(ObjectGuid guid, uint8 method, bool isRaid);
void SendResetInstanceSuccess(uint32 MapId);
void SendResetInstanceFailed(uint32 reason, uint32 MapId);
void SendResetInstanceFailed(InstanceResetFailureReason reason, uint32 MapId);
void SendResetFailedNotify(uint32 mapid);
bool UpdatePosition(float x, float y, float z, float orientation, bool teleport = false) override;
src/server/game/Entities/Player/PlayerMisc.cpp
+22 -30
View File
@@ -17,6 +17,7 @@
#include "AccountMgr.h"
#include "GameTime.h"
#include "InstancePackets.h"
#include "MapMgr.h"
#include "Player.h"
#include "ScriptMgr.h"
@@ -166,29 +167,25 @@ void Player::SendExplorationExperience(uint32 Area, uint32 Experience)
void Player::SendDungeonDifficulty(bool IsInGroup)
{
uint8 val = 0x00000001;
WorldPacket data(MSG_SET_DUNGEON_DIFFICULTY, 12);
data << (uint32)GetDungeonDifficulty();
data << uint32(val);
data << uint32(IsInGroup);
SendDirectMessage(&data);
WorldPackets::Instance::SetDungeonDifficulty setDungeonDifficulty;
setDungeonDifficulty.Difficulty = GetDungeonDifficulty();
setDungeonDifficulty.IsInGroup = IsInGroup;
SendDirectMessage(setDungeonDifficulty.Write());
}
void Player::SendRaidDifficulty(bool IsInGroup, int32 forcedDifficulty)
{
uint8 val = 0x00000001;
WorldPacket data(MSG_SET_RAID_DIFFICULTY, 12);
data << uint32(forcedDifficulty == -1 ? GetRaidDifficulty() : forcedDifficulty);
data << uint32(val);
data << uint32(IsInGroup);
SendDirectMessage(&data);
WorldPackets::Instance::SetRaidDifficulty setRaidDifficulty;
setRaidDifficulty.Difficulty = (forcedDifficulty == -1 ? GetRaidDifficulty() : forcedDifficulty);
setRaidDifficulty.IsInGroup = IsInGroup;
SendDirectMessage(setRaidDifficulty.Write());
}
void Player::SendResetFailedNotify(uint32 mapid)
{
WorldPacket data(SMSG_RESET_FAILED_NOTIFY, 4);
data << uint32(mapid);
SendDirectMessage(&data);
WorldPackets::Instance::ResetFailedNotify resetFailedNotify;
resetFailedNotify.MapId = mapid;
SendDirectMessage(resetFailedNotify.Write());
}
/// Reset all solo instances and optionally send a message on success for each
@@ -220,7 +217,7 @@ void Player::ResetInstances(ObjectGuid guid, uint8 method, bool isRaid)
}
else
{
p->SendResetInstanceFailed(0, instanceSave->GetMapId());
p->SendResetInstanceFailed(INSTANCE_RESET_FAILED, instanceSave->GetMapId());
}
sInstanceSaveMgr->DeleteInstanceSavedData(instanceSave->GetInstanceId());
@@ -255,7 +252,7 @@ void Player::ResetInstances(ObjectGuid guid, uint8 method, bool isRaid)
}
else
{
p->SendResetInstanceFailed(0, instanceSave->GetMapId());
p->SendResetInstanceFailed(INSTANCE_RESET_FAILED, instanceSave->GetMapId());
}
sInstanceSaveMgr->DeleteInstanceSavedData(instanceSave->GetInstanceId());
@@ -325,22 +322,17 @@ void Player::ResetInstances(ObjectGuid guid, uint8 method, bool isRaid)
void Player::SendResetInstanceSuccess(uint32 MapId)
{
WorldPacket data(SMSG_INSTANCE_RESET, 4);
data << uint32(MapId);
SendDirectMessage(&data);
WorldPackets::Instance::InstanceReset instanceReset;
instanceReset.MapId = MapId;
SendDirectMessage(instanceReset.Write());
}
void Player::SendResetInstanceFailed(uint32 reason, uint32 MapId)
void Player::SendResetInstanceFailed(InstanceResetFailureReason reason, uint32 MapId)
{
/*reasons for instance reset failure:
// 0: There are players inside the instance.
// 1: There are players offline in your party.
// 2>: There are players in your party attempting to zone into an instance.
*/
WorldPacket data(SMSG_INSTANCE_RESET_FAILED, 4);
data << uint32(reason);
data << uint32(MapId);
SendDirectMessage(&data);
WorldPackets::Instance::InstanceResetFailed instanceResetFailed;
instanceResetFailed.Reason = reason;
instanceResetFailed.MapId = MapId;
SendDirectMessage(instanceResetFailed.Write());
}
/*********************************************************/