public/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/liyunfan1223/azerothcore-wotlk.git synced 2026-08-08 15:58:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(Scripts/Commands): deserter add now also kicks from bg or group (#24451)

Browse Source
This commit is contained in:
sogladev
2026-01-20 23:49:09 +01:00
committed by GitHub
parent d5b59552e2
commit 253eb1997a
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/server/game/Entities/Player/Player.cpp
View File

@@ -1642,12 +1642,9 @@ void Player::ProcessDelayedOperations()
if (m_DelayedOperations & DELAYED_SAVE_PLAYER) if (m_DelayedOperations & DELAYED_SAVE_PLAYER)
SaveToDB(false, false); SaveToDB(false, false);
if (m_DelayedOperations & DELAYED_SPELL_CAST_DESERTER) if ((m_DelayedOperations & DELAYED_SPELL_CAST_DESERTER)
{ && !GetAura(26013))
Aura* aura = GetAura(26013);
if (!aura || aura->GetDuration() <= 900000)
CastSpell(this, 26013, true); CastSpell(this, 26013, true);
}
if (m_DelayedOperations & DELAYED_BG_MOUNT_RESTORE) if (m_DelayedOperations & DELAYED_BG_MOUNT_RESTORE)
{ {

11
src/server/scripts/Commands/cs_deserter.cpp
View File

@@ -24,6 +24,7 @@
#include "Chat.h" #include "Chat.h"
#include "CommandScript.h" #include "CommandScript.h"
#include "GroupMgr.h"
#include "Language.h" #include "Language.h"
#include "Player.h" #include "Player.h"
#include "SpellAuras.h" #include "SpellAuras.h"
@@ -211,6 +212,16 @@ public:
CharacterDatabase.Execute(stmt); CharacterDatabase.Execute(stmt);
} }
if (isInstance)
{
if (ObjectGuid groupId = sCharacterCache->GetCharacterGroupGuidByGuid(guid))
if (Group* group = sGroupMgr->GetGroupByGUID(groupId.GetCounter()))
if (group->isLFGGroup())
Player::RemoveFromGroup(group, guid);
}
else if (target && target->GetMap()->IsBattleground())
target->LeaveBattleground();
handler->PSendSysMessage("{} of {} Deserter has been added to player {}.", secsToTimeString(duration), isInstance ? "Instance" : "Battleground", handler->playerLink(*playerName)); handler->PSendSysMessage("{} of {} Deserter has been added to player {}.", secsToTimeString(duration), isInstance ? "Instance" : "Battleground", handler->playerLink(*playerName));
return true; return true;
} }