Skip to content

Fileserver fix #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
EtienneDesticourt wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Fileserver fix #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
398e5a1
Fix friendlist duplicate entries dictionary crash, added packet sniff…
EtienneDesticourt Dec 23, 2015
af15d34
Modified packet sniffer hook to take filePath at install
EtienneDesticourt Dec 23, 2015
231f43f
Removed packet sniffer and erroneous packet id
EtienneDesticourt Apr 18, 2016
a9ab82e
Readded white space
EtienneDesticourt Apr 19, 2016
bb25cdf
Removed white space
EtienneDesticourt Apr 19, 2016
01d57a7
Removed change not related to friendlist fix
EtienneDesticourt Apr 19, 2016
6bb642f
Merge pull request #1 from entice/friendlist-fix
Darth-Alex May 12, 2016
b7f140e
Updated fileserver response
EtienneDesticourt May 20, 2016
0a1c265
Update Network.cs
EtienneDesticourt May 20, 2016
e23b97a
Update Network.cs
EtienneDesticourt May 20, 2016
2384e6c
Removed newline char
EtienneDesticourt May 20, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion GuildWarsInterface/Datastructures/Components/FriendList.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,14 @@ public void Add(Type type, string baseCharacterName, string currentCharacterName
{
var newEntry = new Entry(type, baseCharacterName, currentCharacterName, playerStatus, map);

_entries.Add(newEntry.BaseCharacterName, newEntry);
if (!_entries.ContainsKey(newEntry.BaseCharacterName))
{
_entries.Add(newEntry.BaseCharacterName, newEntry);
}
else
{
_entries[newEntry.BaseCharacterName] = newEntry;
}

if (Game.State == GameState.Playing)
{
Expand Down Expand Up @@ -82,6 +89,7 @@ private static void UpdateEntry(Entry entry)
{
Network.AuthServer.Send(AuthServerMessage.UpdateFriendList, (uint) entry.PlayerStatus, entry.BaseCharacterName, entry.CurrentCharacterName);

//If a map was specified, show it next to name
if (entry.Map != 0)
{
Network.AuthServer.Send(AuthServerMessage.FriendListLocationInfo, (uint) entry.Map,
Expand Down
2 changes: 1 addition & 1 deletion GuildWarsInterface/Networking/Network.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@ public static void Initialize()
GameServer.Start();
}
}
}
}
2 changes: 1 addition & 1 deletion GuildWarsInterface/Networking/Protocol/AuthServerMessage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ internal enum AuthServerMessage
FriendListLocationInfo = 32,
Response53 = 38,
}
}
}
6 changes: 3 additions & 3 deletions GuildWarsInterface/Networking/Servers/FileServer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ protected override void Received(byte[] data)
Send(new byte[]
{
0xF1, 0x02, 0x20, 0x00, 0x6F, 0xC0, 0x05, 0x00,
0x7E, 0xC9, 0x05, 0x00, 0x9C, 0x43, 0x05, 0x00,
0x8C, 0xC9, 0x05, 0x00, 0x8D, 0xC9, 0x05, 0x00,
0x8E, 0xC9, 0x05, 0x00, 0x8B, 0xC9, 0x05, 0x00
0xB3, 0xC9, 0x05, 0x00, 0x9C, 0x43, 0x05, 0x00,
0xB5, 0xC9, 0x05, 0x00, 0xB6, 0xC9, 0x05, 0x00,
0xB7, 0xC9, 0x05, 0x00, 0xB4, 0xC9, 0x05, 0x00
});
}
}
Expand Down