ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-12 18:27:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #59 from ff-meli/player_name_fix

Browse source 
fix discord name handling (and subsequent character lookup) of local player chats in party/alliance
This commit is contained in:
goaaats 2020-03-20 11:44:11 +09:00 • committed by GitHub
commit 350f9ab3c3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Dalamud/DiscordBot/DiscordBotManager.cs
View file

@ -189,12 +189,20 @@ namespace Dalamud.DiscordBot {
if (playerLink == null) { if (playerLink == null) {
// chat messages from the local player do not include a player link, and are just the raw name // chat messages from the local player do not include a player link, and are just the raw name
// but we should still track other instances to know if this is ever an issue otherwise // but we should still track other instances to know if this is ever an issue otherwise
if (parsedSender.TextValue != this.dalamud.ClientState.LocalPlayer.Name)
// Special case 2 - When the local player talks in party/alliance, the name comes through as raw text,
// but prefixed by their position number in the party (which for local player may always be 1)
if (parsedSender.TextValue.EndsWith(this.dalamud.ClientState.LocalPlayer.Name))
{
senderName = this.dalamud.ClientState.LocalPlayer.Name;
}
else
{ {
Log.Error("playerLink was null. Sender: {0}", BitConverter.ToString(sender.RawData)); Log.Error("playerLink was null. Sender: {0}", BitConverter.ToString(sender.RawData));
senderName = wasOutgoingTell ? this.dalamud.ClientState.LocalPlayer.Name : parsedSender.TextValue;
} }
senderName = wasOutgoingTell ? this.dalamud.ClientState.LocalPlayer.Name : parsedSender.TextValue;
senderWorld = this.dalamud.ClientState.LocalPlayer.HomeWorld.Name; senderWorld = this.dalamud.ClientState.LocalPlayer.HomeWorld.Name;
} else { } else {
playerLink.Resolve(); playerLink.Resolve();