wonderking/continuity
2
0
Fork 0
Code Issues Pull requests 16 Projects 1 Releases Packages 1 Wiki Activity Actions

fix: adjustment to packet offsets

Browse source
This commit is contained in:
Timothy Schenk 2023-11-16 12:49:28 +01:00
parent dd4ed0a67b
commit 873ab306a5
2 changed files with 32 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Server/PacketHandlers/CharacterCreationHandler..cs
View file

@ -61,6 +61,9 @@ public class CharacterCreationHandler : IPacketHandler<CharacterCreationPacket>
}); });
await _wonderkingContext.SaveChangesAsync().ConfigureAwait(true); await _wonderkingContext.SaveChangesAsync().ConfigureAwait(true);
var amountOfCharacters = await _wonderkingContext.Characters.AsNoTrackingWithIdentityResolution()
.CountAsync(c => authSession != null && c.Account.Id == authSession.AccountId).ConfigureAwait(true);
var character = await _wonderkingContext.Characters.AsNoTrackingWithIdentityResolution() var character = await _wonderkingContext.Characters.AsNoTrackingWithIdentityResolution()
.Where(c => authSession != null && c.Account.Id == authSession.AccountId && c.Name == packet.Name) .Where(c => authSession != null && c.Account.Id == authSession.AccountId && c.Name == packet.Name)
.Select(c => .Select(c =>
@ -83,6 +86,11 @@ public class CharacterCreationHandler : IPacketHandler<CharacterCreationPacket>
.Select(item => item.ItemId) .Select(item => item.ItemId)
.ToArray(), .ToArray(),
}).FirstAsync().ConfigureAwait(true); }).FirstAsync().ConfigureAwait(true);
authSession?.Send(new CharacterCreationResponsePacket { Character = character }); authSession?.Send(new CharacterCreationResponsePacket
{
Character = character,
Slot = amountOfCharacters - 1,
isDuplicate = false,
});
} }
} }

44
Wonderking/Packets/Outgoing/CharacterCreationResponsePacket.cs
View file

@ -8,6 +8,8 @@ namespace Wonderking.Packets.Outgoing;
public class CharacterCreationResponsePacket : IPacket public class CharacterCreationResponsePacket : IPacket
{ {
public required CharacterData Character { get; set; } public required CharacterData Character { get; set; }
public required int Slot { get; set; }
public required bool isDuplicate { get; set; }
public void Deserialize(byte[] data) public void Deserialize(byte[] data)
{ {
@ -16,40 +18,40 @@ public class CharacterCreationResponsePacket : IPacket
public byte[] Serialize() public byte[] Serialize()
{ {
Span<byte> data = stackalloc byte[132]; Span<byte> data = stackalloc byte[1 + 132];
data[0] = isDuplicate ? (byte)1 : (byte)0;
BinaryPrimitives.WriteInt32LittleEndian(data.Slice(0, 4), 0); BinaryPrimitives.WriteInt32LittleEndian(data.Slice(1, 4), Slot);
Encoding.ASCII.GetBytes(Character.Name, data.Slice(4, 20)); Encoding.ASCII.GetBytes(Character.Name, data.Slice(5, 20));
// Job Data // Job Data
data[24] = Character.Job.FirstJob; data[25] = Character.Job.FirstJob;
data[25] = Character.Job.SecondJob; data[26] = Character.Job.SecondJob;
data[26] = Character.Job.ThirdJob; data[27] = Character.Job.ThirdJob;
data[27] = Character.Job.FourthJob; data[28] = Character.Job.FourthJob;
data[28] = (byte)Character.Gender; data[29] = (byte)Character.Gender;
BinaryPrimitives.WriteUInt16LittleEndian(data.Slice(49, 2), Character.Level); BinaryPrimitives.WriteUInt16LittleEndian(data.Slice(30, 2), Character.Level);
data[31] = (byte)Character.Experience; data[32] = (byte)Character.Experience;
// Stats // Stats
BinaryPrimitives.WriteInt16LittleEndian(data.Slice(32, 2), Character.Stats.Strength); BinaryPrimitives.WriteInt16LittleEndian(data.Slice(33, 2), Character.Stats.Strength);
BinaryPrimitives.WriteInt16LittleEndian(data.Slice(34, 2), Character.Stats.Dexterity); BinaryPrimitives.WriteInt16LittleEndian(data.Slice(35, 2), Character.Stats.Dexterity);
BinaryPrimitives.WriteInt16LittleEndian(data.Slice(36, 2), Character.Stats.Intelligence); BinaryPrimitives.WriteInt16LittleEndian(data.Slice(37, 2), Character.Stats.Intelligence);
BinaryPrimitives.WriteInt16LittleEndian(data.Slice(38, 2), Character.Stats.Vitality); BinaryPrimitives.WriteInt16LittleEndian(data.Slice(39, 2), Character.Stats.Vitality);
BinaryPrimitives.WriteInt16LittleEndian(data.Slice(40, 2), Character.Stats.Luck); BinaryPrimitives.WriteInt16LittleEndian(data.Slice(41, 2), Character.Stats.Luck);
BinaryPrimitives.WriteInt16LittleEndian(data.Slice(42, 2), Character.Stats.Wisdom); BinaryPrimitives.WriteInt16LittleEndian(data.Slice(43, 2), Character.Stats.Wisdom);
BinaryPrimitives.WriteInt32LittleEndian(data.Slice(44, 4), Character.Health); BinaryPrimitives.WriteInt32LittleEndian(data.Slice(45, 4), Character.Health);
BinaryPrimitives.WriteInt32LittleEndian(data.Slice(48, 4), Character.Mana); BinaryPrimitives.WriteInt32LittleEndian(data.Slice(49, 4), Character.Mana);
for (var i = 0; i < 20; i++) for (var i = 0; i < 20; i++)
{ {
// Equipped Items // Equipped Items
BinaryPrimitives.WriteUInt16LittleEndian(data.Slice(52 + i * 2, 2), BinaryPrimitives.WriteUInt16LittleEndian(data.Slice(53 + i * 2, 2),
Character.EquippedItems.Length > i ? Character.EquippedItems[i] : (ushort)0); Character.EquippedItems.Length > i ? Character.EquippedItems[i] : (ushort)0);
// Equipped Cash Items // Equipped Cash Items
BinaryPrimitives.WriteUInt16LittleEndian(data.Slice(92 + i * 2, 2), BinaryPrimitives.WriteUInt16LittleEndian(data.Slice(93 + i * 2, 2),
Character.EquippedCashItems.Length > i ? Character.EquippedCashItems[i] : (ushort)0); Character.EquippedCashItems.Length > i ? Character.EquippedCashItems[i] : (ushort)0);
} }