Skip to content

Commit eba7b3d

Browse files
mduraobladezLH
authored andcommitted
Gm command face me (#231)
* wip * wip #2 * wip #3 * wip #4 * wip #5 * wip #6 * wip #7 * wip #8 * wip #9 * wip #10 * wip #11 * wip #12 * wip #13 * wip #14 * wip #15 * wip #16 * wip #17 * wip #18 * wip #19 * wip #20 * wip #21 * Use InterruptNonMeleeSpells instead of CastSpell
1 parent d1ec3f3 commit eba7b3d

3 files changed

Lines changed: 26 additions & 4 deletions

File tree

src/game/Chat/Chat.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -972,7 +972,7 @@ ChatCommand * ChatHandler::getCommandTable()
972972
{ NODE, "", SEC_GAMEMASTER, true, &ChatHandler::HandleGMTicketGetByIdOrNameCommand, "", nullptr },
973973
{ MSTR, nullptr, 0, false,nullptr, "", nullptr }
974974
};
975-
975+
976976
static ChatCommand serviceCommandTable[] =
977977
{
978978
{ NODE, "del_characters", SEC_ADMINISTRATOR, true, &ChatHandler::HandleServiceDeleteCharacters, "", nullptr },
@@ -1055,6 +1055,7 @@ ChatCommand * ChatHandler::getCommandTable()
10551055
{ NODE, "commands", SEC_PLAYER, true, &ChatHandler::HandleCommandsCommand, "", nullptr },
10561056
{ NODE, "demorph", SEC_GAMEMASTER, false, &ChatHandler::HandleDeMorphCommand, "", nullptr },
10571057
{ NODE, "die", SEC_ADMINISTRATOR, false, &ChatHandler::HandleDieCommand, "", nullptr },
1058+
{ NODE, "faceme", SEC_MODERATOR, false, &ChatHandler::HandleFacemeCommand, "", nullptr },
10581059
{ NODE, "fear", SEC_GAMEMASTER, false, &ChatHandler::HandleFearCommand, "", nullptr },
10591060
{ NODE, "revive", SEC_ADMINISTRATOR, true, &ChatHandler::HandleReviveCommand, "", nullptr },
10601061
{ NODE, "dismount", SEC_PLAYER, false, &ChatHandler::HandleDismountCommand, "", nullptr },

src/game/Chat/Chat.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ class MANGOS_DLL_SPEC ChatHandler
412412
bool HandleDebugPlaySoundCommand(char* args);
413413
bool HandleDebugPlayScriptText(char* args);
414414
bool HandleDebugPlayMusicCommand(char* args);
415-
415+
416416
bool HandleDebugSendBuyErrorCommand(char* args);
417417
bool HandleDebugSendChannelNotifyCommand(char* args);
418418
bool HandleDebugSendChatMsgCommand(char* args);
@@ -809,6 +809,7 @@ class MANGOS_DLL_SPEC ChatHandler
809809
bool HandleGetAngleCommand(char* args);
810810
bool HandleModifyStandStateCommand(char* args);
811811
bool HandleDieCommand(char* args);
812+
bool HandleFacemeCommand(char* args);
812813
bool HandleFearCommand(char* args);
813814
bool HandleDamageCommand(char* args);
814815
bool HandleReviveCommand(char* args);

src/game/Commands/Level3.cpp

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1125,7 +1125,7 @@ bool ChatHandler::HandleRemoveRidingCommand(char* args)
11251125
}
11261126

11271127
auto it = skills.find(args);
1128-
1128+
11291129
if (it == skills.end())
11301130
{
11311131
std::stringstream options;
@@ -2434,7 +2434,7 @@ bool ChatHandler::HandleDeleteItemCommand(char* args)
24342434
SetSentErrorMessage(true);
24352435
return false;
24362436
}
2437-
2437+
24382438
if (!CharacterDatabase.DirectPExecute("DELETE FROM character_inventory WHERE item = %u", guid))
24392439
{
24402440
SendSysMessage("Encountered an error while attempting to remove item from inventory");
@@ -3906,6 +3906,26 @@ bool ChatHandler::HandleGetAngleCommand(char* args)
39063906
return true;
39073907
}
39083908

3909+
bool ChatHandler::HandleFacemeCommand(char* /*args*/)
3910+
{
3911+
Unit* target = getSelectedUnit();
3912+
if (!target || !m_session->GetPlayer()->GetSelectionGuid())
3913+
{
3914+
SendSysMessage(LANG_SELECT_CHAR_OR_CREATURE);
3915+
SetSentErrorMessage(true);
3916+
return false;
3917+
}
3918+
3919+
if (target->GetTypeId() == TYPEID_PLAYER)
3920+
{
3921+
target->InterruptNonMeleeSpells(true);
3922+
target->SetFacingToObject(m_session->GetPlayer());
3923+
PSendSysMessage("%s is facing you.", GetNameLink((Player*) target).c_str());
3924+
}
3925+
3926+
return true;
3927+
}
3928+
39093929
bool ChatHandler::HandleDieCommand(char* /*args*/)
39103930
{
39113931
Unit* target = getSelectedUnit();

0 commit comments

Comments
 (0)