Fix Voice Graft to allow you to speak by targetting yourself.

This commit is contained in:
Paul Coene 2016-07-09 15:40:19 -04:00
parent 9a010a90a9
commit 56fcabc119

View File

@ -886,7 +886,7 @@ void Client::ChannelMessageReceived(uint8 chan_num, uint8 language, uint8 lang_s
} }
case 3: { /* Shout */ case 3: { /* Shout */
Mob *sender = this; Mob *sender = this;
if (GetPet() && GetPet()->FindType(SE_VoiceGraft)) if (GetTarget() != this && GetPet() && GetPet()->FindType(SE_VoiceGraft))
sender = GetPet(); sender = GetPet();
entity_list.ChannelMessage(sender, chan_num, language, lang_skill, message); entity_list.ChannelMessage(sender, chan_num, language, lang_skill, message);
@ -924,7 +924,7 @@ void Client::ChannelMessageReceived(uint8 chan_num, uint8 language, uint8 lang_s
else if(!RuleB(Chat, ServerWideAuction)) { else if(!RuleB(Chat, ServerWideAuction)) {
Mob *sender = this; Mob *sender = this;
if (GetPet() && GetPet()->FindType(SE_VoiceGraft)) if (GetTarget() != this && GetPet() && GetPet()->FindType(SE_VoiceGraft))
sender = GetPet(); sender = GetPet();
entity_list.ChannelMessage(sender, chan_num, language, message); entity_list.ChannelMessage(sender, chan_num, language, message);
@ -971,7 +971,7 @@ void Client::ChannelMessageReceived(uint8 chan_num, uint8 language, uint8 lang_s
{ {
Mob *sender = this; Mob *sender = this;
if (GetPet() && GetPet()->FindType(SE_VoiceGraft)) if (GetTarget() != this && GetPet() && GetPet()->FindType(SE_VoiceGraft))
sender = GetPet(); sender = GetPet();
entity_list.ChannelMessage(sender, chan_num, language, message); entity_list.ChannelMessage(sender, chan_num, language, message);
@ -1069,7 +1069,7 @@ void Client::ChannelMessageReceived(uint8 chan_num, uint8 language, uint8 lang_s
#endif #endif
Mob* sender = this; Mob* sender = this;
if (GetPet() && GetPet()->FindType(SE_VoiceGraft)) if (GetTarget() != this && GetPet() && GetPet()->FindType(SE_VoiceGraft))
sender = GetPet(); sender = GetPet();
entity_list.ChannelMessage(sender, chan_num, language, lang_skill, message); entity_list.ChannelMessage(sender, chan_num, language, lang_skill, message);