Core/Players: Fixed issues with incorrect targets being selected for spells
This commit is contained in:
1 parent
dd4404e6e3
commit
a368fae588
15 files changed
+93
-102
No files matched your search
@@ -529,7 +529,7 @@ public:
|
||||
{
|
||||
Unit* target = handler->getSelectedUnit();
|
||||
|
||||
if (!target || !handler->GetSession()->GetPlayer()->GetSelection())
|
||||
if (!target || !handler->GetSession()->GetPlayer()->GetTarget())
|
||||
{
|
||||
handler->SendSysMessage(LANG_SELECT_CHAR_OR_CREATURE);
|
||||
handler->SetSentErrorMessage(true);
|
||||
@@ -597,7 +597,7 @@ public:
|
||||
|
||||
static bool HandleGUIDCommand(ChatHandler* handler, char const* /*args*/)
|
||||
{
|
||||
uint64 guid = handler->GetSession()->GetPlayer()->GetSelection();
|
||||
uint64 guid = handler->GetSession()->GetPlayer()->GetTarget();
|
||||
|
||||
if (guid == 0)
|
||||
{
|
||||
@@ -1762,7 +1762,7 @@ public:
|
||||
|
||||
// accept only explicitly selected target (not implicitly self targeting case)
|
||||
Unit* target = handler->getSelectedUnit();
|
||||
if (player->GetSelection() && target)
|
||||
if (player->GetTarget() && target)
|
||||
{
|
||||
if (target->GetTypeId() != TYPEID_UNIT || target->IsPet())
|
||||
{
|
||||
@@ -2107,7 +2107,7 @@ public:
|
||||
}
|
||||
|
||||
Unit* target = handler->getSelectedUnit();
|
||||
if (!target || !handler->GetSession()->GetPlayer()->GetSelection())
|
||||
if (!target || !handler->GetSession()->GetPlayer()->GetTarget())
|
||||
{
|
||||
handler->SendSysMessage(LANG_SELECT_CHAR_OR_CREATURE);
|
||||
handler->SetSentErrorMessage(true);
|
||||
|
||||
Reference in new issue
Block a user