Liftable Cube Changes & Dungeon field maps inter room change

Maple2.Database/Storage/Game/GameStorage.Mail.cs

@@ -110,7 +110,7 @@ public ICollection<Mail> GetAllMail(long characterId, long minId = 0) {
  Context.ChangeTracker.QueryTrackingBehavior = QueryTrackingBehavior.TrackAll;
 
  Model.Mail? mail = Context.Mail.Find(characterId, mailId);
- if (mail == null || mail.ReadTime > DateTime.UnixEpoch) {
+ if (mail == null || mail.ReadTime > DateTime.Now) {
  return null;
  }
 

Maple2.Database/Storage/Game/GameStorage.Map.cs

@@ -293,6 +293,7 @@ public bool InitUgcMap(IEnumerable<UgcMapMetadata> maps) {
  Position = new Vector3B(model.X, model.Y, model.Z),
  Rotation = model.Rotation,
  Interact = ToInteractCube(model.Interact),
+ Type = PlotCube.CubeType.Construction,
  };
  }
 
@@ -309,6 +310,7 @@ public bool InitUgcMap(IEnumerable<UgcMapMetadata> maps) {
  Position = new Vector3B(model.X, model.Y, model.Z),
  Rotation = model.Rotation,
  Interact = ToInteractCube(model.Interact),
+ Type = PlotCube.CubeType.Construction,
  };
  }
  }

Maple2.File.Ingest/Mapper/MapEntityMapper.cs

