Skip to content

Return to instances with SaveMap property #389

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
Mar 28, 2025
Merged

Return to instances with SaveMap property #389

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
91e2033
Return to instances with SaveMap property
AngeloTadeucci Mar 28, 2025
3a6c302
replace FieldInstance with InstanceFieldMetadata
AngeloTadeucci Mar 28, 2025
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
22 changes: 0 additions & 22 deletions Maple2.Model/Game/FieldInstance.cs
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion Maple2.Server.Game/Manager/DungeonManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public void LoadField() {
return;
}

if (session.Field.FieldInstance.InstanceType == InstanceType.DungeonLobby) {
if (session.Field.FieldInstance.Type == InstanceType.DungeonLobby) {
session.Send(DungeonWaitingPacket.Set(Lobby.DungeonId, Lobby.Size));
}
}
Expand Down
2 changes: 1 addition & 1 deletion Maple2.Server.Game/Manager/Field/FieldManager/FieldManager.State.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ public FieldPlayer SpawnPlayer(GameSession session, Player player, int portalId
player.Character.ReviveMapId = Metadata.Property.RevivalReturnId;
}

if (FieldInstance.InstanceType == InstanceType.none) {
if (FieldInstance.Type == InstanceType.none || FieldInstance.SaveField) {
if (Metadata.Property.EnterReturnId != 0) {
player.Character.ReturnMapId = Metadata.Property.EnterReturnId;
}
Expand Down
6 changes: 3 additions & 3 deletions Maple2.Server.Game/Manager/Field/FieldManager/FieldManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public partial class FieldManager : IField {
public int DungeonId { get; init; }
public int Size { get; init; }
public FieldType FieldType { get; init; }
public FieldInstance FieldInstance { get; private set; }
public InstanceFieldMetadata FieldInstance { get; private set; }
public readonly AiManager Ai;
public IFieldRenderer? DebugRenderer { get; private set; }

Expand All @@ -92,7 +92,7 @@ public FieldManager(MapMetadata metadata, UgcMapMetadata ugcMetadata, MapEntityM
Ai = new AiManager(this);
RoomId = NextGlobalId();

FieldInstance = FieldInstance.Default;
FieldInstance = new InstanceFieldMetadata(0, InstanceType.none, 0, false, 0, true, 0, 0, 0, 0);

ItemDrop = new ItemDropManager(this);

Expand Down Expand Up @@ -120,7 +120,7 @@ public virtual void Init() {
}

if (ServerTableMetadata.InstanceFieldTable.Entries.TryGetValue(Metadata.Id, out InstanceFieldMetadata? instanceField)) {
FieldInstance = new FieldInstance(instanceField.Type, instanceField.InstanceId);
FieldInstance = instanceField;
}

if (ugcMetadata.Plots.Count > 0) {
Expand Down
2 changes: 1 addition & 1 deletion Maple2.Server.Game/Manager/Field/FieldManager/IField.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public interface IField : IDisposable {
public ConcurrentDictionary<int, FieldPet> Pets { get; }

public RoomTimer? RoomTimer { get; }
public FieldInstance FieldInstance { get; }
public InstanceFieldMetadata FieldInstance { get; }
public FieldType FieldType { get; }
public int Size { get; init; }

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 @@ -17,7 +17,8 @@ public static ByteWriter Request(IActor<Player> player) {
pWriter.Write<MigrationError>(MigrationError.ok);
pWriter.WriteInt(player.Value.Character.MapId);
pWriter.Write<FieldType>(player.Field.FieldType);
pWriter.WriteClass<FieldInstance>(player.Field.FieldInstance);
pWriter.Write<InstanceType>(player.Field.FieldInstance.Type);
pWriter.WriteInt(player.Field.FieldInstance.InstanceId);
pWriter.WriteInt(player.Field.DungeonId);
pWriter.Write<Vector3>(player.Position);
pWriter.Write<Vector3>(player.Rotation);
Expand Down