Bug fixes (#329)

* Bug fixes * a stupid format error
AngeloTadeucci · Feb 27, 2025 · 946d544 · 946d544
1 parent d68572b
commit 946d544
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 11 deletions.
diff --git a/Maple2.Model/Enum/Portal.cs b/Maple2.Model/Enum/Portal.cs
@@ -9,6 +9,7 @@ public enum PortalType : byte {
     DungeonEnter = 9,
     InHome = 11,
     LeaveDungeon = 13,
+    ContentsGuide = 15,
 }
 
 public enum PortalActionType {

diff --git a/Maple2.Server.Game/Manager/ExperienceManager.cs b/Maple2.Server.Game/Manager/ExperienceManager.cs
@@ -174,7 +174,7 @@ public bool LevelUp() {
             session.Player.Flag |= PlayerObjectFlag.Level;
             session.Field?.Broadcast(LevelUpPacket.LevelUp(session.Player));
             session.ConditionUpdate(ConditionType.level_up, codeLong: (int) session.Player.Value.Character.Job.Code(), targetLong: Level);
-            session.ConditionUpdate(ConditionType.level, codeLong: Level);
+            session.ConditionUpdate(ConditionType.level, targetLong: Level);
 
             session.Stats.Refresh();
 

diff --git a/Maple2.Server.Game/Manager/Field/FieldManager.State.cs b/Maple2.Server.Game/Manager/Field/FieldManager.State.cs
@@ -87,12 +87,8 @@ public FieldPlayer SpawnPlayer(GameSession session, Player player, int portalId
             player.Character.ReviveMapId = Metadata.Property.RevivalReturnId;
         }
 
-        if (Metadata.Property.EnterReturnId != 0 &&
-            Metadata.Property.Type != MapType.Arcade &&
-            Metadata.Property.Type != MapType.PocketRealm &&
-            Metadata.Property.Type != MapType.Dungeon &&
-            Metadata.Property.Type != MapType.Event &&
-            Metadata.Property.Type != MapType.Event2) {
+        if (Metadata.Property.EnterReturnId != 0 && FieldInstance.InstanceType == InstanceType.none) {
+            // TODO: Probably need to figure out homes and dungeon maps.
             player.Character.ReturnMapId = Metadata.Property.EnterReturnId;
         }
 

diff --git a/Maple2.Server.Game/Manager/FishingManager.cs b/Maple2.Server.Game/Manager/FishingManager.cs
@@ -195,7 +195,7 @@ private Dictionary<Vector3, FishingTile> GetFishingBlocks(FishingRodTable.Entry
                     continue;
                 }
 
-                if (spot.MinMastery > fish.Mastery || spot.MaxMastery < fish.Mastery) {
+                if (!fish.IgnoreSpotMastery && (spot.MinMastery > fish.Mastery || spot.MaxMastery < fish.Mastery)) {
                     continue;
                 }
 

diff --git a/Maple2.Server.Game/Manager/GuildManager.cs b/Maple2.Server.Game/Manager/GuildManager.cs
@@ -139,6 +139,8 @@ public bool SetGuild(GuildInfo info, bool addTag = true) {
         if (addTag) {
             session.Field?.Broadcast(GuildPacket.AddTag(session.PlayerName, Guild.Name));
         }
+
+        session.ConditionUpdate(ConditionType.guild_join_req);
         return true;
     }
 

diff --git a/Maple2.Server.Game/Model/Field/Actor/FieldPlayer.cs b/Maple2.Server.Game/Model/Field/Actor/FieldPlayer.cs
@@ -111,14 +111,15 @@ public override void Update(long tickCount) {
         }
 
         // Loops through each registered regen stat and applies regen
+        var statsToRemove = new List<BasicAttribute>();
         foreach (BasicAttribute attribute in regenStats.Keys) {
             Stat stat = Stats.Values[attribute];
             Stat regen = Stats.Values[regenStats[attribute].Item1];
             Stat interval = Stats.Values[regenStats[attribute].Item2];
 
             if (stat.Current >= stat.Total) {
                 // Removes stat from regen stats so it won't be listened for
-                regenStats.Remove(attribute);
+                statsToRemove.Add(attribute);
                 continue;
             }
 
@@ -130,6 +131,9 @@ public override void Update(long tickCount) {
                 Session.Send(StatsPacket.Update(this, attribute));
             }
         }
+        foreach (BasicAttribute attribute in statsToRemove) {
+            regenStats.Remove(attribute);
+        }
 
         Session.GameEvent.Update(tickCount);
 

diff --git a/Maple2.Server.Game/Trigger/TriggerContext.Interface.cs b/Maple2.Server.Game/Trigger/TriggerContext.Interface.cs
@@ -97,9 +97,12 @@ public void SetEventUiScript(BannerType type, string script, int duration, strin
             }
         }
 
-        foreach (FieldPlayer player in PlayersInBox(boxIdInts)) {
-            player.Session.Send(packet);
+        foreach (int boxId in boxIdInts) {
+            foreach (FieldPlayer player in PlayersInBox(boxId)) {
+                player.Session.Send(packet);
+            }
         }
+
     }
 
     public void SetEventUiCountdown(string script, int[] roundCountdown, string[] boxIds) {