Skip to content

Fix: FieldEnterPacket #227

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

Merged
AngeloTadeucci merged 2 commits into from
Sep 5, 2024
Merged

Fix: FieldEnterPacket #227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
284a3c5
Fix: FieldEnterPacket
AngeloTadeucci Sep 5, 2024
589d776
zin suggestion
AngeloTadeucci Sep 5, 2024
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
2 changes: 1 addition & 1 deletion Maple2.File.Ingest/Maple2.File.Ingest.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<PackageReference Include="Crc32.NET" Version="1.2.0" />
<PackageReference Include="CsvHelper" Version="32.0.2" />
<PackageReference Include="DotNetZip" Version="1.16.0" />
<PackageReference Include="Maple2.File.Parser.Tadeucci" Version="2.1.26" />
<PackageReference Include="Maple2.File.Parser.Tadeucci" Version="2.1.27" />
<PackageReference Include="DotRecast.Core" Version="2024.2.3" />
<PackageReference Include="DotRecast.Detour" Version="2024.2.3" />
<PackageReference Include="DotRecast.Recast" Version="2024.2.3" />
Expand Down
13 changes: 11 additions & 2 deletions Maple2.Model/Game/FieldInstance.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
using System.Runtime.InteropServices;
using Maple2.Model.Enum;
using Maple2.PacketLib.Tools;
using Maple2.Tools;

namespace Maple2.Model.Game;

[StructLayout(LayoutKind.Sequential, Size = 6)]
public readonly struct FieldInstance {
public sealed class FieldInstance : IByteSerializable {
public static FieldInstance Default = new(false, InstanceType.none, 0);

public readonly bool BlockChangeChannel;
public readonly InstanceType InstanceType;
public readonly int InstanceId;
Expand All @@ -14,4 +17,10 @@ public FieldInstance(bool blockChangeChannel, InstanceType instanceType, int ins
InstanceType = instanceType;
InstanceId = instanceId;
}

public void WriteTo(IByteWriter writer) {
writer.WriteBool(BlockChangeChannel);
writer.Write<InstanceType>(InstanceType);
writer.WriteInt(InstanceId);
}
}
2 changes: 1 addition & 1 deletion Maple2.Server.Game/Manager/Field/FieldManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public sealed partial class FieldManager : IDisposable {
public int MapId => Metadata.Id;
public readonly long OwnerId;
public readonly int InstanceId;
public FieldInstance FieldInstance = default;
public FieldInstance FieldInstance = FieldInstance.Default;
public readonly AiManager Ai;
public IFieldRenderer? DebugRenderer { get; private set; }

Expand Down
3 changes: 2 additions & 1 deletion Maple2.Server.Game/Packets/FieldEnterPacket.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
using Maple2.Server.Core.Packets;
using Maple2.Server.Game.Model;
using Maple2.Server.Game.Session;
using Maple2.Tools.Extensions;

namespace Maple2.Server.Game.Packets;

Expand All @@ -15,7 +16,7 @@ public static ByteWriter Request(IActor<Player> player) {
var pWriter = Packet.Of(SendOp.RequestFieldEnter);
pWriter.Write<MigrationError>(MigrationError.ok);
pWriter.WriteInt(player.Value.Character.MapId);
pWriter.Write<FieldInstance>(player.Field.FieldInstance);
pWriter.WriteClass<FieldInstance>(player.Field.FieldInstance);
pWriter.WriteInt();
pWriter.Write<Vector3>(player.Position);
pWriter.Write<Vector3>(player.Rotation);
Expand Down