@@ -189,7 +189,7 @@ private IEnumerable<MapEntity> ParseMap(string xblock, IEnumerable<IMapEntity> e
  switch (physXProp) {
  case IMS2Liftable liftable:
  yield return new MapEntity(xblock, new Guid(entity.EntityId), entity.EntityName) {
- Block = new Liftable((int) liftable.ItemID, liftable.ItemStackCount, liftable.ItemLifeTime, liftable.LiftableRegenCheckTime, liftable.LiftableFinishTime, liftable.MaskQuestID, liftable.MaskQuestState, liftable.EffectQuestID, liftable.EffectQuestState, liftable.Position, liftable.Rotation)
+ Block = new Liftable((int) liftable.ItemID, liftable.ItemStackCount, liftable.ItemLifeTime, liftable.LiftableRegenCheckTime, liftable.LiftableFinishTime, liftable.MaskQuestID, liftable.MaskQuestState, liftable.EffectQuestID, liftable.EffectQuestState, liftable.IsReactEffect, liftable.Position, liftable.Rotation)
  };
  continue;
  case IMS2TaxiStation taxiStation:

Maple2.Model/Game/Cube/PlotCube.cs

@@ -10,7 +10,7 @@ public enum CubeType { Default, Construction, Liftable };
 
  public Vector3B Position { get; set; }
  public float Rotation { get; set; }
- public CubeType Type { get; set; }
+ public required CubeType Type { get; set; }
 
  public int PlotId { get; set; }
 

Maple2.Model/Game/User/Character.cs

@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Numerics;
+using System.Numerics;
 using Maple2.Model.Common;
 using Maple2.Model.Enum;
 

Maple2.Model/Game/User/IPlayerInfo.cs

@@ -1,6 +1,4 @@
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using Maple2.Model.Enum;
+using Maple2.Model.Enum;
 
 namespace Maple2.Model.Game;
 

Maple2.Model/Game/User/PlayerInfo.cs

@@ -30,7 +30,7 @@ public static implicit operator PlayerInfo(Player player) {
  AchievementInfo = player.Character.AchievementInfo,
  PremiumTime = player.Character.PremiumTime,
  LastOnlineTime = player.Character.LastOnlineTime,
- DungeonEnterLimits = [],
+ DungeonEnterLimits = player.Character.DungeonEnterLimits,
  GuildId = player.Character.GuildId,
  GuildName = player.Character.GuildName,
  };

Maple2.Model/Game/User/PlotInfo.cs

@@ -51,6 +51,12 @@ public PlotState State {
 
 public class Plot(UgcMapGroup metadata) : PlotInfo(metadata) {
  public readonly Dictionary<Vector3B, PlotCube> Cubes = new();
+ public static readonly Plot Default = new(new UgcMapGroup(0,
+ 0,
+ 0,
+ new UgcMapGroup.Cost(0, 0, 0),
+ new UgcMapGroup.Cost(0, 0, 0),
+ new UgcMapGroup.Limits(0, 0, 0, 0, 0, 0)));
 
  public void SetPlannerMode(PlotMode mode) {
  PlotMode = mode;

Maple2.Model/Metadata/MapEntity/Liftable.cs

@@ -12,6 +12,7 @@ public record Liftable(
  string MaskQuestState,
  string EffectQuestId,
  string EffectQuestState,
+ bool ReactEffect,
  Vector3 Position,
  Vector3 Rotation)
 : MapBlock;

Maple2.Server.Core/Sync/PlayerInfoUpdateExtensions.cs

@@ -118,7 +118,6 @@ public static void Update(this IPlayerInfo self, UpdateField type, IPlayerInfo o
  if (type.HasFlag(UpdateField.Clubs)) {
  self.ClubIds = other.ClubIds;
  }
-
  if (type.HasFlag(UpdateField.Dungeon)) {
  self.DungeonEnterLimits = other.DungeonEnterLimits;
  }

Maple2.Server.Game/Manager/DungeonManager.cs

@@ -81,6 +81,15 @@ public void UpdateDungeonEnterLimit() {
  }
 
  if (updated) {
+ session.PlayerInfo.SendUpdate(new PlayerUpdateRequest {
+ AccountId = session.AccountId,
+ CharacterId = session.CharacterId,
+ DungeonEnterLimits = { EnterLimits.Select(dungeon => new DungeonEnterLimitUpdate {
+ DungeonId = dungeon.Key,
+ Limit = (int) dungeon.Value,
+ })},
+ Async = true,
+ });
  session.Send(FieldEntrancePacket.Load(EnterLimits));
  }
  }
@@ -209,13 +218,6 @@ public void CreateDungeonRoom(int dungeonId, bool withParty) {
  session.Send(DungeonRoomPacket.Error(DungeonRoomError.s_room_party_err_not_chief));
  return;
  }
-
- foreach (PartyMember member in Party.Members.Values) {
- if (!member.Info.DungeonEnterLimits.TryGetValue(dungeonId, out DungeonEnterLimit enterLimit) || enterLimit != DungeonEnterLimit.None) {
- //session.Send(DungeonRoomPacket.Error(DungeonRoomError));
- return;
- }
- }
  }
 
 

Maple2.Server.Game/Manager/Field/FieldManager/FieldManager.State.cs

@@ -656,7 +656,10 @@ public bool RemoveLiftable(string entityId) {
  return false;
  }
 
- Broadcast(CubePacket.RemoveCube(fieldLiftable.ObjectId, fieldLiftable.Position));
+ if (Plots[0].Cubes.Remove(fieldLiftable.Position)) {
+ Broadcast(CubePacket.RemoveCube(fieldLiftable.ObjectId, fieldLiftable.Position));
+ }
+
  Broadcast(LiftablePacket.Remove(entityId));
  return true;
  }
@@ -735,7 +738,10 @@ public bool RemoveInstrument(int objectId) {
  public void OnAddPlayer(FieldPlayer added) {
  Players[added.ObjectId] = added;
  // LOAD:
- added.Session.Send(LiftablePacket.Update(fieldLiftables.Values));
+ foreach (FieldLiftable liftable in fieldLiftables.Values.Where(liftable => liftable.FinishTick > 0)) {
+ added.Session.Send(LiftablePacket.Add(liftable));
+ }
+ added.Session.Send(LiftablePacket.Update(fieldLiftables.Values.Where(liftable => liftable.FinishTick == 0).ToList()));
  added.Session.Send(BreakablePacket.Update(fieldBreakables.Values));
  added.Session.Send(InteractObjectPacket.Load(fieldInteracts.Values));
  foreach (FieldInteract fieldInteract in fieldAdBalloons.Values) {

Maple2.Server.Game/Manager/Field/FieldManager/FieldManager.Ugc.cs

@@ -1,8 +1,12 @@
 using System.Collections.Concurrent;
+using System.Numerics;
 using Maple2.Database.Storage;
+using Maple2.Model.Common;
+using Maple2.Model.Enum;
 using Maple2.Model.Game;
 using Maple2.Model.Game.Ugc;
-using Maple2.Server.Core.Packets;
+using Maple2.Model.Metadata;
+using Maple2.Server.Game.Model;
 using Maple2.Server.Game.Model.Field;
 using Maple2.Server.Game.Packets;
 using Maple2.Server.Game.Session;
@@ -84,4 +88,78 @@ void SavePlot(Plot plot) {
  }
  }
  }
+
+ public void PlaceCube(GameSession session, HeldCube cubeItem, in Vector3B position, float rotation) {
+ Plot? plot = session.Field.Plots[0];
+ if (!session.ItemMetadata.TryGet(cubeItem.ItemId, out ItemMetadata? itemMetadata)) {
+ logger.Error("Failed to get item metadata for cube {cubeId}.", cubeItem.ItemId);
+ return;
+ }
+ switch (session.HeldCube) {
+ case PlotCube _:
+ if (itemMetadata.Install is null || itemMetadata.Housing is null) {
+ logger.Error($"Item {cubeItem.ItemId} is not a housing item.");
+ return;
+ }
+ plot = session.Housing.GetFieldPlot();
+ if (plot == null) {
+ return;
+ }
+
+ if (!session.Housing.TryPlaceCube(cubeItem, plot, itemMetadata, position, rotation, out PlotCube? plotCube)) {
+ return;
+ }
+
+ session.Field.Broadcast(CubePacket.PlaceCube(session.Player.ObjectId, plot, plotCube));
+
+ if (plotCube.Interact is not null) {
+ if (plotCube.Interact.Nurturing is not null && plotCube.Interact.Metadata.Nurturing is not null) {
+ using GameStorage.Request db = session.GameStorage.Context();
+ Nurturing? nurturing = db.GetNurturing(session.AccountId, plotCube.ItemId, plotCube.Interact.Metadata.Nurturing);
+ if (nurturing is null) {
+ nurturing = db.CreateNurturing(session.AccountId, plotCube.Interact.Metadata.Nurturing, plotCube.Interact.Metadata.Id);
+ if (nurturing is null) {
+ lock (Plots) {
+ logger.Error("Failed to create Nurturing for {AccountId}, ItemId {ItemId}", session.AccountId, plotCube.ItemId);
+ }
+ return;
+ }
+ }
+ plotCube.Interact.Nurturing = nurturing;
+ }
+ session.Field.Broadcast(FunctionCubePacket.AddFunctionCube(plotCube.Interact));
+ }
+
+ if (plot.IsPlanner) {
+ return;
+ }
+ break;
+ case LiftableCube liftable:
+ FieldLiftable? fieldLiftable = session.Field.AddLiftable($"4_{position.ConvertToInt()}", liftable.Liftable);
+ if (fieldLiftable == null) {
+ return;
+ }
+
+ session.HeldCube = null;
+ fieldLiftable.Count = 1;
+ fieldLiftable.State = LiftableState.Default;
+ fieldLiftable.Position = position;
+ fieldLiftable.Rotation = new Vector3(0, 0, rotation);
+ fieldLiftable.FinishTick = session.Field.FieldTick + fieldLiftable.Value.ItemLifetime;
+
+ if (session.Field.Entities.LiftableTargetBoxes.TryGetValue(position, out LiftableTargetBox? liftableTarget)) {
+ session.ConditionUpdate(ConditionType.item_move, codeLong: cubeItem.ItemId, targetLong: liftableTarget.LiftableTarget);
+ }
+
+ Broadcast(LiftablePacket.Add(fieldLiftable));
+ if (plot.Cubes.TryAdd(position, new PlotCube(itemMetadata, liftable.Id) { Type = PlotCube.CubeType.Liftable, Position = position, Rotation = rotation })) {
+ Broadcast(CubePacket.PlaceLiftable(session.Player.ObjectId, liftable, position, rotation));
+ }
+ Broadcast(SetCraftModePacket.Stop(session.Player.ObjectId));
+ Broadcast(LiftablePacket.Update(fieldLiftable));
+ break;
+ }
+
+ session.ConditionUpdate(ConditionType.install_item, codeLong: cubeItem.ItemId);
+ }
 }

Maple2.Server.Game/Manager/Field/FieldManager/FieldManager.cs

@@ -125,6 +125,9 @@ public virtual void Init() {
  }
  }
 
+ // Create default to place liftable cubes
+ Plots[0] = Plot.Default;
+
  foreach (TriggerModel trigger in Entities.TriggerModels.Values) {
  AddTrigger(trigger);
  }

Maple2.Server.Game/Manager/HousingManager.cs

@@ -450,15 +450,10 @@ public void InteriorReward(byte rewardId) {
  }
 
  #region Helpers
- public bool TryPlaceCube(HeldCube cube, Plot plot, in Vector3B position, float rotation,
+ public bool TryPlaceCube(HeldCube cube, Plot plot, ItemMetadata itemMetadata, in Vector3B position, float rotation,
  [NotNullWhen(true)] out PlotCube? result, bool isReplace = false) {
  result = null;
- if (!session.ItemMetadata.TryGet(cube.ItemId, out ItemMetadata? itemMetadata) || itemMetadata.Install is null || itemMetadata.Housing is null) {
- logger.Error("Failed to get item metadata for cube {cubeId}.", cube.ItemId);
- return false;
- }
-
- if (plot.PlotMode is PlotMode.BlueprintPlanner && itemMetadata.Housing.IsNotAllowedInBlueprint) {
+ if (plot.PlotMode is PlotMode.BlueprintPlanner && itemMetadata.Housing!.IsNotAllowedInBlueprint) {
  if (itemMetadata.Housing.HousingCategory is HousingCategory.Farming or HousingCategory.Ranching) {
  session.Send(CubePacket.Error(UgcMapError.s_err_cannot_install_nurturing_in_design_home));
  } else if (cube.ItemId is Constant.InteriorPortalCubeId) {
@@ -480,7 +475,7 @@ public bool TryPlaceCube(HeldCube cube, Plot plot, in Vector3B position, float r
  groundHeight = groundTile.Position.Z / Constant.BlockSize;
  }
 
- bool isSolidCube = itemMetadata.Install.IsSolidCube;
+ bool isSolidCube = itemMetadata.Install!.IsSolidCube;
  bool isOnGround = Math.Abs(position.Z - groundHeight) < 0.1;
  bool allowWaterOnGround = itemMetadata.Install.MapAttribute is MapAttribute.water && Constant.AllowWaterOnGround;
 
@@ -517,6 +512,7 @@ public bool TryPlaceCube(HeldCube cube, Plot plot, in Vector3B position, float r
  result = new PlotCube(itemMetadata, FurnishingManager.NextCubeId(), cube.Template) {
  Position = position,
  Rotation = rotation,
+ Type = cube is LiftableCube ? PlotCube.CubeType.Liftable : PlotCube.CubeType.Construction,
  };
 
  if (functionCubeMetadata is not null) {
@@ -679,7 +675,7 @@ public void ApplyLayout(Plot plot, HomeLayout layout, bool isBlueprint = false)
  foreach (PlotCube cube in layout.Cubes) {
  Item? item = session.Item.Furnishing.GetItem(cube.ItemId);
  cube.Id = item?.Uid ?? 0;
- if (!TryPlaceCube(cube, plot, cube.Position, cube.Rotation, out PlotCube? plotCube)) {
+ if (!TryPlaceCube(cube, plot, item!.Metadata, cube.Position, cube.Rotation, out PlotCube? plotCube)) {
  return;
  }
 

Maple2.Server.Game/Manager/Items/FurnishingManager.cs

@@ -104,7 +104,9 @@ public bool TryPlaceCube(long uid, [NotNullWhen(true)] out PlotCube? cube) {
  ? FurnishingStoragePacket.Update(item.Uid, item.Amount)
  : FurnishingStoragePacket.Remove(item.Uid));
 
- cube = new PlotCube(item.Metadata, NextCubeId(), item.Template);
+ cube = new PlotCube(item.Metadata, NextCubeId(), item.Template) {
+ Type = PlotCube.CubeType.Construction,
+ };
  if (!AddInventory(cube)) {
  logger.Fatal("Failed to add cube: {CubeId} to inventory", cube.Id);
  throw new InvalidOperationException($"Failed to add cube: {cube.Id} to inventory");

Maple2.Server.Game/Model/Field/Entity/FieldLiftable.cs

@@ -28,44 +28,47 @@ public FieldLiftable(FieldManager field, int objectId, string entityId, Liftable
  Count--;
  // Only respawn if we have a regen time
  if (RespawnTick == 0 && Value.RegenCheckTime > 0) {
- RespawnTick = Environment.TickCount64 + Value.RegenCheckTime;
+ RespawnTick = Field.FieldTick + Value.RegenCheckTime;
  }
 
  if (Count > 0) {
  Field.Broadcast(LiftablePacket.Update(this));
+ } else if (FinishTick > 0) {
+ // This is a temp liftable, so we need to remove it
+ Field.RemoveLiftable(EntityId);
  } else {
- State = Value.RegenCheckTime > 0 ? LiftableState.Respawning : LiftableState.Removed;
- Field.Broadcast(LiftablePacket.Remove(EntityId));
+ State = LiftableState.Removed;
+ Field.Broadcast(LiftablePacket.Update(this));
+
  Field.Broadcast(CubePacket.RemoveCube(ObjectId, Position));
  }
 
  return new LiftableCube(Value);
  }
 
  public override void Update(long tickCount) {
-// Handles despawning after being placed
-if (FinishTick != 0 && tickCount > FinishTick) {
-Field.RemoveLiftable(EntityId);
-return;
- }
-
-if (RespawnTick == 0 || tickCount < RespawnTick) {
-return;
-}
-
-Count++;
-// Only respawn if we have a regen time
-if (Count < Value.ItemStackCount && Value.RegenCheckTime > 0) {
-RespawnTick = tickCount + Value.RegenCheckTime;
-} else {
-RespawnTick = 0;
-}
-
-if (Count == 1) {
-State = LiftableState.Default;
-Field.Broadcast(LiftablePacket.Add(this));
-Field.Broadcast(CubePacket.PlaceLiftable(ObjectId, new LiftableCube(Value), Position, Rotation.Z));
+switch (State) {
+ case LiftableState.Removed:
+ if (RespawnTick > tickCount) {
+ State = LiftableState.Respawning;
+}
+ break;
+ case LiftableState.Respawning:
+ if (tickCount >= RespawnTick) {
+ State = LiftableState.Default;
+ Count = Value.ItemStackCount;
+ RespawnTick = 0;
+ Field.Broadcast(LiftablePacket.Update(this));
+ }
+ break;
+ case LiftableState.Default:
+ if (FinishTick != 0 && tickCount > FinishTick) {
+ Field.RemoveLiftable(EntityId);
+ return;
+ }
+ break;
+case LiftableState.Disabled:
+ return;
  }
- Field.Broadcast(LiftablePacket.Update(this));
  }
 }

Maple2.Database/Storage/Game/GameStorage.Mail.cs

@@ -110,7 +110,7 @@ public ICollection<Mail> GetAllMail(long characterId, long minId = 0) {
  Context.ChangeTracker.QueryTrackingBehavior = QueryTrackingBehavior.TrackAll;
 
  Model.Mail? mail = Context.Mail.Find(characterId, mailId);
- if (mail == null || mail.ReadTime > DateTime.UnixEpoch) {
+ if (mail == null || mail.ReadTime > DateTime.Now) {
  return null;
  }
 

Maple2.Database/Storage/Game/GameStorage.Map.cs

@@ -293,6 +293,7 @@ public bool InitUgcMap(IEnumerable<UgcMapMetadata> maps) {
  Position = new Vector3B(model.X, model.Y, model.Z),
  Rotation = model.Rotation,
  Interact = ToInteractCube(model.Interact),
+ Type = PlotCube.CubeType.Construction,
  };
  }
 
@@ -309,6 +310,7 @@ public bool InitUgcMap(IEnumerable<UgcMapMetadata> maps) {
  Position = new Vector3B(model.X, model.Y, model.Z),
  Rotation = model.Rotation,
  Interact = ToInteractCube(model.Interact),
+ Type = PlotCube.CubeType.Construction,
  };
  }
  }

Maple2.File.Ingest/Mapper/MapEntityMapper.cs

@@ -189,7 +189,7 @@ private IEnumerable<MapEntity> ParseMap(string xblock, IEnumerable<IMapEntity> e
  switch (physXProp) {
  case IMS2Liftable liftable:
  yield return new MapEntity(xblock, new Guid(entity.EntityId), entity.EntityName) {
- Block = new Liftable((int) liftable.ItemID, liftable.ItemStackCount, liftable.ItemLifeTime, liftable.LiftableRegenCheckTime, liftable.LiftableFinishTime, liftable.MaskQuestID, liftable.MaskQuestState, liftable.EffectQuestID, liftable.EffectQuestState, liftable.Position, liftable.Rotation)
+ Block = new Liftable((int) liftable.ItemID, liftable.ItemStackCount, liftable.ItemLifeTime, liftable.LiftableRegenCheckTime, liftable.LiftableFinishTime, liftable.MaskQuestID, liftable.MaskQuestState, liftable.EffectQuestID, liftable.EffectQuestState, liftable.IsReactEffect, liftable.Position, liftable.Rotation)
  };
  continue;
  case IMS2TaxiStation taxiStation:

Maple2.Model/Game/Cube/PlotCube.cs

@@ -10,7 +10,7 @@ public enum CubeType { Default, Construction, Liftable };
 
  public Vector3B Position { get; set; }
  public float Rotation { get; set; }
- public CubeType Type { get; set; }
+ public required CubeType Type { get; set; }
 
  public int PlotId { get; set; }
 

Maple2.Model/Game/User/Character.cs

@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Numerics;
+using System.Numerics;
 using Maple2.Model.Common;
 using Maple2.Model.Enum;
 

Maple2.Model/Game/User/IPlayerInfo.cs

@@ -1,6 +1,4 @@
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using Maple2.Model.Enum;
+using Maple2.Model.Enum;
 
 namespace Maple2.Model.Game;
 

Maple2.Model/Game/User/PlayerInfo.cs

@@ -30,7 +30,7 @@ public static implicit operator PlayerInfo(Player player) {
  AchievementInfo = player.Character.AchievementInfo,
  PremiumTime = player.Character.PremiumTime,
  LastOnlineTime = player.Character.LastOnlineTime,
- DungeonEnterLimits = [],
+ DungeonEnterLimits = player.Character.DungeonEnterLimits,
  GuildId = player.Character.GuildId,
  GuildName = player.Character.GuildName,
  };

Maple2.Model/Game/User/PlotInfo.cs

@@ -51,6 +51,12 @@ public PlotState State {
 
 public class Plot(UgcMapGroup metadata) : PlotInfo(metadata) {
  public readonly Dictionary<Vector3B, PlotCube> Cubes = new();
+ public static readonly Plot Default = new(new UgcMapGroup(0,
+ 0,
+ 0,
+ new UgcMapGroup.Cost(0, 0, 0),
+ new UgcMapGroup.Cost(0, 0, 0),
+ new UgcMapGroup.Limits(0, 0, 0, 0, 0, 0)));
 
  public void SetPlannerMode(PlotMode mode) {
  PlotMode = mode;

Maple2.Model/Metadata/MapEntity/Liftable.cs

@@ -12,6 +12,7 @@ public record Liftable(
  string MaskQuestState,
  string EffectQuestId,
  string EffectQuestState,
+ bool ReactEffect,
  Vector3 Position,
  Vector3 Rotation)
 : MapBlock;

Maple2.Server.Core/Sync/PlayerInfoUpdateExtensions.cs

@@ -118,7 +118,6 @@ public static void Update(this IPlayerInfo self, UpdateField type, IPlayerInfo o
  if (type.HasFlag(UpdateField.Clubs)) {
  self.ClubIds = other.ClubIds;
  }
-
  if (type.HasFlag(UpdateField.Dungeon)) {
  self.DungeonEnterLimits = other.DungeonEnterLimits;
  }

Maple2.Server.Game/Manager/DungeonManager.cs

@@ -81,6 +81,15 @@ public void UpdateDungeonEnterLimit() {
  }
 
  if (updated) {
+ session.PlayerInfo.SendUpdate(new PlayerUpdateRequest {
+ AccountId = session.AccountId,
+ CharacterId = session.CharacterId,
+ DungeonEnterLimits = { EnterLimits.Select(dungeon => new DungeonEnterLimitUpdate {
+ DungeonId = dungeon.Key,
+ Limit = (int) dungeon.Value,
+ })},
+ Async = true,
+ });
  session.Send(FieldEntrancePacket.Load(EnterLimits));
  }
  }
@@ -209,13 +218,6 @@ public void CreateDungeonRoom(int dungeonId, bool withParty) {
  session.Send(DungeonRoomPacket.Error(DungeonRoomError.s_room_party_err_not_chief));
  return;
  }
-
- foreach (PartyMember member in Party.Members.Values) {
- if (!member.Info.DungeonEnterLimits.TryGetValue(dungeonId, out DungeonEnterLimit enterLimit) || enterLimit != DungeonEnterLimit.None) {
- //session.Send(DungeonRoomPacket.Error(DungeonRoomError));
- return;
- }
- }
  }
 
 

Maple2.Server.Game/Manager/Field/FieldManager/FieldManager.State.cs

@@ -656,7 +656,10 @@ public bool RemoveLiftable(string entityId) {
  return false;
  }
 
- Broadcast(CubePacket.RemoveCube(fieldLiftable.ObjectId, fieldLiftable.Position));
+ if (Plots[0].Cubes.Remove(fieldLiftable.Position)) {
+ Broadcast(CubePacket.RemoveCube(fieldLiftable.ObjectId, fieldLiftable.Position));
+ }
+
  Broadcast(LiftablePacket.Remove(entityId));
  return true;
  }
@@ -735,7 +738,10 @@ public bool RemoveInstrument(int objectId) {
  public void OnAddPlayer(FieldPlayer added) {
  Players[added.ObjectId] = added;
  // LOAD:
- added.Session.Send(LiftablePacket.Update(fieldLiftables.Values));
+ foreach (FieldLiftable liftable in fieldLiftables.Values.Where(liftable => liftable.FinishTick > 0)) {
+ added.Session.Send(LiftablePacket.Add(liftable));
+ }
+ added.Session.Send(LiftablePacket.Update(fieldLiftables.Values.Where(liftable => liftable.FinishTick == 0).ToList()));
  added.Session.Send(BreakablePacket.Update(fieldBreakables.Values));
  added.Session.Send(InteractObjectPacket.Load(fieldInteracts.Values));
  foreach (FieldInteract fieldInteract in fieldAdBalloons.Values) {

Maple2.Server.Game/Manager/Field/FieldManager/FieldManager.Ugc.cs

@@ -1,8 +1,12 @@
 using System.Collections.Concurrent;
+using System.Numerics;
 using Maple2.Database.Storage;
+using Maple2.Model.Common;
+using Maple2.Model.Enum;
 using Maple2.Model.Game;
 using Maple2.Model.Game.Ugc;
-using Maple2.Server.Core.Packets;
+using Maple2.Model.Metadata;
+using Maple2.Server.Game.Model;
 using Maple2.Server.Game.Model.Field;
 using Maple2.Server.Game.Packets;
 using Maple2.Server.Game.Session;
@@ -84,4 +88,78 @@ void SavePlot(Plot plot) {
  }
  }
  }
+
+ public void PlaceCube(GameSession session, HeldCube cubeItem, in Vector3B position, float rotation) {
+ Plot? plot = session.Field.Plots[0];
+ if (!session.ItemMetadata.TryGet(cubeItem.ItemId, out ItemMetadata? itemMetadata)) {
+ logger.Error("Failed to get item metadata for cube {cubeId}.", cubeItem.ItemId);
+ return;
+ }
+ switch (session.HeldCube) {
+ case PlotCube _:
+ if (itemMetadata.Install is null || itemMetadata.Housing is null) {
+ logger.Error($"Item {cubeItem.ItemId} is not a housing item.");
+ return;
+ }
+ plot = session.Housing.GetFieldPlot();
+ if (plot == null) {
+ return;
+ }
+
+ if (!session.Housing.TryPlaceCube(cubeItem, plot, itemMetadata, position, rotation, out PlotCube? plotCube)) {
+ return;
+ }
+
+ session.Field.Broadcast(CubePacket.PlaceCube(session.Player.ObjectId, plot, plotCube));
+
+ if (plotCube.Interact is not null) {
+ if (plotCube.Interact.Nurturing is not null && plotCube.Interact.Metadata.Nurturing is not null) {
+ using GameStorage.Request db = session.GameStorage.Context();
+ Nurturing? nurturing = db.GetNurturing(session.AccountId, plotCube.ItemId, plotCube.Interact.Metadata.Nurturing);
+ if (nurturing is null) {
+ nurturing = db.CreateNurturing(session.AccountId, plotCube.Interact.Metadata.Nurturing, plotCube.Interact.Metadata.Id);
+ if (nurturing is null) {
+ lock (Plots) {
+ logger.Error("Failed to create Nurturing for {AccountId}, ItemId {ItemId}", session.AccountId, plotCube.ItemId);
+ }
+ return;
+ }
+ }
+ plotCube.Interact.Nurturing = nurturing;
+ }
+ session.Field.Broadcast(FunctionCubePacket.AddFunctionCube(plotCube.Interact));
+ }
+
+ if (plot.IsPlanner) {
+ return;
+ }
+ break;
+ case LiftableCube liftable:
+ FieldLiftable? fieldLiftable = session.Field.AddLiftable($"4_{position.ConvertToInt()}", liftable.Liftable);
+ if (fieldLiftable == null) {
+ return;
+ }
+
+ session.HeldCube = null;
+ fieldLiftable.Count = 1;
+ fieldLiftable.State = LiftableState.Default;
+ fieldLiftable.Position = position;
+ fieldLiftable.Rotation = new Vector3(0, 0, rotation);
+ fieldLiftable.FinishTick = session.Field.FieldTick + fieldLiftable.Value.ItemLifetime;
+
+ if (session.Field.Entities.LiftableTargetBoxes.TryGetValue(position, out LiftableTargetBox? liftableTarget)) {
+ session.ConditionUpdate(ConditionType.item_move, codeLong: cubeItem.ItemId, targetLong: liftableTarget.LiftableTarget);
+ }
+
+ Broadcast(LiftablePacket.Add(fieldLiftable));
+ if (plot.Cubes.TryAdd(position, new PlotCube(itemMetadata, liftable.Id) { Type = PlotCube.CubeType.Liftable, Position = position, Rotation = rotation })) {
+ Broadcast(CubePacket.PlaceLiftable(session.Player.ObjectId, liftable, position, rotation));
+ }
+ Broadcast(SetCraftModePacket.Stop(session.Player.ObjectId));
+ Broadcast(LiftablePacket.Update(fieldLiftable));
+ break;
+ }
+
+ session.ConditionUpdate(ConditionType.install_item, codeLong: cubeItem.ItemId);
+ }
 }

Maple2.Server.Game/Manager/Field/FieldManager/FieldManager.cs

@@ -125,6 +125,9 @@ public virtual void Init() {
  }
  }
 
+ // Create default to place liftable cubes
+ Plots[0] = Plot.Default;
+
  foreach (TriggerModel trigger in Entities.TriggerModels.Values) {
  AddTrigger(trigger);
  }

Maple2.Server.Game/Manager/HousingManager.cs

@@ -450,15 +450,10 @@ public void InteriorReward(byte rewardId) {
  }
 
  #region Helpers
- public bool TryPlaceCube(HeldCube cube, Plot plot, in Vector3B position, float rotation,
+ public bool TryPlaceCube(HeldCube cube, Plot plot, ItemMetadata itemMetadata, in Vector3B position, float rotation,
  [NotNullWhen(true)] out PlotCube? result, bool isReplace = false) {
  result = null;
- if (!session.ItemMetadata.TryGet(cube.ItemId, out ItemMetadata? itemMetadata) || itemMetadata.Install is null || itemMetadata.Housing is null) {
- logger.Error("Failed to get item metadata for cube {cubeId}.", cube.ItemId);
- return false;
- }
-
- if (plot.PlotMode is PlotMode.BlueprintPlanner && itemMetadata.Housing.IsNotAllowedInBlueprint) {
+ if (plot.PlotMode is PlotMode.BlueprintPlanner && itemMetadata.Housing!.IsNotAllowedInBlueprint) {
  if (itemMetadata.Housing.HousingCategory is HousingCategory.Farming or HousingCategory.Ranching) {
  session.Send(CubePacket.Error(UgcMapError.s_err_cannot_install_nurturing_in_design_home));
  } else if (cube.ItemId is Constant.InteriorPortalCubeId) {
@@ -480,7 +475,7 @@ public bool TryPlaceCube(HeldCube cube, Plot plot, in Vector3B position, float r
  groundHeight = groundTile.Position.Z / Constant.BlockSize;
  }
 
- bool isSolidCube = itemMetadata.Install.IsSolidCube;
+ bool isSolidCube = itemMetadata.Install!.IsSolidCube;
  bool isOnGround = Math.Abs(position.Z - groundHeight) < 0.1;
  bool allowWaterOnGround = itemMetadata.Install.MapAttribute is MapAttribute.water && Constant.AllowWaterOnGround;
 
@@ -517,6 +512,7 @@ public bool TryPlaceCube(HeldCube cube, Plot plot, in Vector3B position, float r
  result = new PlotCube(itemMetadata, FurnishingManager.NextCubeId(), cube.Template) {
  Position = position,
  Rotation = rotation,
+ Type = cube is LiftableCube ? PlotCube.CubeType.Liftable : PlotCube.CubeType.Construction,
  };
 
  if (functionCubeMetadata is not null) {
@@ -679,7 +675,7 @@ public void ApplyLayout(Plot plot, HomeLayout layout, bool isBlueprint = false)
  foreach (PlotCube cube in layout.Cubes) {
  Item? item = session.Item.Furnishing.GetItem(cube.ItemId);
  cube.Id = item?.Uid ?? 0;
- if (!TryPlaceCube(cube, plot, cube.Position, cube.Rotation, out PlotCube? plotCube)) {
+ if (!TryPlaceCube(cube, plot, item!.Metadata, cube.Position, cube.Rotation, out PlotCube? plotCube)) {
  return;
  }
 

Maple2.Server.Game/Manager/Items/FurnishingManager.cs

@@ -104,7 +104,9 @@ public bool TryPlaceCube(long uid, [NotNullWhen(true)] out PlotCube? cube) {
  ? FurnishingStoragePacket.Update(item.Uid, item.Amount)
  : FurnishingStoragePacket.Remove(item.Uid));
 
- cube = new PlotCube(item.Metadata, NextCubeId(), item.Template);
+ cube = new PlotCube(item.Metadata, NextCubeId(), item.Template) {
+ Type = PlotCube.CubeType.Construction,
+ };
  if (!AddInventory(cube)) {
  logger.Fatal("Failed to add cube: {CubeId} to inventory", cube.Id);
  throw new InvalidOperationException($"Failed to add cube: {cube.Id} to inventory");

Maple2.Server.Game/Model/Field/Entity/FieldLiftable.cs

@@ -28,44 +28,47 @@ public FieldLiftable(FieldManager field, int objectId, string entityId, Liftable
  Count--;
  // Only respawn if we have a regen time
  if (RespawnTick == 0 && Value.RegenCheckTime > 0) {
- RespawnTick = Environment.TickCount64 + Value.RegenCheckTime;
+ RespawnTick = Field.FieldTick + Value.RegenCheckTime;
  }
 
  if (Count > 0) {
  Field.Broadcast(LiftablePacket.Update(this));
+ } else if (FinishTick > 0) {
+ // This is a temp liftable, so we need to remove it
+ Field.RemoveLiftable(EntityId);
  } else {
- State = Value.RegenCheckTime > 0 ? LiftableState.Respawning : LiftableState.Removed;
- Field.Broadcast(LiftablePacket.Remove(EntityId));
+ State = LiftableState.Removed;
+ Field.Broadcast(LiftablePacket.Update(this));
+
  Field.Broadcast(CubePacket.RemoveCube(ObjectId, Position));
  }
 
  return new LiftableCube(Value);
  }
 
  public override void Update(long tickCount) {
-// Handles despawning after being placed
-if (FinishTick != 0 && tickCount > FinishTick) {
-Field.RemoveLiftable(EntityId);
-return;
- }
-
-if (RespawnTick == 0 || tickCount < RespawnTick) {
-return;
-}
-
-Count++;
-// Only respawn if we have a regen time
-if (Count < Value.ItemStackCount && Value.RegenCheckTime > 0) {
-RespawnTick = tickCount + Value.RegenCheckTime;
-} else {
-RespawnTick = 0;
-}
-
-if (Count == 1) {
-State = LiftableState.Default;
-Field.Broadcast(LiftablePacket.Add(this));
-Field.Broadcast(CubePacket.PlaceLiftable(ObjectId, new LiftableCube(Value), Position, Rotation.Z));
+switch (State) {
+ case LiftableState.Removed:
+ if (RespawnTick > tickCount) {
+ State = LiftableState.Respawning;
+}
+ break;
+ case LiftableState.Respawning:
+ if (tickCount >= RespawnTick) {
+ State = LiftableState.Default;
+ Count = Value.ItemStackCount;
+ RespawnTick = 0;
+ Field.Broadcast(LiftablePacket.Update(this));
+ }
+ break;
+ case LiftableState.Default:
+ if (FinishTick != 0 && tickCount > FinishTick) {
+ Field.RemoveLiftable(EntityId);
+ return;
+ }
+ break;
+case LiftableState.Disabled:
+ return;
  }
- Field.Broadcast(LiftablePacket.Update(this));
  }
 }

Maple2.Database/Storage/Game/GameStorage.Mail.cs

@@ -110,7 +110,7 @@ public ICollection<Mail> GetAllMail(long characterId, long minId = 0) {
  Context.ChangeTracker.QueryTrackingBehavior = QueryTrackingBehavior.TrackAll;
 
  Model.Mail? mail = Context.Mail.Find(characterId, mailId);
- if (mail == null || mail.ReadTime > DateTime.UnixEpoch) {
+ if (mail == null || mail.ReadTime > DateTime.Now) {
  return null;
  }
 

Maple2.Database/Storage/Game/GameStorage.Map.cs

@@ -293,6 +293,7 @@ public bool InitUgcMap(IEnumerable<UgcMapMetadata> maps) {
  Position = new Vector3B(model.X, model.Y, model.Z),
  Rotation = model.Rotation,
  Interact = ToInteractCube(model.Interact),
+ Type = PlotCube.CubeType.Construction,
  };
  }
 
@@ -309,6 +310,7 @@ public bool InitUgcMap(IEnumerable<UgcMapMetadata> maps) {
  Position = new Vector3B(model.X, model.Y, model.Z),
  Rotation = model.Rotation,
  Interact = ToInteractCube(model.Interact),
+ Type = PlotCube.CubeType.Construction,
  };
  }
  }

Maple2.File.Ingest/Mapper/MapEntityMapper.cs

@@ -189,7 +189,7 @@ private IEnumerable<MapEntity> ParseMap(string xblock, IEnumerable<IMapEntity> e
  switch (physXProp) {
  case IMS2Liftable liftable:
  yield return new MapEntity(xblock, new Guid(entity.EntityId), entity.EntityName) {
- Block = new Liftable((int) liftable.ItemID, liftable.ItemStackCount, liftable.ItemLifeTime, liftable.LiftableRegenCheckTime, liftable.LiftableFinishTime, liftable.MaskQuestID, liftable.MaskQuestState, liftable.EffectQuestID, liftable.EffectQuestState, liftable.Position, liftable.Rotation)
+ Block = new Liftable((int) liftable.ItemID, liftable.ItemStackCount, liftable.ItemLifeTime, liftable.LiftableRegenCheckTime, liftable.LiftableFinishTime, liftable.MaskQuestID, liftable.MaskQuestState, liftable.EffectQuestID, liftable.EffectQuestState, liftable.IsReactEffect, liftable.Position, liftable.Rotation)
  };
  continue;
  case IMS2TaxiStation taxiStation:

Maple2.Model/Game/Cube/PlotCube.cs

@@ -10,7 +10,7 @@ public enum CubeType { Default, Construction, Liftable };
 
  public Vector3B Position { get; set; }
  public float Rotation { get; set; }
- public CubeType Type { get; set; }
+ public required CubeType Type { get; set; }
 
  public int PlotId { get; set; }
 

Maple2.Model/Game/User/Character.cs

@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Numerics;
+using System.Numerics;
 using Maple2.Model.Common;
 using Maple2.Model.Enum;
 

Maple2.Model/Game/User/IPlayerInfo.cs

@@ -1,6 +1,4 @@
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using Maple2.Model.Enum;
+using Maple2.Model.Enum;
 
 namespace Maple2.Model.Game;
 

Maple2.Model/Game/User/PlayerInfo.cs

@@ -30,7 +30,7 @@ public static implicit operator PlayerInfo(Player player) {
  AchievementInfo = player.Character.AchievementInfo,
  PremiumTime = player.Character.PremiumTime,
  LastOnlineTime = player.Character.LastOnlineTime,
- DungeonEnterLimits = [],
+ DungeonEnterLimits = player.Character.DungeonEnterLimits,
  GuildId = player.Character.GuildId,
  GuildName = player.Character.GuildName,
  };

Maple2.Model/Game/User/PlotInfo.cs

@@ -51,6 +51,12 @@ public PlotState State {
 
 public class Plot(UgcMapGroup metadata) : PlotInfo(metadata) {
  public readonly Dictionary<Vector3B, PlotCube> Cubes = new();
+ public static readonly Plot Default = new(new UgcMapGroup(0,
+ 0,
+ 0,
+ new UgcMapGroup.Cost(0, 0, 0),
+ new UgcMapGroup.Cost(0, 0, 0),
+ new UgcMapGroup.Limits(0, 0, 0, 0, 0, 0)));
 
  public void SetPlannerMode(PlotMode mode) {
  PlotMode = mode;

Maple2.Model/Metadata/MapEntity/Liftable.cs

@@ -12,6 +12,7 @@ public record Liftable(
  string MaskQuestState,
  string EffectQuestId,
  string EffectQuestState,
+ bool ReactEffect,
  Vector3 Position,
  Vector3 Rotation)
 : MapBlock;

Maple2.Server.Core/Sync/PlayerInfoUpdateExtensions.cs

@@ -118,7 +118,6 @@ public static void Update(this IPlayerInfo self, UpdateField type, IPlayerInfo o
  if (type.HasFlag(UpdateField.Clubs)) {
  self.ClubIds = other.ClubIds;
  }
-
  if (type.HasFlag(UpdateField.Dungeon)) {
  self.DungeonEnterLimits = other.DungeonEnterLimits;
  }

Maple2.Server.Game/Manager/DungeonManager.cs

@@ -81,6 +81,15 @@ public void UpdateDungeonEnterLimit() {
  }
 
  if (updated) {
+ session.PlayerInfo.SendUpdate(new PlayerUpdateRequest {
+ AccountId = session.AccountId,
+ CharacterId = session.CharacterId,
+ DungeonEnterLimits = { EnterLimits.Select(dungeon => new DungeonEnterLimitUpdate {
+ DungeonId = dungeon.Key,
+ Limit = (int) dungeon.Value,
+ })},
+ Async = true,
+ });
  session.Send(FieldEntrancePacket.Load(EnterLimits));
  }
  }
@@ -209,13 +218,6 @@ public void CreateDungeonRoom(int dungeonId, bool withParty) {
  session.Send(DungeonRoomPacket.Error(DungeonRoomError.s_room_party_err_not_chief));
  return;
  }
-
- foreach (PartyMember member in Party.Members.Values) {
- if (!member.Info.DungeonEnterLimits.TryGetValue(dungeonId, out DungeonEnterLimit enterLimit) || enterLimit != DungeonEnterLimit.None) {
- //session.Send(DungeonRoomPacket.Error(DungeonRoomError));
- return;
- }
- }
  }
 
 

Maple2.Server.Game/Manager/Field/FieldManager/FieldManager.State.cs

@@ -656,7 +656,10 @@ public bool RemoveLiftable(string entityId) {
  return false;
  }
 
- Broadcast(CubePacket.RemoveCube(fieldLiftable.ObjectId, fieldLiftable.Position));
+ if (Plots[0].Cubes.Remove(fieldLiftable.Position)) {
+ Broadcast(CubePacket.RemoveCube(fieldLiftable.ObjectId, fieldLiftable.Position));
+ }
+
  Broadcast(LiftablePacket.Remove(entityId));
  return true;
  }
@@ -735,7 +738,10 @@ public bool RemoveInstrument(int objectId) {
  public void OnAddPlayer(FieldPlayer added) {
  Players[added.ObjectId] = added;
  // LOAD:
- added.Session.Send(LiftablePacket.Update(fieldLiftables.Values));
+ foreach (FieldLiftable liftable in fieldLiftables.Values.Where(liftable => liftable.FinishTick > 0)) {
+ added.Session.Send(LiftablePacket.Add(liftable));
+ }
+ added.Session.Send(LiftablePacket.Update(fieldLiftables.Values.Where(liftable => liftable.FinishTick == 0).ToList()));
  added.Session.Send(BreakablePacket.Update(fieldBreakables.Values));
  added.Session.Send(InteractObjectPacket.Load(fieldInteracts.Values));
  foreach (FieldInteract fieldInteract in fieldAdBalloons.Values) {

Maple2.Server.Game/Manager/Field/FieldManager/FieldManager.Ugc.cs

@@ -1,8 +1,12 @@
 using System.Collections.Concurrent;
+using System.Numerics;
 using Maple2.Database.Storage;
+using Maple2.Model.Common;
+using Maple2.Model.Enum;
 using Maple2.Model.Game;
 using Maple2.Model.Game.Ugc;
-using Maple2.Server.Core.Packets;
+using Maple2.Model.Metadata;
+using Maple2.Server.Game.Model;
 using Maple2.Server.Game.Model.Field;
 using Maple2.Server.Game.Packets;
 using Maple2.Server.Game.Session;
@@ -84,4 +88,78 @@ void SavePlot(Plot plot) {
  }
  }
  }
+
+ public void PlaceCube(GameSession session, HeldCube cubeItem, in Vector3B position, float rotation) {
+ Plot? plot = session.Field.Plots[0];
+ if (!session.ItemMetadata.TryGet(cubeItem.ItemId, out ItemMetadata? itemMetadata)) {
+ logger.Error("Failed to get item metadata for cube {cubeId}.", cubeItem.ItemId);
+ return;
+ }
+ switch (session.HeldCube) {
+ case PlotCube _:
+ if (itemMetadata.Install is null || itemMetadata.Housing is null) {
+ logger.Error($"Item {cubeItem.ItemId} is not a housing item.");
+ return;
+ }
+ plot = session.Housing.GetFieldPlot();
+ if (plot == null) {
+ return;
+ }
+
+ if (!session.Housing.TryPlaceCube(cubeItem, plot, itemMetadata, position, rotation, out PlotCube? plotCube)) {
+ return;
+ }
+
+ session.Field.Broadcast(CubePacket.PlaceCube(session.Player.ObjectId, plot, plotCube));
+
+ if (plotCube.Interact is not null) {
+ if (plotCube.Interact.Nurturing is not null && plotCube.Interact.Metadata.Nurturing is not null) {
+ using GameStorage.Request db = session.GameStorage.Context();
+ Nurturing? nurturing = db.GetNurturing(session.AccountId, plotCube.ItemId, plotCube.Interact.Metadata.Nurturing);
+ if (nurturing is null) {
+ nurturing = db.CreateNurturing(session.AccountId, plotCube.Interact.Metadata.Nurturing, plotCube.Interact.Metadata.Id);
+ if (nurturing is null) {
+ lock (Plots) {
+ logger.Error("Failed to create Nurturing for {AccountId}, ItemId {ItemId}", session.AccountId, plotCube.ItemId);
+ }
+ return;
+ }
+ }
+ plotCube.Interact.Nurturing = nurturing;
+ }
+ session.Field.Broadcast(FunctionCubePacket.AddFunctionCube(plotCube.Interact));
+ }
+
+ if (plot.IsPlanner) {
+ return;
+ }
+ break;
+ case LiftableCube liftable:
+ FieldLiftable? fieldLiftable = session.Field.AddLiftable($"4_{position.ConvertToInt()}", liftable.Liftable);
+ if (fieldLiftable == null) {
+ return;
+ }
+
+ session.HeldCube = null;
+ fieldLiftable.Count = 1;
+ fieldLiftable.State = LiftableState.Default;
+ fieldLiftable.Position = position;
+ fieldLiftable.Rotation = new Vector3(0, 0, rotation);
+ fieldLiftable.FinishTick = session.Field.FieldTick + fieldLiftable.Value.ItemLifetime;
+
+ if (session.Field.Entities.LiftableTargetBoxes.TryGetValue(position, out LiftableTargetBox? liftableTarget)) {
+ session.ConditionUpdate(ConditionType.item_move, codeLong: cubeItem.ItemId, targetLong: liftableTarget.LiftableTarget);
+ }
+
+ Broadcast(LiftablePacket.Add(fieldLiftable));
+ if (plot.Cubes.TryAdd(position, new PlotCube(itemMetadata, liftable.Id) { Type = PlotCube.CubeType.Liftable, Position = position, Rotation = rotation })) {
+ Broadcast(CubePacket.PlaceLiftable(session.Player.ObjectId, liftable, position, rotation));
+ }
+ Broadcast(SetCraftModePacket.Stop(session.Player.ObjectId));
+ Broadcast(LiftablePacket.Update(fieldLiftable));
+ break;
+ }
+
+ session.ConditionUpdate(ConditionType.install_item, codeLong: cubeItem.ItemId);
+ }
 }

Maple2.Server.Game/Manager/Field/FieldManager/FieldManager.cs

@@ -125,6 +125,9 @@ public virtual void Init() {
  }
  }
 
+ // Create default to place liftable cubes
+ Plots[0] = Plot.Default;
+
  foreach (TriggerModel trigger in Entities.TriggerModels.Values) {
  AddTrigger(trigger);
  }

Maple2.Server.Game/Manager/HousingManager.cs

@@ -450,15 +450,10 @@ public void InteriorReward(byte rewardId) {
  }
 
  #region Helpers
- public bool TryPlaceCube(HeldCube cube, Plot plot, in Vector3B position, float rotation,
+ public bool TryPlaceCube(HeldCube cube, Plot plot, ItemMetadata itemMetadata, in Vector3B position, float rotation,
  [NotNullWhen(true)] out PlotCube? result, bool isReplace = false) {
  result = null;
- if (!session.ItemMetadata.TryGet(cube.ItemId, out ItemMetadata? itemMetadata) || itemMetadata.Install is null || itemMetadata.Housing is null) {
- logger.Error("Failed to get item metadata for cube {cubeId}.", cube.ItemId);
- return false;
- }
-
- if (plot.PlotMode is PlotMode.BlueprintPlanner && itemMetadata.Housing.IsNotAllowedInBlueprint) {
+ if (plot.PlotMode is PlotMode.BlueprintPlanner && itemMetadata.Housing!.IsNotAllowedInBlueprint) {
  if (itemMetadata.Housing.HousingCategory is HousingCategory.Farming or HousingCategory.Ranching) {
  session.Send(CubePacket.Error(UgcMapError.s_err_cannot_install_nurturing_in_design_home));
  } else if (cube.ItemId is Constant.InteriorPortalCubeId) {
@@ -480,7 +475,7 @@ public bool TryPlaceCube(HeldCube cube, Plot plot, in Vector3B position, float r
  groundHeight = groundTile.Position.Z / Constant.BlockSize;
  }
 
- bool isSolidCube = itemMetadata.Install.IsSolidCube;
+ bool isSolidCube = itemMetadata.Install!.IsSolidCube;
  bool isOnGround = Math.Abs(position.Z - groundHeight) < 0.1;
  bool allowWaterOnGround = itemMetadata.Install.MapAttribute is MapAttribute.water && Constant.AllowWaterOnGround;
 
@@ -517,6 +512,7 @@ public bool TryPlaceCube(HeldCube cube, Plot plot, in Vector3B position, float r
  result = new PlotCube(itemMetadata, FurnishingManager.NextCubeId(), cube.Template) {
  Position = position,
  Rotation = rotation,
+ Type = cube is LiftableCube ? PlotCube.CubeType.Liftable : PlotCube.CubeType.Construction,
  };
 
  if (functionCubeMetadata is not null) {
@@ -679,7 +675,7 @@ public void ApplyLayout(Plot plot, HomeLayout layout, bool isBlueprint = false)
  foreach (PlotCube cube in layout.Cubes) {
  Item? item = session.Item.Furnishing.GetItem(cube.ItemId);
  cube.Id = item?.Uid ?? 0;
- if (!TryPlaceCube(cube, plot, cube.Position, cube.Rotation, out PlotCube? plotCube)) {
+ if (!TryPlaceCube(cube, plot, item!.Metadata, cube.Position, cube.Rotation, out PlotCube? plotCube)) {
  return;
  }
 

Maple2.Server.Game/Manager/Items/FurnishingManager.cs

@@ -104,7 +104,9 @@ public bool TryPlaceCube(long uid, [NotNullWhen(true)] out PlotCube? cube) {
  ? FurnishingStoragePacket.Update(item.Uid, item.Amount)
  : FurnishingStoragePacket.Remove(item.Uid));
 
- cube = new PlotCube(item.Metadata, NextCubeId(), item.Template);
+ cube = new PlotCube(item.Metadata, NextCubeId(), item.Template) {
+ Type = PlotCube.CubeType.Construction,
+ };
  if (!AddInventory(cube)) {
  logger.Fatal("Failed to add cube: {CubeId} to inventory", cube.Id);
  throw new InvalidOperationException($"Failed to add cube: {cube.Id} to inventory");

Maple2.Server.Game/Model/Field/Entity/FieldLiftable.cs

@@ -28,44 +28,47 @@ public FieldLiftable(FieldManager field, int objectId, string entityId, Liftable
  Count--;
  // Only respawn if we have a regen time
  if (RespawnTick == 0 && Value.RegenCheckTime > 0) {
- RespawnTick = Environment.TickCount64 + Value.RegenCheckTime;
+ RespawnTick = Field.FieldTick + Value.RegenCheckTime;
  }
 
  if (Count > 0) {
  Field.Broadcast(LiftablePacket.Update(this));
+ } else if (FinishTick > 0) {
+ // This is a temp liftable, so we need to remove it
+ Field.RemoveLiftable(EntityId);
  } else {
- State = Value.RegenCheckTime > 0 ? LiftableState.Respawning : LiftableState.Removed;
- Field.Broadcast(LiftablePacket.Remove(EntityId));
+ State = LiftableState.Removed;
+ Field.Broadcast(LiftablePacket.Update(this));
+
  Field.Broadcast(CubePacket.RemoveCube(ObjectId, Position));
  }
 
  return new LiftableCube(Value);
  }
 
  public override void Update(long tickCount) {
-// Handles despawning after being placed
-if (FinishTick != 0 && tickCount > FinishTick) {
-Field.RemoveLiftable(EntityId);
-return;
- }
-
-if (RespawnTick == 0 || tickCount < RespawnTick) {
-return;
-}
-
-Count++;
-// Only respawn if we have a regen time
-if (Count < Value.ItemStackCount && Value.RegenCheckTime > 0) {
-RespawnTick = tickCount + Value.RegenCheckTime;
-} else {
-RespawnTick = 0;
-}
-
-if (Count == 1) {
-State = LiftableState.Default;
-Field.Broadcast(LiftablePacket.Add(this));
-Field.Broadcast(CubePacket.PlaceLiftable(ObjectId, new LiftableCube(Value), Position, Rotation.Z));
+switch (State) {
+ case LiftableState.Removed:
+ if (RespawnTick > tickCount) {
+ State = LiftableState.Respawning;
+}
+ break;
+ case LiftableState.Respawning:
+ if (tickCount >= RespawnTick) {
+ State = LiftableState.Default;
+ Count = Value.ItemStackCount;
+ RespawnTick = 0;
+ Field.Broadcast(LiftablePacket.Update(this));
+ }
+ break;
+ case LiftableState.Default:
+ if (FinishTick != 0 && tickCount > FinishTick) {
+ Field.RemoveLiftable(EntityId);
+ return;
+ }
+ break;
+case LiftableState.Disabled:
+ return;
  }
- Field.Broadcast(LiftablePacket.Update(this));
  }
 }

Maple2.Database/Storage/Game/GameStorage.Mail.cs

@@ -110,7 +110,7 @@ public ICollection<Mail> GetAllMail(long characterId, long minId = 0) {
  Context.ChangeTracker.QueryTrackingBehavior = QueryTrackingBehavior.TrackAll;
 
  Model.Mail? mail = Context.Mail.Find(characterId, mailId);
- if (mail == null || mail.ReadTime > DateTime.UnixEpoch) {
+ if (mail == null || mail.ReadTime > DateTime.Now) {
  return null;
  }
 

Maple2.Database/Storage/Game/GameStorage.Map.cs

@@ -293,6 +293,7 @@ public bool InitUgcMap(IEnumerable<UgcMapMetadata> maps) {
  Position = new Vector3B(model.X, model.Y, model.Z),
  Rotation = model.Rotation,
  Interact = ToInteractCube(model.Interact),
+ Type = PlotCube.CubeType.Construction,
  };
  }
 
@@ -309,6 +310,7 @@ public bool InitUgcMap(IEnumerable<UgcMapMetadata> maps) {
  Position = new Vector3B(model.X, model.Y, model.Z),
  Rotation = model.Rotation,
  Interact = ToInteractCube(model.Interact),
+ Type = PlotCube.CubeType.Construction,
  };
  }
  }

Maple2.File.Ingest/Mapper/MapEntityMapper.cs

@@ -189,7 +189,7 @@ private IEnumerable<MapEntity> ParseMap(string xblock, IEnumerable<IMapEntity> e
  switch (physXProp) {
  case IMS2Liftable liftable:
  yield return new MapEntity(xblock, new Guid(entity.EntityId), entity.EntityName) {
- Block = new Liftable((int) liftable.ItemID, liftable.ItemStackCount, liftable.ItemLifeTime, liftable.LiftableRegenCheckTime, liftable.LiftableFinishTime, liftable.MaskQuestID, liftable.MaskQuestState, liftable.EffectQuestID, liftable.EffectQuestState, liftable.Position, liftable.Rotation)
+ Block = new Liftable((int) liftable.ItemID, liftable.ItemStackCount, liftable.ItemLifeTime, liftable.LiftableRegenCheckTime, liftable.LiftableFinishTime, liftable.MaskQuestID, liftable.MaskQuestState, liftable.EffectQuestID, liftable.EffectQuestState, liftable.IsReactEffect, liftable.Position, liftable.Rotation)
  };
  continue;
  case IMS2TaxiStation taxiStation:

Maple2.Model/Game/Cube/PlotCube.cs

@@ -10,7 +10,7 @@ public enum CubeType { Default, Construction, Liftable };
 
  public Vector3B Position { get; set; }
  public float Rotation { get; set; }
- public CubeType Type { get; set; }
+ public required CubeType Type { get; set; }
 
  public int PlotId { get; set; }
 

Maple2.Model/Game/User/Character.cs

@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Numerics;
+using System.Numerics;
 using Maple2.Model.Common;
 using Maple2.Model.Enum;
 

Maple2.Model/Game/User/IPlayerInfo.cs

@@ -1,6 +1,4 @@
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using Maple2.Model.Enum;
+using Maple2.Model.Enum;
 
 namespace Maple2.Model.Game;
 

Maple2.Model/Game/User/PlayerInfo.cs

@@ -30,7 +30,7 @@ public static implicit operator PlayerInfo(Player player) {
  AchievementInfo = player.Character.AchievementInfo,
  PremiumTime = player.Character.PremiumTime,
  LastOnlineTime = player.Character.LastOnlineTime,
- DungeonEnterLimits = [],
+ DungeonEnterLimits = player.Character.DungeonEnterLimits,
  GuildId = player.Character.GuildId,
  GuildName = player.Character.GuildName,
  };

Maple2.Model/Game/User/PlotInfo.cs

@@ -51,6 +51,12 @@ public PlotState State {
 
 public class Plot(UgcMapGroup metadata) : PlotInfo(metadata) {
  public readonly Dictionary<Vector3B, PlotCube> Cubes = new();
+ public static readonly Plot Default = new(new UgcMapGroup(0,
+ 0,
+ 0,
+ new UgcMapGroup.Cost(0, 0, 0),
+ new UgcMapGroup.Cost(0, 0, 0),
+ new UgcMapGroup.Limits(0, 0, 0, 0, 0, 0)));
 
  public void SetPlannerMode(PlotMode mode) {
  PlotMode = mode;

Maple2.Model/Metadata/MapEntity/Liftable.cs

@@ -12,6 +12,7 @@ public record Liftable(
  string MaskQuestState,
  string EffectQuestId,
  string EffectQuestState,
+ bool ReactEffect,
  Vector3 Position,
  Vector3 Rotation)
 : MapBlock;

Maple2.Server.Core/Sync/PlayerInfoUpdateExtensions.cs

@@ -118,7 +118,6 @@ public static void Update(this IPlayerInfo self, UpdateField type, IPlayerInfo o
  if (type.HasFlag(UpdateField.Clubs)) {
  self.ClubIds = other.ClubIds;
  }
-
  if (type.HasFlag(UpdateField.Dungeon)) {
  self.DungeonEnterLimits = other.DungeonEnterLimits;
  }

Maple2.Server.Game/Manager/DungeonManager.cs

@@ -81,6 +81,15 @@ public void UpdateDungeonEnterLimit() {
  }
 
  if (updated) {
+ session.PlayerInfo.SendUpdate(new PlayerUpdateRequest {
+ AccountId = session.AccountId,
+ CharacterId = session.CharacterId,
+ DungeonEnterLimits = { EnterLimits.Select(dungeon => new DungeonEnterLimitUpdate {
+ DungeonId = dungeon.Key,
+ Limit = (int) dungeon.Value,
+ })},
+ Async = true,
+ });
  session.Send(FieldEntrancePacket.Load(EnterLimits));
  }
  }
@@ -209,13 +218,6 @@ public void CreateDungeonRoom(int dungeonId, bool withParty) {
  session.Send(DungeonRoomPacket.Error(DungeonRoomError.s_room_party_err_not_chief));
  return;
  }
-
- foreach (PartyMember member in Party.Members.Values) {
- if (!member.Info.DungeonEnterLimits.TryGetValue(dungeonId, out DungeonEnterLimit enterLimit) || enterLimit != DungeonEnterLimit.None) {
- //session.Send(DungeonRoomPacket.Error(DungeonRoomError));
- return;
- }
- }
  }
 
 

Maple2.Server.Game/Manager/Field/FieldManager/FieldManager.State.cs

@@ -656,7 +656,10 @@ public bool RemoveLiftable(string entityId) {
  return false;
  }
 
- Broadcast(CubePacket.RemoveCube(fieldLiftable.ObjectId, fieldLiftable.Position));
+ if (Plots[0].Cubes.Remove(fieldLiftable.Position)) {
+ Broadcast(CubePacket.RemoveCube(fieldLiftable.ObjectId, fieldLiftable.Position));
+ }
+
  Broadcast(LiftablePacket.Remove(entityId));
  return true;
  }
@@ -735,7 +738,10 @@ public bool RemoveInstrument(int objectId) {
  public void OnAddPlayer(FieldPlayer added) {
  Players[added.ObjectId] = added;
  // LOAD:
- added.Session.Send(LiftablePacket.Update(fieldLiftables.Values));
+ foreach (FieldLiftable liftable in fieldLiftables.Values.Where(liftable => liftable.FinishTick > 0)) {
+ added.Session.Send(LiftablePacket.Add(liftable));
+ }
+ added.Session.Send(LiftablePacket.Update(fieldLiftables.Values.Where(liftable => liftable.FinishTick == 0).ToList()));
  added.Session.Send(BreakablePacket.Update(fieldBreakables.Values));
  added.Session.Send(InteractObjectPacket.Load(fieldInteracts.Values));
  foreach (FieldInteract fieldInteract in fieldAdBalloons.Values) {

Maple2.Server.Game/Manager/Field/FieldManager/FieldManager.Ugc.cs

@@ -1,8 +1,12 @@
 using System.Collections.Concurrent;
+using System.Numerics;
 using Maple2.Database.Storage;
+using Maple2.Model.Common;
+using Maple2.Model.Enum;
 using Maple2.Model.Game;
 using Maple2.Model.Game.Ugc;
-using Maple2.Server.Core.Packets;
+using Maple2.Model.Metadata;
+using Maple2.Server.Game.Model;
 using Maple2.Server.Game.Model.Field;
 using Maple2.Server.Game.Packets;
 using Maple2.Server.Game.Session;
@@ -84,4 +88,78 @@ void SavePlot(Plot plot) {
  }
  }
  }
+
+ public void PlaceCube(GameSession session, HeldCube cubeItem, in Vector3B position, float rotation) {
+ Plot? plot = session.Field.Plots[0];
+ if (!session.ItemMetadata.TryGet(cubeItem.ItemId, out ItemMetadata? itemMetadata)) {
+ logger.Error("Failed to get item metadata for cube {cubeId}.", cubeItem.ItemId);
+ return;
+ }
+ switch (session.HeldCube) {
+ case PlotCube _:
+ if (itemMetadata.Install is null || itemMetadata.Housing is null) {
+ logger.Error($"Item {cubeItem.ItemId} is not a housing item.");
+ return;
+ }
+ plot = session.Housing.GetFieldPlot();
+ if (plot == null) {
+ return;
+ }
+
+ if (!session.Housing.TryPlaceCube(cubeItem, plot, itemMetadata, position, rotation, out PlotCube? plotCube)) {
+ return;
+ }
+
+ session.Field.Broadcast(CubePacket.PlaceCube(session.Player.ObjectId, plot, plotCube));
+
+ if (plotCube.Interact is not null) {
+ if (plotCube.Interact.Nurturing is not null && plotCube.Interact.Metadata.Nurturing is not null) {
+ using GameStorage.Request db = session.GameStorage.Context();
+ Nurturing? nurturing = db.GetNurturing(session.AccountId, plotCube.ItemId, plotCube.Interact.Metadata.Nurturing);
+ if (nurturing is null) {
+ nurturing = db.CreateNurturing(session.AccountId, plotCube.Interact.Metadata.Nurturing, plotCube.Interact.Metadata.Id);
+ if (nurturing is null) {
+ lock (Plots) {
+ logger.Error("Failed to create Nurturing for {AccountId}, ItemId {ItemId}", session.AccountId, plotCube.ItemId);
+ }
+ return;
+ }
+ }
+ plotCube.Interact.Nurturing = nurturing;
+ }
+ session.Field.Broadcast(FunctionCubePacket.AddFunctionCube(plotCube.Interact));
+ }
+
+ if (plot.IsPlanner) {
+ return;
+ }
+ break;
+ case LiftableCube liftable:
+ FieldLiftable? fieldLiftable = session.Field.AddLiftable($"4_{position.ConvertToInt()}", liftable.Liftable);
+ if (fieldLiftable == null) {
+ return;
+ }
+
+ session.HeldCube = null;
+ fieldLiftable.Count = 1;
+ fieldLiftable.State = LiftableState.Default;
+ fieldLiftable.Position = position;
+ fieldLiftable.Rotation = new Vector3(0, 0, rotation);
+ fieldLiftable.FinishTick = session.Field.FieldTick + fieldLiftable.Value.ItemLifetime;
+
+ if (session.Field.Entities.LiftableTargetBoxes.TryGetValue(position, out LiftableTargetBox? liftableTarget)) {
+ session.ConditionUpdate(ConditionType.item_move, codeLong: cubeItem.ItemId, targetLong: liftableTarget.LiftableTarget);
+ }
+
+ Broadcast(LiftablePacket.Add(fieldLiftable));
+ if (plot.Cubes.TryAdd(position, new PlotCube(itemMetadata, liftable.Id) { Type = PlotCube.CubeType.Liftable, Position = position, Rotation = rotation })) {
+ Broadcast(CubePacket.PlaceLiftable(session.Player.ObjectId, liftable, position, rotation));
+ }
+ Broadcast(SetCraftModePacket.Stop(session.Player.ObjectId));
+ Broadcast(LiftablePacket.Update(fieldLiftable));
+ break;
+ }
+
+ session.ConditionUpdate(ConditionType.install_item, codeLong: cubeItem.ItemId);
+ }
 }

Maple2.Server.Game/Manager/Field/FieldManager/FieldManager.cs

@@ -125,6 +125,9 @@ public virtual void Init() {
  }
  }
 
+ // Create default to place liftable cubes
+ Plots[0] = Plot.Default;
+
  foreach (TriggerModel trigger in Entities.TriggerModels.Values) {
  AddTrigger(trigger);
  }

Maple2.Server.Game/Manager/HousingManager.cs

@@ -450,15 +450,10 @@ public void InteriorReward(byte rewardId) {
  }
 
  #region Helpers
- public bool TryPlaceCube(HeldCube cube, Plot plot, in Vector3B position, float rotation,
+ public bool TryPlaceCube(HeldCube cube, Plot plot, ItemMetadata itemMetadata, in Vector3B position, float rotation,
  [NotNullWhen(true)] out PlotCube? result, bool isReplace = false) {
  result = null;
- if (!session.ItemMetadata.TryGet(cube.ItemId, out ItemMetadata? itemMetadata) || itemMetadata.Install is null || itemMetadata.Housing is null) {
- logger.Error("Failed to get item metadata for cube {cubeId}.", cube.ItemId);
- return false;
- }
-
- if (plot.PlotMode is PlotMode.BlueprintPlanner && itemMetadata.Housing.IsNotAllowedInBlueprint) {
+ if (plot.PlotMode is PlotMode.BlueprintPlanner && itemMetadata.Housing!.IsNotAllowedInBlueprint) {
  if (itemMetadata.Housing.HousingCategory is HousingCategory.Farming or HousingCategory.Ranching) {
  session.Send(CubePacket.Error(UgcMapError.s_err_cannot_install_nurturing_in_design_home));
  } else if (cube.ItemId is Constant.InteriorPortalCubeId) {
@@ -480,7 +475,7 @@ public bool TryPlaceCube(HeldCube cube, Plot plot, in Vector3B position, float r
  groundHeight = groundTile.Position.Z / Constant.BlockSize;
  }
 
- bool isSolidCube = itemMetadata.Install.IsSolidCube;
+ bool isSolidCube = itemMetadata.Install!.IsSolidCube;
  bool isOnGround = Math.Abs(position.Z - groundHeight) < 0.1;
  bool allowWaterOnGround = itemMetadata.Install.MapAttribute is MapAttribute.water && Constant.AllowWaterOnGround;
 
@@ -517,6 +512,7 @@ public bool TryPlaceCube(HeldCube cube, Plot plot, in Vector3B position, float r
  result = new PlotCube(itemMetadata, FurnishingManager.NextCubeId(), cube.Template) {
  Position = position,
  Rotation = rotation,
+ Type = cube is LiftableCube ? PlotCube.CubeType.Liftable : PlotCube.CubeType.Construction,
  };
 
  if (functionCubeMetadata is not null) {
@@ -679,7 +675,7 @@ public void ApplyLayout(Plot plot, HomeLayout layout, bool isBlueprint = false)
  foreach (PlotCube cube in layout.Cubes) {
  Item? item = session.Item.Furnishing.GetItem(cube.ItemId);
  cube.Id = item?.Uid ?? 0;
- if (!TryPlaceCube(cube, plot, cube.Position, cube.Rotation, out PlotCube? plotCube)) {
+ if (!TryPlaceCube(cube, plot, item!.Metadata, cube.Position, cube.Rotation, out PlotCube? plotCube)) {
  return;
  }
 

Maple2.Server.Game/Manager/Items/FurnishingManager.cs

@@ -104,7 +104,9 @@ public bool TryPlaceCube(long uid, [NotNullWhen(true)] out PlotCube? cube) {
  ? FurnishingStoragePacket.Update(item.Uid, item.Amount)
  : FurnishingStoragePacket.Remove(item.Uid));
 
- cube = new PlotCube(item.Metadata, NextCubeId(), item.Template);
+ cube = new PlotCube(item.Metadata, NextCubeId(), item.Template) {
+ Type = PlotCube.CubeType.Construction,
+ };
  if (!AddInventory(cube)) {
  logger.Fatal("Failed to add cube: {CubeId} to inventory", cube.Id);
  throw new InvalidOperationException($"Failed to add cube: {cube.Id} to inventory");

Maple2.Server.Game/Model/Field/Entity/FieldLiftable.cs

@@ -28,44 +28,47 @@ public FieldLiftable(FieldManager field, int objectId, string entityId, Liftable
  Count--;
  // Only respawn if we have a regen time
  if (RespawnTick == 0 && Value.RegenCheckTime > 0) {
- RespawnTick = Environment.TickCount64 + Value.RegenCheckTime;
+ RespawnTick = Field.FieldTick + Value.RegenCheckTime;
  }
 
  if (Count > 0) {
  Field.Broadcast(LiftablePacket.Update(this));
+ } else if (FinishTick > 0) {
+ // This is a temp liftable, so we need to remove it
+ Field.RemoveLiftable(EntityId);
  } else {
- State = Value.RegenCheckTime > 0 ? LiftableState.Respawning : LiftableState.Removed;
- Field.Broadcast(LiftablePacket.Remove(EntityId));
+ State = LiftableState.Removed;
+ Field.Broadcast(LiftablePacket.Update(this));
+
  Field.Broadcast(CubePacket.RemoveCube(ObjectId, Position));
  }
 
  return new LiftableCube(Value);
  }
 
  public override void Update(long tickCount) {
-// Handles despawning after being placed
-if (FinishTick != 0 && tickCount > FinishTick) {
-Field.RemoveLiftable(EntityId);
-return;
- }
-
-if (RespawnTick == 0 || tickCount < RespawnTick) {
-return;
-}
-
-Count++;
-// Only respawn if we have a regen time
-if (Count < Value.ItemStackCount && Value.RegenCheckTime > 0) {
-RespawnTick = tickCount + Value.RegenCheckTime;
-} else {
-RespawnTick = 0;
-}
-
-if (Count == 1) {
-State = LiftableState.Default;
-Field.Broadcast(LiftablePacket.Add(this));
-Field.Broadcast(CubePacket.PlaceLiftable(ObjectId, new LiftableCube(Value), Position, Rotation.Z));
+switch (State) {
+ case LiftableState.Removed:
+ if (RespawnTick > tickCount) {
+ State = LiftableState.Respawning;
+}
+ break;
+ case LiftableState.Respawning:
+ if (tickCount >= RespawnTick) {
+ State = LiftableState.Default;
+ Count = Value.ItemStackCount;
+ RespawnTick = 0;
+ Field.Broadcast(LiftablePacket.Update(this));
+ }
+ break;
+ case LiftableState.Default:
+ if (FinishTick != 0 && tickCount > FinishTick) {
+ Field.RemoveLiftable(EntityId);
+ return;
+ }
+ break;
+case LiftableState.Disabled:
+ return;
  }
- Field.Broadcast(LiftablePacket.Update(this));
  }
 }

Maple2.Database/Storage/Game/GameStorage.Mail.cs

@@ -110,7 +110,7 @@ public ICollection<Mail> GetAllMail(long characterId, long minId = 0) {
  Context.ChangeTracker.QueryTrackingBehavior = QueryTrackingBehavior.TrackAll;
 
  Model.Mail? mail = Context.Mail.Find(characterId, mailId);
- if (mail == null || mail.ReadTime > DateTime.UnixEpoch) {
+ if (mail == null || mail.ReadTime > DateTime.Now) {
  return null;
  }
 

Maple2.Database/Storage/Game/GameStorage.Map.cs

@@ -293,6 +293,7 @@ public bool InitUgcMap(IEnumerable<UgcMapMetadata> maps) {
  Position = new Vector3B(model.X, model.Y, model.Z),
  Rotation = model.Rotation,
  Interact = ToInteractCube(model.Interact),
+ Type = PlotCube.CubeType.Construction,
  };
  }
 
@@ -309,6 +310,7 @@ public bool InitUgcMap(IEnumerable<UgcMapMetadata> maps) {
  Position = new Vector3B(model.X, model.Y, model.Z),
  Rotation = model.Rotation,
  Interact = ToInteractCube(model.Interact),
+ Type = PlotCube.CubeType.Construction,
  };
  }
  }

Maple2.File.Ingest/Mapper/MapEntityMapper.cs

@@ -189,7 +189,7 @@ private IEnumerable<MapEntity> ParseMap(string xblock, IEnumerable<IMapEntity> e
  switch (physXProp) {
  case IMS2Liftable liftable:
  yield return new MapEntity(xblock, new Guid(entity.EntityId), entity.EntityName) {
- Block = new Liftable((int) liftable.ItemID, liftable.ItemStackCount, liftable.ItemLifeTime, liftable.LiftableRegenCheckTime, liftable.LiftableFinishTime, liftable.MaskQuestID, liftable.MaskQuestState, liftable.EffectQuestID, liftable.EffectQuestState, liftable.Position, liftable.Rotation)
+ Block = new Liftable((int) liftable.ItemID, liftable.ItemStackCount, liftable.ItemLifeTime, liftable.LiftableRegenCheckTime, liftable.LiftableFinishTime, liftable.MaskQuestID, liftable.MaskQuestState, liftable.EffectQuestID, liftable.EffectQuestState, liftable.IsReactEffect, liftable.Position, liftable.Rotation)
  };
  continue;
  case IMS2TaxiStation taxiStation:

Maple2.Model/Game/Cube/PlotCube.cs

@@ -10,7 +10,7 @@ public enum CubeType { Default, Construction, Liftable };
 
  public Vector3B Position { get; set; }
  public float Rotation { get; set; }
- public CubeType Type { get; set; }
+ public required CubeType Type { get; set; }
 
  public int PlotId { get; set; }
 

Maple2.Model/Game/User/Character.cs

@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Numerics;
+using System.Numerics;
 using Maple2.Model.Common;
 using Maple2.Model.Enum;
 

Maple2.Model/Game/User/IPlayerInfo.cs

@@ -1,6 +1,4 @@
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using Maple2.Model.Enum;
+using Maple2.Model.Enum;
 
 namespace Maple2.Model.Game;
 

Maple2.Model/Game/User/PlayerInfo.cs

@@ -30,7 +30,7 @@ public static implicit operator PlayerInfo(Player player) {
  AchievementInfo = player.Character.AchievementInfo,
  PremiumTime = player.Character.PremiumTime,
  LastOnlineTime = player.Character.LastOnlineTime,
- DungeonEnterLimits = [],
+ DungeonEnterLimits = player.Character.DungeonEnterLimits,
  GuildId = player.Character.GuildId,
  GuildName = player.Character.GuildName,
  };

Maple2.Model/Game/User/PlotInfo.cs

@@ -51,6 +51,12 @@ public PlotState State {
 
 public class Plot(UgcMapGroup metadata) : PlotInfo(metadata) {
  public readonly Dictionary<Vector3B, PlotCube> Cubes = new();
+ public static readonly Plot Default = new(new UgcMapGroup(0,
+ 0,
+ 0,
+ new UgcMapGroup.Cost(0, 0, 0),
+ new UgcMapGroup.Cost(0, 0, 0),
+ new UgcMapGroup.Limits(0, 0, 0, 0, 0, 0)));
 
  public void SetPlannerMode(PlotMode mode) {
  PlotMode = mode;

Maple2.Model/Metadata/MapEntity/Liftable.cs

@@ -12,6 +12,7 @@ public record Liftable(
  string MaskQuestState,
  string EffectQuestId,
  string EffectQuestState,
+ bool ReactEffect,
  Vector3 Position,
  Vector3 Rotation)
 : MapBlock;

Maple2.Server.Core/Sync/PlayerInfoUpdateExtensions.cs

@@ -118,7 +118,6 @@ public static void Update(this IPlayerInfo self, UpdateField type, IPlayerInfo o
  if (type.HasFlag(UpdateField.Clubs)) {
  self.ClubIds = other.ClubIds;
  }
-
  if (type.HasFlag(UpdateField.Dungeon)) {
  self.DungeonEnterLimits = other.DungeonEnterLimits;
  }

Maple2.Server.Game/Manager/DungeonManager.cs

@@ -81,6 +81,15 @@ public void UpdateDungeonEnterLimit() {
  }
 
  if (updated) {
+ session.PlayerInfo.SendUpdate(new PlayerUpdateRequest {
+ AccountId = session.AccountId,
+ CharacterId = session.CharacterId,
+ DungeonEnterLimits = { EnterLimits.Select(dungeon => new DungeonEnterLimitUpdate {
+ DungeonId = dungeon.Key,
+ Limit = (int) dungeon.Value,
+ })},
+ Async = true,
+ });
  session.Send(FieldEntrancePacket.Load(EnterLimits));
  }
  }
@@ -209,13 +218,6 @@ public void CreateDungeonRoom(int dungeonId, bool withParty) {
  session.Send(DungeonRoomPacket.Error(DungeonRoomError.s_room_party_err_not_chief));
  return;
  }
-
- foreach (PartyMember member in Party.Members.Values) {
- if (!member.Info.DungeonEnterLimits.TryGetValue(dungeonId, out DungeonEnterLimit enterLimit) || enterLimit != DungeonEnterLimit.None) {
- //session.Send(DungeonRoomPacket.Error(DungeonRoomError));
- return;
- }
- }
  }
 
 

Maple2.Server.Game/Manager/Field/FieldManager/FieldManager.State.cs

@@ -656,7 +656,10 @@ public bool RemoveLiftable(string entityId) {
  return false;
  }
 
- Broadcast(CubePacket.RemoveCube(fieldLiftable.ObjectId, fieldLiftable.Position));
+ if (Plots[0].Cubes.Remove(fieldLiftable.Position)) {
+ Broadcast(CubePacket.RemoveCube(fieldLiftable.ObjectId, fieldLiftable.Position));
+ }
+
  Broadcast(LiftablePacket.Remove(entityId));
  return true;
  }
@@ -735,7 +738,10 @@ public bool RemoveInstrument(int objectId) {
  public void OnAddPlayer(FieldPlayer added) {
  Players[added.ObjectId] = added;
  // LOAD:
- added.Session.Send(LiftablePacket.Update(fieldLiftables.Values));
+ foreach (FieldLiftable liftable in fieldLiftables.Values.Where(liftable => liftable.FinishTick > 0)) {
+ added.Session.Send(LiftablePacket.Add(liftable));
+ }
+ added.Session.Send(LiftablePacket.Update(fieldLiftables.Values.Where(liftable => liftable.FinishTick == 0).ToList()));
  added.Session.Send(BreakablePacket.Update(fieldBreakables.Values));
  added.Session.Send(InteractObjectPacket.Load(fieldInteracts.Values));
  foreach (FieldInteract fieldInteract in fieldAdBalloons.Values) {

Maple2.Server.Game/Manager/Field/FieldManager/FieldManager.Ugc.cs

@@ -1,8 +1,12 @@
 using System.Collections.Concurrent;
+using System.Numerics;
 using Maple2.Database.Storage;
+using Maple2.Model.Common;
+using Maple2.Model.Enum;
 using Maple2.Model.Game;
 using Maple2.Model.Game.Ugc;
-using Maple2.Server.Core.Packets;
+using Maple2.Model.Metadata;
+using Maple2.Server.Game.Model;
 using Maple2.Server.Game.Model.Field;
 using Maple2.Server.Game.Packets;
 using Maple2.Server.Game.Session;
@@ -84,4 +88,78 @@ void SavePlot(Plot plot) {
  }
  }
  }
+
+ public void PlaceCube(GameSession session, HeldCube cubeItem, in Vector3B position, float rotation) {
+ Plot? plot = session.Field.Plots[0];
+ if (!session.ItemMetadata.TryGet(cubeItem.ItemId, out ItemMetadata? itemMetadata)) {
+ logger.Error("Failed to get item metadata for cube {cubeId}.", cubeItem.ItemId);
+ return;
+ }
+ switch (session.HeldCube) {
+ case PlotCube _:
+ if (itemMetadata.Install is null || itemMetadata.Housing is null) {
+ logger.Error($"Item {cubeItem.ItemId} is not a housing item.");
+ return;
+ }
+ plot = session.Housing.GetFieldPlot();
+ if (plot == null) {
+ return;
+ }
+
+ if (!session.Housing.TryPlaceCube(cubeItem, plot, itemMetadata, position, rotation, out PlotCube? plotCube)) {
+ return;
+ }
+
+ session.Field.Broadcast(CubePacket.PlaceCube(session.Player.ObjectId, plot, plotCube));
+
+ if (plotCube.Interact is not null) {
+ if (plotCube.Interact.Nurturing is not null && plotCube.Interact.Metadata.Nurturing is not null) {
+ using GameStorage.Request db = session.GameStorage.Context();
+ Nurturing? nurturing = db.GetNurturing(session.AccountId, plotCube.ItemId, plotCube.Interact.Metadata.Nurturing);
+ if (nurturing is null) {
+ nurturing = db.CreateNurturing(session.AccountId, plotCube.Interact.Metadata.Nurturing, plotCube.Interact.Metadata.Id);
+ if (nurturing is null) {
+ lock (Plots) {
+ logger.Error("Failed to create Nurturing for {AccountId}, ItemId {ItemId}", session.AccountId, plotCube.ItemId);
+ }
+ return;
+ }
+ }
+ plotCube.Interact.Nurturing = nurturing;
+ }
+ session.Field.Broadcast(FunctionCubePacket.AddFunctionCube(plotCube.Interact));
+ }
+
+ if (plot.IsPlanner) {
+ return;
+ }
+ break;
+ case LiftableCube liftable:
+ FieldLiftable? fieldLiftable = session.Field.AddLiftable($"4_{position.ConvertToInt()}", liftable.Liftable);
+ if (fieldLiftable == null) {
+ return;
+ }
+
+ session.HeldCube = null;
+ fieldLiftable.Count = 1;
+ fieldLiftable.State = LiftableState.Default;
+ fieldLiftable.Position = position;
+ fieldLiftable.Rotation = new Vector3(0, 0, rotation);
+ fieldLiftable.FinishTick = session.Field.FieldTick + fieldLiftable.Value.ItemLifetime;
+
+ if (session.Field.Entities.LiftableTargetBoxes.TryGetValue(position, out LiftableTargetBox? liftableTarget)) {
+ session.ConditionUpdate(ConditionType.item_move, codeLong: cubeItem.ItemId, targetLong: liftableTarget.LiftableTarget);
+ }
+
+ Broadcast(LiftablePacket.Add(fieldLiftable));
+ if (plot.Cubes.TryAdd(position, new PlotCube(itemMetadata, liftable.Id) { Type = PlotCube.CubeType.Liftable, Position = position, Rotation = rotation })) {
+ Broadcast(CubePacket.PlaceLiftable(session.Player.ObjectId, liftable, position, rotation));
+ }
+ Broadcast(SetCraftModePacket.Stop(session.Player.ObjectId));
+ Broadcast(LiftablePacket.Update(fieldLiftable));
+ break;
+ }
+
+ session.ConditionUpdate(ConditionType.install_item, codeLong: cubeItem.ItemId);
+ }
 }

Maple2.Server.Game/Manager/Field/FieldManager/FieldManager.cs

@@ -125,6 +125,9 @@ public virtual void Init() {
  }
  }
 
+ // Create default to place liftable cubes
+ Plots[0] = Plot.Default;
+
  foreach (TriggerModel trigger in Entities.TriggerModels.Values) {
  AddTrigger(trigger);
  }

Maple2.Server.Game/Manager/HousingManager.cs

@@ -450,15 +450,10 @@ public void InteriorReward(byte rewardId) {
  }
 
  #region Helpers
- public bool TryPlaceCube(HeldCube cube, Plot plot, in Vector3B position, float rotation,
+ public bool TryPlaceCube(HeldCube cube, Plot plot, ItemMetadata itemMetadata, in Vector3B position, float rotation,
  [NotNullWhen(true)] out PlotCube? result, bool isReplace = false) {
  result = null;
- if (!session.ItemMetadata.TryGet(cube.ItemId, out ItemMetadata? itemMetadata) || itemMetadata.Install is null || itemMetadata.Housing is null) {
- logger.Error("Failed to get item metadata for cube {cubeId}.", cube.ItemId);
- return false;
- }
-
- if (plot.PlotMode is PlotMode.BlueprintPlanner && itemMetadata.Housing.IsNotAllowedInBlueprint) {
+ if (plot.PlotMode is PlotMode.BlueprintPlanner && itemMetadata.Housing!.IsNotAllowedInBlueprint) {
  if (itemMetadata.Housing.HousingCategory is HousingCategory.Farming or HousingCategory.Ranching) {
  session.Send(CubePacket.Error(UgcMapError.s_err_cannot_install_nurturing_in_design_home));
  } else if (cube.ItemId is Constant.InteriorPortalCubeId) {
@@ -480,7 +475,7 @@ public bool TryPlaceCube(HeldCube cube, Plot plot, in Vector3B position, float r
  groundHeight = groundTile.Position.Z / Constant.BlockSize;
  }
 
- bool isSolidCube = itemMetadata.Install.IsSolidCube;
+ bool isSolidCube = itemMetadata.Install!.IsSolidCube;
  bool isOnGround = Math.Abs(position.Z - groundHeight) < 0.1;
  bool allowWaterOnGround = itemMetadata.Install.MapAttribute is MapAttribute.water && Constant.AllowWaterOnGround;
 
@@ -517,6 +512,7 @@ public bool TryPlaceCube(HeldCube cube, Plot plot, in Vector3B position, float r
  result = new PlotCube(itemMetadata, FurnishingManager.NextCubeId(), cube.Template) {
  Position = position,
  Rotation = rotation,
+ Type = cube is LiftableCube ? PlotCube.CubeType.Liftable : PlotCube.CubeType.Construction,
  };
 
  if (functionCubeMetadata is not null) {
@@ -679,7 +675,7 @@ public void ApplyLayout(Plot plot, HomeLayout layout, bool isBlueprint = false)
  foreach (PlotCube cube in layout.Cubes) {
  Item? item = session.Item.Furnishing.GetItem(cube.ItemId);
  cube.Id = item?.Uid ?? 0;
- if (!TryPlaceCube(cube, plot, cube.Position, cube.Rotation, out PlotCube? plotCube)) {
+ if (!TryPlaceCube(cube, plot, item!.Metadata, cube.Position, cube.Rotation, out PlotCube? plotCube)) {
  return;
  }
 

Maple2.Server.Game/Manager/Items/FurnishingManager.cs

@@ -104,7 +104,9 @@ public bool TryPlaceCube(long uid, [NotNullWhen(true)] out PlotCube? cube) {
  ? FurnishingStoragePacket.Update(item.Uid, item.Amount)
  : FurnishingStoragePacket.Remove(item.Uid));
 
- cube = new PlotCube(item.Metadata, NextCubeId(), item.Template);
+ cube = new PlotCube(item.Metadata, NextCubeId(), item.Template) {
+ Type = PlotCube.CubeType.Construction,
+ };
  if (!AddInventory(cube)) {
  logger.Fatal("Failed to add cube: {CubeId} to inventory", cube.Id);
  throw new InvalidOperationException($"Failed to add cube: {cube.Id} to inventory");

Maple2.Server.Game/Model/Field/Entity/FieldLiftable.cs

@@ -28,44 +28,47 @@ public FieldLiftable(FieldManager field, int objectId, string entityId, Liftable
  Count--;
  // Only respawn if we have a regen time
  if (RespawnTick == 0 && Value.RegenCheckTime > 0) {
- RespawnTick = Environment.TickCount64 + Value.RegenCheckTime;
+ RespawnTick = Field.FieldTick + Value.RegenCheckTime;
  }
 
  if (Count > 0) {
  Field.Broadcast(LiftablePacket.Update(this));
+ } else if (FinishTick > 0) {
+ // This is a temp liftable, so we need to remove it
+ Field.RemoveLiftable(EntityId);
  } else {
- State = Value.RegenCheckTime > 0 ? LiftableState.Respawning : LiftableState.Removed;
- Field.Broadcast(LiftablePacket.Remove(EntityId));
+ State = LiftableState.Removed;
+ Field.Broadcast(LiftablePacket.Update(this));
+
  Field.Broadcast(CubePacket.RemoveCube(ObjectId, Position));
  }
 
  return new LiftableCube(Value);
  }
 
  public override void Update(long tickCount) {
-// Handles despawning after being placed
-if (FinishTick != 0 && tickCount > FinishTick) {
-Field.RemoveLiftable(EntityId);
-return;
- }
-
-if (RespawnTick == 0 || tickCount < RespawnTick) {
-return;
-}
-
-Count++;
-// Only respawn if we have a regen time
-if (Count < Value.ItemStackCount && Value.RegenCheckTime > 0) {
-RespawnTick = tickCount + Value.RegenCheckTime;
-} else {
-RespawnTick = 0;
-}
-
-if (Count == 1) {
-State = LiftableState.Default;
-Field.Broadcast(LiftablePacket.Add(this));
-Field.Broadcast(CubePacket.PlaceLiftable(ObjectId, new LiftableCube(Value), Position, Rotation.Z));
+switch (State) {
+ case LiftableState.Removed:
+ if (RespawnTick > tickCount) {
+ State = LiftableState.Respawning;
+}
+ break;
+ case LiftableState.Respawning:
+ if (tickCount >= RespawnTick) {
+ State = LiftableState.Default;
+ Count = Value.ItemStackCount;
+ RespawnTick = 0;
+ Field.Broadcast(LiftablePacket.Update(this));
+ }
+ break;
+ case LiftableState.Default:
+ if (FinishTick != 0 && tickCount > FinishTick) {
+ Field.RemoveLiftable(EntityId);
+ return;
+ }
+ break;
+case LiftableState.Disabled:
+ return;
  }
- Field.Broadcast(LiftablePacket.Update(this));
  }
 }

Maple2.Database/Storage/Game/GameStorage.Mail.cs

@@ -110,7 +110,7 @@ public ICollection<Mail> GetAllMail(long characterId, long minId = 0) {
  Context.ChangeTracker.QueryTrackingBehavior = QueryTrackingBehavior.TrackAll;
 
  Model.Mail? mail = Context.Mail.Find(characterId, mailId);
- if (mail == null || mail.ReadTime > DateTime.UnixEpoch) {
+ if (mail == null || mail.ReadTime > DateTime.Now) {
  return null;
  }
 

Maple2.Database/Storage/Game/GameStorage.Map.cs

@@ -293,6 +293,7 @@ public bool InitUgcMap(IEnumerable<UgcMapMetadata> maps) {
  Position = new Vector3B(model.X, model.Y, model.Z),
  Rotation = model.Rotation,
  Interact = ToInteractCube(model.Interact),
+ Type = PlotCube.CubeType.Construction,
  };
  }
 
@@ -309,6 +310,7 @@ public bool InitUgcMap(IEnumerable<UgcMapMetadata> maps) {
  Position = new Vector3B(model.X, model.Y, model.Z),
  Rotation = model.Rotation,
  Interact = ToInteractCube(model.Interact),
+ Type = PlotCube.CubeType.Construction,
  };
  }
  }

Maple2.File.Ingest/Mapper/MapEntityMapper.cs

@@ -189,7 +189,7 @@ private IEnumerable<MapEntity> ParseMap(string xblock, IEnumerable<IMapEntity> e
  switch (physXProp) {
  case IMS2Liftable liftable:
  yield return new MapEntity(xblock, new Guid(entity.EntityId), entity.EntityName) {
- Block = new Liftable((int) liftable.ItemID, liftable.ItemStackCount, liftable.ItemLifeTime, liftable.LiftableRegenCheckTime, liftable.LiftableFinishTime, liftable.MaskQuestID, liftable.MaskQuestState, liftable.EffectQuestID, liftable.EffectQuestState, liftable.Position, liftable.Rotation)
+ Block = new Liftable((int) liftable.ItemID, liftable.ItemStackCount, liftable.ItemLifeTime, liftable.LiftableRegenCheckTime, liftable.LiftableFinishTime, liftable.MaskQuestID, liftable.MaskQuestState, liftable.EffectQuestID, liftable.EffectQuestState, liftable.IsReactEffect, liftable.Position, liftable.Rotation)
  };
  continue;
  case IMS2TaxiStation taxiStation:

Maple2.Model/Game/Cube/PlotCube.cs

@@ -10,7 +10,7 @@ public enum CubeType { Default, Construction, Liftable };
 
  public Vector3B Position { get; set; }
  public float Rotation { get; set; }
- public CubeType Type { get; set; }
+ public required CubeType Type { get; set; }
 
  public int PlotId { get; set; }
 

Maple2.Model/Game/User/Character.cs

@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Numerics;
+using System.Numerics;
 using Maple2.Model.Common;
 using Maple2.Model.Enum;
 

Maple2.Model/Game/User/IPlayerInfo.cs

@@ -1,6 +1,4 @@
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using Maple2.Model.Enum;
+using Maple2.Model.Enum;
 
 namespace Maple2.Model.Game;
 

Maple2.Model/Game/User/PlayerInfo.cs

@@ -30,7 +30,7 @@ public static implicit operator PlayerInfo(Player player) {
  AchievementInfo = player.Character.AchievementInfo,
  PremiumTime = player.Character.PremiumTime,
  LastOnlineTime = player.Character.LastOnlineTime,
- DungeonEnterLimits = [],
+ DungeonEnterLimits = player.Character.DungeonEnterLimits,
  GuildId = player.Character.GuildId,
  GuildName = player.Character.GuildName,
  };

Maple2.Model/Game/User/PlotInfo.cs

@@ -51,6 +51,12 @@ public PlotState State {
 
 public class Plot(UgcMapGroup metadata) : PlotInfo(metadata) {
  public readonly Dictionary<Vector3B, PlotCube> Cubes = new();
+ public static readonly Plot Default = new(new UgcMapGroup(0,
+ 0,
+ 0,
+ new UgcMapGroup.Cost(0, 0, 0),
+ new UgcMapGroup.Cost(0, 0, 0),
+ new UgcMapGroup.Limits(0, 0, 0, 0, 0, 0)));
 
  public void SetPlannerMode(PlotMode mode) {
  PlotMode = mode;

Maple2.Model/Metadata/MapEntity/Liftable.cs

@@ -12,6 +12,7 @@ public record Liftable(
  string MaskQuestState,
  string EffectQuestId,
  string EffectQuestState,
+ bool ReactEffect,
  Vector3 Position,
  Vector3 Rotation)
 : MapBlock;

Maple2.Server.Core/Sync/PlayerInfoUpdateExtensions.cs

@@ -118,7 +118,6 @@ public static void Update(this IPlayerInfo self, UpdateField type, IPlayerInfo o
  if (type.HasFlag(UpdateField.Clubs)) {
  self.ClubIds = other.ClubIds;
  }
-
  if (type.HasFlag(UpdateField.Dungeon)) {
  self.DungeonEnterLimits = other.DungeonEnterLimits;
  }

Maple2.Server.Game/Manager/DungeonManager.cs

@@ -81,6 +81,15 @@ public void UpdateDungeonEnterLimit() {
  }
 
  if (updated) {
+ session.PlayerInfo.SendUpdate(new PlayerUpdateRequest {
+ AccountId = session.AccountId,
+ CharacterId = session.CharacterId,
+ DungeonEnterLimits = { EnterLimits.Select(dungeon => new DungeonEnterLimitUpdate {
+ DungeonId = dungeon.Key,
+ Limit = (int) dungeon.Value,
+ })},
+ Async = true,
+ });
  session.Send(FieldEntrancePacket.Load(EnterLimits));
  }
  }
@@ -209,13 +218,6 @@ public void CreateDungeonRoom(int dungeonId, bool withParty) {
  session.Send(DungeonRoomPacket.Error(DungeonRoomError.s_room_party_err_not_chief));
  return;
  }
-
- foreach (PartyMember member in Party.Members.Values) {
- if (!member.Info.DungeonEnterLimits.TryGetValue(dungeonId, out DungeonEnterLimit enterLimit) || enterLimit != DungeonEnterLimit.None) {
- //session.Send(DungeonRoomPacket.Error(DungeonRoomError));
- return;
- }
- }
  }
 
 

Maple2.Server.Game/Manager/Field/FieldManager/FieldManager.State.cs

@@ -656,7 +656,10 @@ public bool RemoveLiftable(string entityId) {
  return false;
  }
 
- Broadcast(CubePacket.RemoveCube(fieldLiftable.ObjectId, fieldLiftable.Position));
+ if (Plots[0].Cubes.Remove(fieldLiftable.Position)) {
+ Broadcast(CubePacket.RemoveCube(fieldLiftable.ObjectId, fieldLiftable.Position));
+ }
+
  Broadcast(LiftablePacket.Remove(entityId));
  return true;
  }
@@ -735,7 +738,10 @@ public bool RemoveInstrument(int objectId) {
  public void OnAddPlayer(FieldPlayer added) {
  Players[added.ObjectId] = added;
  // LOAD:
- added.Session.Send(LiftablePacket.Update(fieldLiftables.Values));
+ foreach (FieldLiftable liftable in fieldLiftables.Values.Where(liftable => liftable.FinishTick > 0)) {
+ added.Session.Send(LiftablePacket.Add(liftable));
+ }
+ added.Session.Send(LiftablePacket.Update(fieldLiftables.Values.Where(liftable => liftable.FinishTick == 0).ToList()));
  added.Session.Send(BreakablePacket.Update(fieldBreakables.Values));
  added.Session.Send(InteractObjectPacket.Load(fieldInteracts.Values));
  foreach (FieldInteract fieldInteract in fieldAdBalloons.Values) {

Maple2.Server.Game/Manager/Field/FieldManager/FieldManager.Ugc.cs

@@ -1,8 +1,12 @@
 using System.Collections.Concurrent;
+using System.Numerics;
 using Maple2.Database.Storage;
+using Maple2.Model.Common;
+using Maple2.Model.Enum;
 using Maple2.Model.Game;
 using Maple2.Model.Game.Ugc;
-using Maple2.Server.Core.Packets;
+using Maple2.Model.Metadata;
+using Maple2.Server.Game.Model;
 using Maple2.Server.Game.Model.Field;
 using Maple2.Server.Game.Packets;
 using Maple2.Server.Game.Session;
@@ -84,4 +88,78 @@ void SavePlot(Plot plot) {
  }
  }
  }
+
+ public void PlaceCube(GameSession session, HeldCube cubeItem, in Vector3B position, float rotation) {
+ Plot? plot = session.Field.Plots[0];
+ if (!session.ItemMetadata.TryGet(cubeItem.ItemId, out ItemMetadata? itemMetadata)) {
+ logger.Error("Failed to get item metadata for cube {cubeId}.", cubeItem.ItemId);
+ return;
+ }
+ switch (session.HeldCube) {
+ case PlotCube _:
+ if (itemMetadata.Install is null || itemMetadata.Housing is null) {
+ logger.Error($"Item {cubeItem.ItemId} is not a housing item.");
+ return;
+ }
+ plot = session.Housing.GetFieldPlot();
+ if (plot == null) {
+ return;
+ }
+
+ if (!session.Housing.TryPlaceCube(cubeItem, plot, itemMetadata, position, rotation, out PlotCube? plotCube)) {
+ return;
+ }
+
+ session.Field.Broadcast(CubePacket.PlaceCube(session.Player.ObjectId, plot, plotCube));
+
+ if (plotCube.Interact is not null) {
+ if (plotCube.Interact.Nurturing is not null && plotCube.Interact.Metadata.Nurturing is not null) {
+ using GameStorage.Request db = session.GameStorage.Context();
+ Nurturing? nurturing = db.GetNurturing(session.AccountId, plotCube.ItemId, plotCube.Interact.Metadata.Nurturing);
+ if (nurturing is null) {
+ nurturing = db.CreateNurturing(session.AccountId, plotCube.Interact.Metadata.Nurturing, plotCube.Interact.Metadata.Id);
+ if (nurturing is null) {
+ lock (Plots) {
+ logger.Error("Failed to create Nurturing for {AccountId}, ItemId {ItemId}", session.AccountId, plotCube.ItemId);
+ }
+ return;
+ }
+ }
+ plotCube.Interact.Nurturing = nurturing;
+ }
+ session.Field.Broadcast(FunctionCubePacket.AddFunctionCube(plotCube.Interact));
+ }
+
+ if (plot.IsPlanner) {
+ return;
+ }
+ break;
+ case LiftableCube liftable:
+ FieldLiftable? fieldLiftable = session.Field.AddLiftable($"4_{position.ConvertToInt()}", liftable.Liftable);
+ if (fieldLiftable == null) {
+ return;
+ }
+
+ session.HeldCube = null;
+ fieldLiftable.Count = 1;
+ fieldLiftable.State = LiftableState.Default;
+ fieldLiftable.Position = position;
+ fieldLiftable.Rotation = new Vector3(0, 0, rotation);
+ fieldLiftable.FinishTick = session.Field.FieldTick + fieldLiftable.Value.ItemLifetime;
+
+ if (session.Field.Entities.LiftableTargetBoxes.TryGetValue(position, out LiftableTargetBox? liftableTarget)) {
+ session.ConditionUpdate(ConditionType.item_move, codeLong: cubeItem.ItemId, targetLong: liftableTarget.LiftableTarget);
+ }
+
+ Broadcast(LiftablePacket.Add(fieldLiftable));
+ if (plot.Cubes.TryAdd(position, new PlotCube(itemMetadata, liftable.Id) { Type = PlotCube.CubeType.Liftable, Position = position, Rotation = rotation })) {
+ Broadcast(CubePacket.PlaceLiftable(session.Player.ObjectId, liftable, position, rotation));
+ }
+ Broadcast(SetCraftModePacket.Stop(session.Player.ObjectId));
+ Broadcast(LiftablePacket.Update(fieldLiftable));
+ break;
+ }
+
+ session.ConditionUpdate(ConditionType.install_item, codeLong: cubeItem.ItemId);
+ }
 }

Maple2.Server.Game/Manager/Field/FieldManager/FieldManager.cs

@@ -125,6 +125,9 @@ public virtual void Init() {
  }
  }
 
+ // Create default to place liftable cubes
+ Plots[0] = Plot.Default;
+
  foreach (TriggerModel trigger in Entities.TriggerModels.Values) {
  AddTrigger(trigger);
  }

Maple2.Server.Game/Manager/HousingManager.cs

@@ -450,15 +450,10 @@ public void InteriorReward(byte rewardId) {
  }
 
  #region Helpers
- public bool TryPlaceCube(HeldCube cube, Plot plot, in Vector3B position, float rotation,
+ public bool TryPlaceCube(HeldCube cube, Plot plot, ItemMetadata itemMetadata, in Vector3B position, float rotation,
  [NotNullWhen(true)] out PlotCube? result, bool isReplace = false) {
  result = null;
- if (!session.ItemMetadata.TryGet(cube.ItemId, out ItemMetadata? itemMetadata) || itemMetadata.Install is null || itemMetadata.Housing is null) {
- logger.Error("Failed to get item metadata for cube {cubeId}.", cube.ItemId);
- return false;
- }
-
- if (plot.PlotMode is PlotMode.BlueprintPlanner && itemMetadata.Housing.IsNotAllowedInBlueprint) {
+ if (plot.PlotMode is PlotMode.BlueprintPlanner && itemMetadata.Housing!.IsNotAllowedInBlueprint) {
  if (itemMetadata.Housing.HousingCategory is HousingCategory.Farming or HousingCategory.Ranching) {
  session.Send(CubePacket.Error(UgcMapError.s_err_cannot_install_nurturing_in_design_home));
  } else if (cube.ItemId is Constant.InteriorPortalCubeId) {
@@ -480,7 +475,7 @@ public bool TryPlaceCube(HeldCube cube, Plot plot, in Vector3B position, float r
  groundHeight = groundTile.Position.Z / Constant.BlockSize;
  }
 
- bool isSolidCube = itemMetadata.Install.IsSolidCube;
+ bool isSolidCube = itemMetadata.Install!.IsSolidCube;
  bool isOnGround = Math.Abs(position.Z - groundHeight) < 0.1;
  bool allowWaterOnGround = itemMetadata.Install.MapAttribute is MapAttribute.water && Constant.AllowWaterOnGround;
 
@@ -517,6 +512,7 @@ public bool TryPlaceCube(HeldCube cube, Plot plot, in Vector3B position, float r
  result = new PlotCube(itemMetadata, FurnishingManager.NextCubeId(), cube.Template) {
  Position = position,
  Rotation = rotation,
+ Type = cube is LiftableCube ? PlotCube.CubeType.Liftable : PlotCube.CubeType.Construction,
  };
 
  if (functionCubeMetadata is not null) {
@@ -679,7 +675,7 @@ public void ApplyLayout(Plot plot, HomeLayout layout, bool isBlueprint = false)
  foreach (PlotCube cube in layout.Cubes) {
  Item? item = session.Item.Furnishing.GetItem(cube.ItemId);
  cube.Id = item?.Uid ?? 0;
- if (!TryPlaceCube(cube, plot, cube.Position, cube.Rotation, out PlotCube? plotCube)) {
+ if (!TryPlaceCube(cube, plot, item!.Metadata, cube.Position, cube.Rotation, out PlotCube? plotCube)) {
  return;
  }
 

Maple2.Server.Game/Manager/Items/FurnishingManager.cs

@@ -104,7 +104,9 @@ public bool TryPlaceCube(long uid, [NotNullWhen(true)] out PlotCube? cube) {
  ? FurnishingStoragePacket.Update(item.Uid, item.Amount)
  : FurnishingStoragePacket.Remove(item.Uid));
 
- cube = new PlotCube(item.Metadata, NextCubeId(), item.Template);
+ cube = new PlotCube(item.Metadata, NextCubeId(), item.Template) {
+ Type = PlotCube.CubeType.Construction,
+ };
  if (!AddInventory(cube)) {
  logger.Fatal("Failed to add cube: {CubeId} to inventory", cube.Id);
  throw new InvalidOperationException($"Failed to add cube: {cube.Id} to inventory");

Maple2.Server.Game/Model/Field/Entity/FieldLiftable.cs

@@ -28,44 +28,47 @@ public FieldLiftable(FieldManager field, int objectId, string entityId, Liftable
  Count--;
  // Only respawn if we have a regen time
  if (RespawnTick == 0 && Value.RegenCheckTime > 0) {
- RespawnTick = Environment.TickCount64 + Value.RegenCheckTime;
+ RespawnTick = Field.FieldTick + Value.RegenCheckTime;
  }
 
  if (Count > 0) {
  Field.Broadcast(LiftablePacket.Update(this));
+ } else if (FinishTick > 0) {
+ // This is a temp liftable, so we need to remove it
+ Field.RemoveLiftable(EntityId);
  } else {
- State = Value.RegenCheckTime > 0 ? LiftableState.Respawning : LiftableState.Removed;
- Field.Broadcast(LiftablePacket.Remove(EntityId));
+ State = LiftableState.Removed;
+ Field.Broadcast(LiftablePacket.Update(this));
+
  Field.Broadcast(CubePacket.RemoveCube(ObjectId, Position));
  }
 
  return new LiftableCube(Value);
  }
 
  public override void Update(long tickCount) {
-// Handles despawning after being placed
-if (FinishTick != 0 && tickCount > FinishTick) {
-Field.RemoveLiftable(EntityId);
-return;
- }
-
-if (RespawnTick == 0 || tickCount < RespawnTick) {
-return;
-}
-
-Count++;
-// Only respawn if we have a regen time
-if (Count < Value.ItemStackCount && Value.RegenCheckTime > 0) {
-RespawnTick = tickCount + Value.RegenCheckTime;
-} else {
-RespawnTick = 0;
-}
-
-if (Count == 1) {
-State = LiftableState.Default;
-Field.Broadcast(LiftablePacket.Add(this));
-Field.Broadcast(CubePacket.PlaceLiftable(ObjectId, new LiftableCube(Value), Position, Rotation.Z));
+switch (State) {
+ case LiftableState.Removed:
+ if (RespawnTick > tickCount) {
+ State = LiftableState.Respawning;
+}
+ break;
+ case LiftableState.Respawning:
+ if (tickCount >= RespawnTick) {
+ State = LiftableState.Default;
+ Count = Value.ItemStackCount;
+ RespawnTick = 0;
+ Field.Broadcast(LiftablePacket.Update(this));
+ }
+ break;
+ case LiftableState.Default:
+ if (FinishTick != 0 && tickCount > FinishTick) {
+ Field.RemoveLiftable(EntityId);
+ return;
+ }
+ break;
+case LiftableState.Disabled:
+ return;
  }
- Field.Broadcast(LiftablePacket.Update(this));
  }
 }

Maple2.Database/Storage/Game/GameStorage.Mail.cs

@@ -110,7 +110,7 @@ public ICollection<Mail> GetAllMail(long characterId, long minId = 0) {
  Context.ChangeTracker.QueryTrackingBehavior = QueryTrackingBehavior.TrackAll;
 
  Model.Mail? mail = Context.Mail.Find(characterId, mailId);
- if (mail == null || mail.ReadTime > DateTime.UnixEpoch) {
+ if (mail == null || mail.ReadTime > DateTime.Now) {
  return null;
  }
 

Maple2.Database/Storage/Game/GameStorage.Map.cs

@@ -293,6 +293,7 @@ public bool InitUgcMap(IEnumerable<UgcMapMetadata> maps) {
  Position = new Vector3B(model.X, model.Y, model.Z),
  Rotation = model.Rotation,
  Interact = ToInteractCube(model.Interact),
+ Type = PlotCube.CubeType.Construction,
  };
  }
 
@@ -309,6 +310,7 @@ public bool InitUgcMap(IEnumerable<UgcMapMetadata> maps) {
  Position = new Vector3B(model.X, model.Y, model.Z),
  Rotation = model.Rotation,
  Interact = ToInteractCube(model.Interact),
+ Type = PlotCube.CubeType.Construction,
  };
  }
  }

Maple2.File.Ingest/Mapper/MapEntityMapper.cs

@@ -189,7 +189,7 @@ private IEnumerable<MapEntity> ParseMap(string xblock, IEnumerable<IMapEntity> e
  switch (physXProp) {
  case IMS2Liftable liftable:
  yield return new MapEntity(xblock, new Guid(entity.EntityId), entity.EntityName) {
- Block = new Liftable((int) liftable.ItemID, liftable.ItemStackCount, liftable.ItemLifeTime, liftable.LiftableRegenCheckTime, liftable.LiftableFinishTime, liftable.MaskQuestID, liftable.MaskQuestState, liftable.EffectQuestID, liftable.EffectQuestState, liftable.Position, liftable.Rotation)
+ Block = new Liftable((int) liftable.ItemID, liftable.ItemStackCount, liftable.ItemLifeTime, liftable.LiftableRegenCheckTime, liftable.LiftableFinishTime, liftable.MaskQuestID, liftable.MaskQuestState, liftable.EffectQuestID, liftable.EffectQuestState, liftable.IsReactEffect, liftable.Position, liftable.Rotation)
  };
  continue;
  case IMS2TaxiStation taxiStation:

Maple2.Model/Game/Cube/PlotCube.cs

@@ -10,7 +10,7 @@ public enum CubeType { Default, Construction, Liftable };
 
  public Vector3B Position { get; set; }
  public float Rotation { get; set; }
- public CubeType Type { get; set; }
+ public required CubeType Type { get; set; }
 
  public int PlotId { get; set; }
 

Maple2.Model/Game/User/Character.cs

@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Numerics;
+using System.Numerics;
 using Maple2.Model.Common;
 using Maple2.Model.Enum;
 

Maple2.Model/Game/User/IPlayerInfo.cs

@@ -1,6 +1,4 @@
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using Maple2.Model.Enum;
+using Maple2.Model.Enum;
 
 namespace Maple2.Model.Game;
 

Maple2.Model/Game/User/PlayerInfo.cs

@@ -30,7 +30,7 @@ public static implicit operator PlayerInfo(Player player) {
  AchievementInfo = player.Character.AchievementInfo,
  PremiumTime = player.Character.PremiumTime,
  LastOnlineTime = player.Character.LastOnlineTime,
- DungeonEnterLimits = [],
+ DungeonEnterLimits = player.Character.DungeonEnterLimits,
  GuildId = player.Character.GuildId,
  GuildName = player.Character.GuildName,
  };

Maple2.Model/Game/User/PlotInfo.cs

@@ -51,6 +51,12 @@ public PlotState State {
 
 public class Plot(UgcMapGroup metadata) : PlotInfo(metadata) {
  public readonly Dictionary<Vector3B, PlotCube> Cubes = new();
+ public static readonly Plot Default = new(new UgcMapGroup(0,
+ 0,
+ 0,
+ new UgcMapGroup.Cost(0, 0, 0),
+ new UgcMapGroup.Cost(0, 0, 0),
+ new UgcMapGroup.Limits(0, 0, 0, 0, 0, 0)));
 
  public void SetPlannerMode(PlotMode mode) {
  PlotMode = mode;

Maple2.Model/Metadata/MapEntity/Liftable.cs

@@ -12,6 +12,7 @@ public record Liftable(
  string MaskQuestState,
  string EffectQuestId,
  string EffectQuestState,
+ bool ReactEffect,
  Vector3 Position,
  Vector3 Rotation)
 : MapBlock;

Maple2.Server.Core/Sync/PlayerInfoUpdateExtensions.cs

@@ -118,7 +118,6 @@ public static void Update(this IPlayerInfo self, UpdateField type, IPlayerInfo o
  if (type.HasFlag(UpdateField.Clubs)) {
  self.ClubIds = other.ClubIds;
  }
-
  if (type.HasFlag(UpdateField.Dungeon)) {
  self.DungeonEnterLimits = other.DungeonEnterLimits;
  }

Maple2.Server.Game/Manager/DungeonManager.cs

@@ -81,6 +81,15 @@ public void UpdateDungeonEnterLimit() {
  }
 
  if (updated) {
+ session.PlayerInfo.SendUpdate(new PlayerUpdateRequest {
+ AccountId = session.AccountId,
+ CharacterId = session.CharacterId,
+ DungeonEnterLimits = { EnterLimits.Select(dungeon => new DungeonEnterLimitUpdate {
+ DungeonId = dungeon.Key,
+ Limit = (int) dungeon.Value,
+ })},
+ Async = true,
+ });
  session.Send(FieldEntrancePacket.Load(EnterLimits));
  }
  }
@@ -209,13 +218,6 @@ public void CreateDungeonRoom(int dungeonId, bool withParty) {
  session.Send(DungeonRoomPacket.Error(DungeonRoomError.s_room_party_err_not_chief));
  return;
  }
-
- foreach (PartyMember member in Party.Members.Values) {
- if (!member.Info.DungeonEnterLimits.TryGetValue(dungeonId, out DungeonEnterLimit enterLimit) || enterLimit != DungeonEnterLimit.None) {
- //session.Send(DungeonRoomPacket.Error(DungeonRoomError));
- return;
- }
- }
  }
 
 

Maple2.Server.Game/Manager/Field/FieldManager/FieldManager.State.cs

@@ -656,7 +656,10 @@ public bool RemoveLiftable(string entityId) {
  return false;
  }
 
- Broadcast(CubePacket.RemoveCube(fieldLiftable.ObjectId, fieldLiftable.Position));
+ if (Plots[0].Cubes.Remove(fieldLiftable.Position)) {
+ Broadcast(CubePacket.RemoveCube(fieldLiftable.ObjectId, fieldLiftable.Position));
+ }
+
  Broadcast(LiftablePacket.Remove(entityId));
  return true;
  }
@@ -735,7 +738,10 @@ public bool RemoveInstrument(int objectId) {
  public void OnAddPlayer(FieldPlayer added) {
  Players[added.ObjectId] = added;
  // LOAD:
- added.Session.Send(LiftablePacket.Update(fieldLiftables.Values));
+ foreach (FieldLiftable liftable in fieldLiftables.Values.Where(liftable => liftable.FinishTick > 0)) {
+ added.Session.Send(LiftablePacket.Add(liftable));
+ }
+ added.Session.Send(LiftablePacket.Update(fieldLiftables.Values.Where(liftable => liftable.FinishTick == 0).ToList()));
  added.Session.Send(BreakablePacket.Update(fieldBreakables.Values));
  added.Session.Send(InteractObjectPacket.Load(fieldInteracts.Values));
  foreach (FieldInteract fieldInteract in fieldAdBalloons.Values) {

Maple2.Server.Game/Manager/Field/FieldManager/FieldManager.Ugc.cs

@@ -1,8 +1,12 @@
 using System.Collections.Concurrent;
+using System.Numerics;
 using Maple2.Database.Storage;
+using Maple2.Model.Common;
+using Maple2.Model.Enum;
 using Maple2.Model.Game;
 using Maple2.Model.Game.Ugc;
-using Maple2.Server.Core.Packets;
+using Maple2.Model.Metadata;
+using Maple2.Server.Game.Model;
 using Maple2.Server.Game.Model.Field;
 using Maple2.Server.Game.Packets;
 using Maple2.Server.Game.Session;
@@ -84,4 +88,78 @@ void SavePlot(Plot plot) {
  }
  }
  }
+
+ public void PlaceCube(GameSession session, HeldCube cubeItem, in Vector3B position, float rotation) {
+ Plot? plot = session.Field.Plots[0];
+ if (!session.ItemMetadata.TryGet(cubeItem.ItemId, out ItemMetadata? itemMetadata)) {
+ logger.Error("Failed to get item metadata for cube {cubeId}.", cubeItem.ItemId);
+ return;
+ }
+ switch (session.HeldCube) {
+ case PlotCube _:
+ if (itemMetadata.Install is null || itemMetadata.Housing is null) {
+ logger.Error($"Item {cubeItem.ItemId} is not a housing item.");
+ return;
+ }
+ plot = session.Housing.GetFieldPlot();
+ if (plot == null) {
+ return;
+ }
+
+ if (!session.Housing.TryPlaceCube(cubeItem, plot, itemMetadata, position, rotation, out PlotCube? plotCube)) {
+ return;
+ }
+
+ session.Field.Broadcast(CubePacket.PlaceCube(session.Player.ObjectId, plot, plotCube));
+
+ if (plotCube.Interact is not null) {
+ if (plotCube.Interact.Nurturing is not null && plotCube.Interact.Metadata.Nurturing is not null) {
+ using GameStorage.Request db = session.GameStorage.Context();
+ Nurturing? nurturing = db.GetNurturing(session.AccountId, plotCube.ItemId, plotCube.Interact.Metadata.Nurturing);
+ if (nurturing is null) {
+ nurturing = db.CreateNurturing(session.AccountId, plotCube.Interact.Metadata.Nurturing, plotCube.Interact.Metadata.Id);
+ if (nurturing is null) {
+ lock (Plots) {
+ logger.Error("Failed to create Nurturing for {AccountId}, ItemId {ItemId}", session.AccountId, plotCube.ItemId);
+ }
+ return;
+ }
+ }
+ plotCube.Interact.Nurturing = nurturing;
+ }
+ session.Field.Broadcast(FunctionCubePacket.AddFunctionCube(plotCube.Interact));
+ }
+
+ if (plot.IsPlanner) {
+ return;
+ }
+ break;
+ case LiftableCube liftable:
+ FieldLiftable? fieldLiftable = session.Field.AddLiftable($"4_{position.ConvertToInt()}", liftable.Liftable);
+ if (fieldLiftable == null) {
+ return;
+ }
+
+ session.HeldCube = null;
+ fieldLiftable.Count = 1;
+ fieldLiftable.State = LiftableState.Default;
+ fieldLiftable.Position = position;
+ fieldLiftable.Rotation = new Vector3(0, 0, rotation);
+ fieldLiftable.FinishTick = session.Field.FieldTick + fieldLiftable.Value.ItemLifetime;
+
+ if (session.Field.Entities.LiftableTargetBoxes.TryGetValue(position, out LiftableTargetBox? liftableTarget)) {
+ session.ConditionUpdate(ConditionType.item_move, codeLong: cubeItem.ItemId, targetLong: liftableTarget.LiftableTarget);
+ }
+
+ Broadcast(LiftablePacket.Add(fieldLiftable));
+ if (plot.Cubes.TryAdd(position, new PlotCube(itemMetadata, liftable.Id) { Type = PlotCube.CubeType.Liftable, Position = position, Rotation = rotation })) {
+ Broadcast(CubePacket.PlaceLiftable(session.Player.ObjectId, liftable, position, rotation));
+ }
+ Broadcast(SetCraftModePacket.Stop(session.Player.ObjectId));
+ Broadcast(LiftablePacket.Update(fieldLiftable));
+ break;
+ }
+
+ session.ConditionUpdate(ConditionType.install_item, codeLong: cubeItem.ItemId);
+ }
 }

Maple2.Server.Game/Manager/Field/FieldManager/FieldManager.cs

@@ -125,6 +125,9 @@ public virtual void Init() {
  }
  }
 
+ // Create default to place liftable cubes
+ Plots[0] = Plot.Default;
+
  foreach (TriggerModel trigger in Entities.TriggerModels.Values) {
  AddTrigger(trigger);
  }

Maple2.Server.Game/Manager/HousingManager.cs

@@ -450,15 +450,10 @@ public void InteriorReward(byte rewardId) {
  }
 
  #region Helpers
- public bool TryPlaceCube(HeldCube cube, Plot plot, in Vector3B position, float rotation,
+ public bool TryPlaceCube(HeldCube cube, Plot plot, ItemMetadata itemMetadata, in Vector3B position, float rotation,
  [NotNullWhen(true)] out PlotCube? result, bool isReplace = false) {
  result = null;
- if (!session.ItemMetadata.TryGet(cube.ItemId, out ItemMetadata? itemMetadata) || itemMetadata.Install is null || itemMetadata.Housing is null) {
- logger.Error("Failed to get item metadata for cube {cubeId}.", cube.ItemId);
- return false;
- }
-
- if (plot.PlotMode is PlotMode.BlueprintPlanner && itemMetadata.Housing.IsNotAllowedInBlueprint) {
+ if (plot.PlotMode is PlotMode.BlueprintPlanner && itemMetadata.Housing!.IsNotAllowedInBlueprint) {
  if (itemMetadata.Housing.HousingCategory is HousingCategory.Farming or HousingCategory.Ranching) {
  session.Send(CubePacket.Error(UgcMapError.s_err_cannot_install_nurturing_in_design_home));
  } else if (cube.ItemId is Constant.InteriorPortalCubeId) {
@@ -480,7 +475,7 @@ public bool TryPlaceCube(HeldCube cube, Plot plot, in Vector3B position, float r
  groundHeight = groundTile.Position.Z / Constant.BlockSize;
  }
 
- bool isSolidCube = itemMetadata.Install.IsSolidCube;
+ bool isSolidCube = itemMetadata.Install!.IsSolidCube;
  bool isOnGround = Math.Abs(position.Z - groundHeight) < 0.1;
  bool allowWaterOnGround = itemMetadata.Install.MapAttribute is MapAttribute.water && Constant.AllowWaterOnGround;
 
@@ -517,6 +512,7 @@ public bool TryPlaceCube(HeldCube cube, Plot plot, in Vector3B position, float r
  result = new PlotCube(itemMetadata, FurnishingManager.NextCubeId(), cube.Template) {
  Position = position,
  Rotation = rotation,
+ Type = cube is LiftableCube ? PlotCube.CubeType.Liftable : PlotCube.CubeType.Construction,
  };
 
  if (functionCubeMetadata is not null) {
@@ -679,7 +675,7 @@ public void ApplyLayout(Plot plot, HomeLayout layout, bool isBlueprint = false)
  foreach (PlotCube cube in layout.Cubes) {
  Item? item = session.Item.Furnishing.GetItem(cube.ItemId);
  cube.Id = item?.Uid ?? 0;
- if (!TryPlaceCube(cube, plot, cube.Position, cube.Rotation, out PlotCube? plotCube)) {
+ if (!TryPlaceCube(cube, plot, item!.Metadata, cube.Position, cube.Rotation, out PlotCube? plotCube)) {
  return;
  }
 

Maple2.Server.Game/Manager/Items/FurnishingManager.cs

@@ -104,7 +104,9 @@ public bool TryPlaceCube(long uid, [NotNullWhen(true)] out PlotCube? cube) {
  ? FurnishingStoragePacket.Update(item.Uid, item.Amount)
  : FurnishingStoragePacket.Remove(item.Uid));
 
- cube = new PlotCube(item.Metadata, NextCubeId(), item.Template);
+ cube = new PlotCube(item.Metadata, NextCubeId(), item.Template) {
+ Type = PlotCube.CubeType.Construction,
+ };
  if (!AddInventory(cube)) {
  logger.Fatal("Failed to add cube: {CubeId} to inventory", cube.Id);
  throw new InvalidOperationException($"Failed to add cube: {cube.Id} to inventory");

Maple2.Server.Game/Model/Field/Entity/FieldLiftable.cs

@@ -28,44 +28,47 @@ public FieldLiftable(FieldManager field, int objectId, string entityId, Liftable
  Count--;
  // Only respawn if we have a regen time
  if (RespawnTick == 0 && Value.RegenCheckTime > 0) {
- RespawnTick = Environment.TickCount64 + Value.RegenCheckTime;
+ RespawnTick = Field.FieldTick + Value.RegenCheckTime;
  }
 
  if (Count > 0) {
  Field.Broadcast(LiftablePacket.Update(this));
+ } else if (FinishTick > 0) {
+ // This is a temp liftable, so we need to remove it
+ Field.RemoveLiftable(EntityId);
  } else {
- State = Value.RegenCheckTime > 0 ? LiftableState.Respawning : LiftableState.Removed;
- Field.Broadcast(LiftablePacket.Remove(EntityId));
+ State = LiftableState.Removed;
+ Field.Broadcast(LiftablePacket.Update(this));
+
  Field.Broadcast(CubePacket.RemoveCube(ObjectId, Position));
  }
 
  return new LiftableCube(Value);
  }
 
  public override void Update(long tickCount) {
-// Handles despawning after being placed
-if (FinishTick != 0 && tickCount > FinishTick) {
-Field.RemoveLiftable(EntityId);
-return;
- }
-
-if (RespawnTick == 0 || tickCount < RespawnTick) {
-return;
-}
-
-Count++;
-// Only respawn if we have a regen time
-if (Count < Value.ItemStackCount && Value.RegenCheckTime > 0) {
-RespawnTick = tickCount + Value.RegenCheckTime;
-} else {
-RespawnTick = 0;
-}
-
-if (Count == 1) {
-State = LiftableState.Default;
-Field.Broadcast(LiftablePacket.Add(this));
-Field.Broadcast(CubePacket.PlaceLiftable(ObjectId, new LiftableCube(Value), Position, Rotation.Z));
+switch (State) {
+ case LiftableState.Removed:
+ if (RespawnTick > tickCount) {
+ State = LiftableState.Respawning;
+}
+ break;
+ case LiftableState.Respawning:
+ if (tickCount >= RespawnTick) {
+ State = LiftableState.Default;
+ Count = Value.ItemStackCount;
+ RespawnTick = 0;
+ Field.Broadcast(LiftablePacket.Update(this));
+ }
+ break;
+ case LiftableState.Default:
+ if (FinishTick != 0 && tickCount > FinishTick) {
+ Field.RemoveLiftable(EntityId);
+ return;
+ }
+ break;
+case LiftableState.Disabled:
+ return;
  }
- Field.Broadcast(LiftablePacket.Update(this));
  }
 }

Maple2.Database/Storage/Game/GameStorage.Mail.cs

@@ -110,7 +110,7 @@ public ICollection<Mail> GetAllMail(long characterId, long minId = 0) {
  Context.ChangeTracker.QueryTrackingBehavior = QueryTrackingBehavior.TrackAll;
 
  Model.Mail? mail = Context.Mail.Find(characterId, mailId);
- if (mail == null || mail.ReadTime > DateTime.UnixEpoch) {
+ if (mail == null || mail.ReadTime > DateTime.Now) {
  return null;
  }
 

Maple2.Database/Storage/Game/GameStorage.Map.cs

@@ -293,6 +293,7 @@ public bool InitUgcMap(IEnumerable<UgcMapMetadata> maps) {
  Position = new Vector3B(model.X, model.Y, model.Z),
  Rotation = model.Rotation,
  Interact = ToInteractCube(model.Interact),
+ Type = PlotCube.CubeType.Construction,
  };
  }
 
@@ -309,6 +310,7 @@ public bool InitUgcMap(IEnumerable<UgcMapMetadata> maps) {
  Position = new Vector3B(model.X, model.Y, model.Z),
  Rotation = model.Rotation,
  Interact = ToInteractCube(model.Interact),
+ Type = PlotCube.CubeType.Construction,
  };
  }
  }

Maple2.File.Ingest/Mapper/MapEntityMapper.cs

@@ -189,7 +189,7 @@ private IEnumerable<MapEntity> ParseMap(string xblock, IEnumerable<IMapEntity> e
  switch (physXProp) {
  case IMS2Liftable liftable:
  yield return new MapEntity(xblock, new Guid(entity.EntityId), entity.EntityName) {
- Block = new Liftable((int) liftable.ItemID, liftable.ItemStackCount, liftable.ItemLifeTime, liftable.LiftableRegenCheckTime, liftable.LiftableFinishTime, liftable.MaskQuestID, liftable.MaskQuestState, liftable.EffectQuestID, liftable.EffectQuestState, liftable.Position, liftable.Rotation)
+ Block = new Liftable((int) liftable.ItemID, liftable.ItemStackCount, liftable.ItemLifeTime, liftable.LiftableRegenCheckTime, liftable.LiftableFinishTime, liftable.MaskQuestID, liftable.MaskQuestState, liftable.EffectQuestID, liftable.EffectQuestState, liftable.IsReactEffect, liftable.Position, liftable.Rotation)
  };
  continue;
  case IMS2TaxiStation taxiStation:

Maple2.Model/Game/Cube/PlotCube.cs

@@ -10,7 +10,7 @@ public enum CubeType { Default, Construction, Liftable };
 
  public Vector3B Position { get; set; }
  public float Rotation { get; set; }
- public CubeType Type { get; set; }
+ public required CubeType Type { get; set; }
 
  public int PlotId { get; set; }
 

Maple2.Model/Game/User/Character.cs

@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Numerics;
+using System.Numerics;
 using Maple2.Model.Common;
 using Maple2.Model.Enum;
 

Maple2.Model/Game/User/IPlayerInfo.cs

@@ -1,6 +1,4 @@
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using Maple2.Model.Enum;
+using Maple2.Model.Enum;
 
 namespace Maple2.Model.Game;
 

Maple2.Model/Game/User/PlayerInfo.cs

@@ -30,7 +30,7 @@ public static implicit operator PlayerInfo(Player player) {
  AchievementInfo = player.Character.AchievementInfo,
  PremiumTime = player.Character.PremiumTime,
  LastOnlineTime = player.Character.LastOnlineTime,
- DungeonEnterLimits = [],
+ DungeonEnterLimits = player.Character.DungeonEnterLimits,
  GuildId = player.Character.GuildId,
  GuildName = player.Character.GuildName,
  };

Maple2.Model/Game/User/PlotInfo.cs

@@ -51,6 +51,12 @@ public PlotState State {
 
 public class Plot(UgcMapGroup metadata) : PlotInfo(metadata) {
  public readonly Dictionary<Vector3B, PlotCube> Cubes = new();
+ public static readonly Plot Default = new(new UgcMapGroup(0,
+ 0,
+ 0,
+ new UgcMapGroup.Cost(0, 0, 0),
+ new UgcMapGroup.Cost(0, 0, 0),
+ new UgcMapGroup.Limits(0, 0, 0, 0, 0, 0)));
 
  public void SetPlannerMode(PlotMode mode) {
  PlotMode = mode;

Maple2.Model/Metadata/MapEntity/Liftable.cs

@@ -12,6 +12,7 @@ public record Liftable(
  string MaskQuestState,
  string EffectQuestId,
  string EffectQuestState,
+ bool ReactEffect,
  Vector3 Position,
  Vector3 Rotation)
 : MapBlock;

Maple2.Server.Core/Sync/PlayerInfoUpdateExtensions.cs

@@ -118,7 +118,6 @@ public static void Update(this IPlayerInfo self, UpdateField type, IPlayerInfo o
  if (type.HasFlag(UpdateField.Clubs)) {
  self.ClubIds = other.ClubIds;
  }
-
  if (type.HasFlag(UpdateField.Dungeon)) {
  self.DungeonEnterLimits = other.DungeonEnterLimits;
  }

Maple2.Server.Game/Manager/DungeonManager.cs

@@ -81,6 +81,15 @@ public void UpdateDungeonEnterLimit() {
  }
 
  if (updated) {
+ session.PlayerInfo.SendUpdate(new PlayerUpdateRequest {
+ AccountId = session.AccountId,
+ CharacterId = session.CharacterId,
+ DungeonEnterLimits = { EnterLimits.Select(dungeon => new DungeonEnterLimitUpdate {
+ DungeonId = dungeon.Key,
+ Limit = (int) dungeon.Value,
+ })},
+ Async = true,
+ });
  session.Send(FieldEntrancePacket.Load(EnterLimits));
  }
  }
@@ -209,13 +218,6 @@ public void CreateDungeonRoom(int dungeonId, bool withParty) {
  session.Send(DungeonRoomPacket.Error(DungeonRoomError.s_room_party_err_not_chief));
  return;
  }
-
- foreach (PartyMember member in Party.Members.Values) {
- if (!member.Info.DungeonEnterLimits.TryGetValue(dungeonId, out DungeonEnterLimit enterLimit) || enterLimit != DungeonEnterLimit.None) {
- //session.Send(DungeonRoomPacket.Error(DungeonRoomError));
- return;
- }
- }
  }
 
 

Maple2.Server.Game/Manager/Field/FieldManager/FieldManager.State.cs

@@ -656,7 +656,10 @@ public bool RemoveLiftable(string entityId) {
  return false;
  }
 
- Broadcast(CubePacket.RemoveCube(fieldLiftable.ObjectId, fieldLiftable.Position));
+ if (Plots[0].Cubes.Remove(fieldLiftable.Position)) {
+ Broadcast(CubePacket.RemoveCube(fieldLiftable.ObjectId, fieldLiftable.Position));
+ }
+
  Broadcast(LiftablePacket.Remove(entityId));
  return true;
  }
@@ -735,7 +738,10 @@ public bool RemoveInstrument(int objectId) {
  public void OnAddPlayer(FieldPlayer added) {
  Players[added.ObjectId] = added;
  // LOAD:
- added.Session.Send(LiftablePacket.Update(fieldLiftables.Values));
+ foreach (FieldLiftable liftable in fieldLiftables.Values.Where(liftable => liftable.FinishTick > 0)) {
+ added.Session.Send(LiftablePacket.Add(liftable));
+ }
+ added.Session.Send(LiftablePacket.Update(fieldLiftables.Values.Where(liftable => liftable.FinishTick == 0).ToList()));
  added.Session.Send(BreakablePacket.Update(fieldBreakables.Values));
  added.Session.Send(InteractObjectPacket.Load(fieldInteracts.Values));
  foreach (FieldInteract fieldInteract in fieldAdBalloons.Values) {

Maple2.Server.Game/Manager/Field/FieldManager/FieldManager.Ugc.cs

@@ -1,8 +1,12 @@
 using System.Collections.Concurrent;
+using System.Numerics;
 using Maple2.Database.Storage;
+using Maple2.Model.Common;
+using Maple2.Model.Enum;
 using Maple2.Model.Game;
 using Maple2.Model.Game.Ugc;
-using Maple2.Server.Core.Packets;
+using Maple2.Model.Metadata;
+using Maple2.Server.Game.Model;
 using Maple2.Server.Game.Model.Field;
 using Maple2.Server.Game.Packets;
 using Maple2.Server.Game.Session;
@@ -84,4 +88,78 @@ void SavePlot(Plot plot) {
  }
  }
  }
+
+ public void PlaceCube(GameSession session, HeldCube cubeItem, in Vector3B position, float rotation) {
+ Plot? plot = session.Field.Plots[0];
+ if (!session.ItemMetadata.TryGet(cubeItem.ItemId, out ItemMetadata? itemMetadata)) {
+ logger.Error("Failed to get item metadata for cube {cubeId}.", cubeItem.ItemId);
+ return;
+ }
+ switch (session.HeldCube) {
+ case PlotCube _:
+ if (itemMetadata.Install is null || itemMetadata.Housing is null) {
+ logger.Error($"Item {cubeItem.ItemId} is not a housing item.");
+ return;
+ }
+ plot = session.Housing.GetFieldPlot();
+ if (plot == null) {
+ return;
+ }
+
+ if (!session.Housing.TryPlaceCube(cubeItem, plot, itemMetadata, position, rotation, out PlotCube? plotCube)) {
+ return;
+ }
+
+ session.Field.Broadcast(CubePacket.PlaceCube(session.Player.ObjectId, plot, plotCube));
+
+ if (plotCube.Interact is not null) {
+ if (plotCube.Interact.Nurturing is not null && plotCube.Interact.Metadata.Nurturing is not null) {
+ using GameStorage.Request db = session.GameStorage.Context();
+ Nurturing? nurturing = db.GetNurturing(session.AccountId, plotCube.ItemId, plotCube.Interact.Metadata.Nurturing);
+ if (nurturing is null) {
+ nurturing = db.CreateNurturing(session.AccountId, plotCube.Interact.Metadata.Nurturing, plotCube.Interact.Metadata.Id);
+ if (nurturing is null) {
+ lock (Plots) {
+ logger.Error("Failed to create Nurturing for {AccountId}, ItemId {ItemId}", session.AccountId, plotCube.ItemId);
+ }
+ return;
+ }
+ }
+ plotCube.Interact.Nurturing = nurturing;
+ }
+ session.Field.Broadcast(FunctionCubePacket.AddFunctionCube(plotCube.Interact));
+ }
+
+ if (plot.IsPlanner) {
+ return;
+ }
+ break;
+ case LiftableCube liftable:
+ FieldLiftable? fieldLiftable = session.Field.AddLiftable($"4_{position.ConvertToInt()}", liftable.Liftable);
+ if (fieldLiftable == null) {
+ return;
+ }
+
+ session.HeldCube = null;
+ fieldLiftable.Count = 1;
+ fieldLiftable.State = LiftableState.Default;
+ fieldLiftable.Position = position;
+ fieldLiftable.Rotation = new Vector3(0, 0, rotation);
+ fieldLiftable.FinishTick = session.Field.FieldTick + fieldLiftable.Value.ItemLifetime;
+
+ if (session.Field.Entities.LiftableTargetBoxes.TryGetValue(position, out LiftableTargetBox? liftableTarget)) {
+ session.ConditionUpdate(ConditionType.item_move, codeLong: cubeItem.ItemId, targetLong: liftableTarget.LiftableTarget);
+ }
+
+ Broadcast(LiftablePacket.Add(fieldLiftable));
+ if (plot.Cubes.TryAdd(position, new PlotCube(itemMetadata, liftable.Id) { Type = PlotCube.CubeType.Liftable, Position = position, Rotation = rotation })) {
+ Broadcast(CubePacket.PlaceLiftable(session.Player.ObjectId, liftable, position, rotation));
+ }
+ Broadcast(SetCraftModePacket.Stop(session.Player.ObjectId));
+ Broadcast(LiftablePacket.Update(fieldLiftable));
+ break;
+ }
+
+ session.ConditionUpdate(ConditionType.install_item, codeLong: cubeItem.ItemId);
+ }
 }

Maple2.Server.Game/Manager/Field/FieldManager/FieldManager.cs

@@ -125,6 +125,9 @@ public virtual void Init() {
  }
  }
 
+ // Create default to place liftable cubes
+ Plots[0] = Plot.Default;
+
  foreach (TriggerModel trigger in Entities.TriggerModels.Values) {
  AddTrigger(trigger);
  }

Maple2.Server.Game/Manager/HousingManager.cs

@@ -450,15 +450,10 @@ public void InteriorReward(byte rewardId) {
  }
 
  #region Helpers
- public bool TryPlaceCube(HeldCube cube, Plot plot, in Vector3B position, float rotation,
+ public bool TryPlaceCube(HeldCube cube, Plot plot, ItemMetadata itemMetadata, in Vector3B position, float rotation,
  [NotNullWhen(true)] out PlotCube? result, bool isReplace = false) {
  result = null;
- if (!session.ItemMetadata.TryGet(cube.ItemId, out ItemMetadata? itemMetadata) || itemMetadata.Install is null || itemMetadata.Housing is null) {
- logger.Error("Failed to get item metadata for cube {cubeId}.", cube.ItemId);
- return false;
- }
-
- if (plot.PlotMode is PlotMode.BlueprintPlanner && itemMetadata.Housing.IsNotAllowedInBlueprint) {
+ if (plot.PlotMode is PlotMode.BlueprintPlanner && itemMetadata.Housing!.IsNotAllowedInBlueprint) {
  if (itemMetadata.Housing.HousingCategory is HousingCategory.Farming or HousingCategory.Ranching) {
  session.Send(CubePacket.Error(UgcMapError.s_err_cannot_install_nurturing_in_design_home));
  } else if (cube.ItemId is Constant.InteriorPortalCubeId) {
@@ -480,7 +475,7 @@ public bool TryPlaceCube(HeldCube cube, Plot plot, in Vector3B position, float r
  groundHeight = groundTile.Position.Z / Constant.BlockSize;
  }
 
- bool isSolidCube = itemMetadata.Install.IsSolidCube;
+ bool isSolidCube = itemMetadata.Install!.IsSolidCube;
  bool isOnGround = Math.Abs(position.Z - groundHeight) < 0.1;
  bool allowWaterOnGround = itemMetadata.Install.MapAttribute is MapAttribute.water && Constant.AllowWaterOnGround;
 
@@ -517,6 +512,7 @@ public bool TryPlaceCube(HeldCube cube, Plot plot, in Vector3B position, float r
  result = new PlotCube(itemMetadata, FurnishingManager.NextCubeId(), cube.Template) {
  Position = position,
  Rotation = rotation,
+ Type = cube is LiftableCube ? PlotCube.CubeType.Liftable : PlotCube.CubeType.Construction,
  };
 
  if (functionCubeMetadata is not null) {
@@ -679,7 +675,7 @@ public void ApplyLayout(Plot plot, HomeLayout layout, bool isBlueprint = false)
  foreach (PlotCube cube in layout.Cubes) {
  Item? item = session.Item.Furnishing.GetItem(cube.ItemId);
  cube.Id = item?.Uid ?? 0;
- if (!TryPlaceCube(cube, plot, cube.Position, cube.Rotation, out PlotCube? plotCube)) {
+ if (!TryPlaceCube(cube, plot, item!.Metadata, cube.Position, cube.Rotation, out PlotCube? plotCube)) {
  return;
  }
 

Maple2.Server.Game/Manager/Items/FurnishingManager.cs

@@ -104,7 +104,9 @@ public bool TryPlaceCube(long uid, [NotNullWhen(true)] out PlotCube? cube) {
  ? FurnishingStoragePacket.Update(item.Uid, item.Amount)
  : FurnishingStoragePacket.Remove(item.Uid));
 
- cube = new PlotCube(item.Metadata, NextCubeId(), item.Template);
+ cube = new PlotCube(item.Metadata, NextCubeId(), item.Template) {
+ Type = PlotCube.CubeType.Construction,
+ };
  if (!AddInventory(cube)) {
  logger.Fatal("Failed to add cube: {CubeId} to inventory", cube.Id);
  throw new InvalidOperationException($"Failed to add cube: {cube.Id} to inventory");

Maple2.Server.Game/Model/Field/Entity/FieldLiftable.cs

@@ -28,44 +28,47 @@ public FieldLiftable(FieldManager field, int objectId, string entityId, Liftable
  Count--;
  // Only respawn if we have a regen time
  if (RespawnTick == 0 && Value.RegenCheckTime > 0) {
- RespawnTick = Environment.TickCount64 + Value.RegenCheckTime;
+ RespawnTick = Field.FieldTick + Value.RegenCheckTime;
  }
 
  if (Count > 0) {
  Field.Broadcast(LiftablePacket.Update(this));
+ } else if (FinishTick > 0) {
+ // This is a temp liftable, so we need to remove it
+ Field.RemoveLiftable(EntityId);
  } else {
- State = Value.RegenCheckTime > 0 ? LiftableState.Respawning : LiftableState.Removed;
- Field.Broadcast(LiftablePacket.Remove(EntityId));
+ State = LiftableState.Removed;
+ Field.Broadcast(LiftablePacket.Update(this));
+
  Field.Broadcast(CubePacket.RemoveCube(ObjectId, Position));
  }
 
  return new LiftableCube(Value);
  }
 
  public override void Update(long tickCount) {
-// Handles despawning after being placed
-if (FinishTick != 0 && tickCount > FinishTick) {
-Field.RemoveLiftable(EntityId);
-return;
- }
-
-if (RespawnTick == 0 || tickCount < RespawnTick) {
-return;
-}
-
-Count++;
-// Only respawn if we have a regen time
-if (Count < Value.ItemStackCount && Value.RegenCheckTime > 0) {
-RespawnTick = tickCount + Value.RegenCheckTime;
-} else {
-RespawnTick = 0;
-}
-
-if (Count == 1) {
-State = LiftableState.Default;
-Field.Broadcast(LiftablePacket.Add(this));
-Field.Broadcast(CubePacket.PlaceLiftable(ObjectId, new LiftableCube(Value), Position, Rotation.Z));
+switch (State) {
+ case LiftableState.Removed:
+ if (RespawnTick > tickCount) {
+ State = LiftableState.Respawning;
+}
+ break;
+ case LiftableState.Respawning:
+ if (tickCount >= RespawnTick) {
+ State = LiftableState.Default;
+ Count = Value.ItemStackCount;
+ RespawnTick = 0;
+ Field.Broadcast(LiftablePacket.Update(this));
+ }
+ break;
+ case LiftableState.Default:
+ if (FinishTick != 0 && tickCount > FinishTick) {
+ Field.RemoveLiftable(EntityId);
+ return;
+ }
+ break;
+case LiftableState.Disabled:
+ return;
  }
- Field.Broadcast(LiftablePacket.Update(this));
  }
 }