Fixes for merging the main branch

Fixes for merging the main branch

Author: jewelpetmurumo-alt

Maple2.Server.Core/Formulas/BonusAttack.cs

@@ -9,11 +9,10 @@ public static double Coefficient(int rightHandRarity, int leftHandRarity, JobCod
         }
 
         double weaponBonusAttackCoefficient = RarityMultiplier(rightHandRarity);
-        if (leftHandRarity == 0) {
-            return weaponBonusAttackCoefficient;
+        if (leftHandRarity > 0) {
+            weaponBonusAttackCoefficient = 0.5 * (weaponBonusAttackCoefficient + RarityMultiplier(leftHandRarity));
         }
 
-        weaponBonusAttackCoefficient = 0.5 * (weaponBonusAttackCoefficient + RarityMultiplier(leftHandRarity));
         return 4.96 * weaponBonusAttackCoefficient * JobBonusMultiplier(jobCode);
     }
 

Maple2.Server.Game/Manager/StatsManager.cs

@@ -73,8 +73,8 @@ public StatsManager(IActor actor) {
         return (1, 1);
 
         double BonusAttackCoefficient(FieldPlayer player) {
-            int leftHandRarity = player.Session.Item.Equips.Get(EquipSlot.RH)?.Rarity ?? 0;
-            int rightHandRarity = player.Session.Item.Equips.Get(EquipSlot.LH)?.Rarity ?? 0;
+            int rightHandRarity = player.Session.Item.Equips.Get(EquipSlot.RH)?.Rarity ?? 0;
+            int leftHandRarity = player.Session.Item.Equips.Get(EquipSlot.LH)?.Rarity ?? 0;
             return BonusAttack.Coefficient(rightHandRarity, leftHandRarity, player.Value.Character.Job.Code());
         }
     }
@@ -140,6 +140,11 @@ public void Refresh() {
         AddBuffs(player);
         Values.Total();
         StatConversion(player);
+        // Stat rebuild via AddBase/AddTotal restores Current to Total,
+        // but a dead player must stay at 0 HP until revived.
+        if (player.IsDead) {
+            Values[BasicAttribute.Health].Current = 0;
+        }
         Actor.Field.Broadcast(StatsPacket.Init(player));
         Actor.Field.Broadcast(StatsPacket.Update(player), player.Session);
 

Maple2.Server.Web/Controllers/WebController.cs

@@ -286,7 +286,7 @@ private static IResult HandleUnknownMode(UgcType mode) {
     #endregion
 
     #region Ranking
-    public ByteWriter Trophy(string userName) {
+    private ByteWriter Trophy(string userName) {
         string cacheKey = $"Trophy_{userName ?? "all"}";
 
         if (!cache.TryGetValue(cacheKey, out byte[]? cachedData)) {
@@ -312,7 +312,7 @@ public ByteWriter Trophy(string userName) {
         return result;
     }
 
-    public ByteWriter PersonalTrophy(long characterId) {
+    private ByteWriter PersonalTrophy(long characterId) {
         string cacheKey = $"PersonalTrophy_{characterId}";
 
         if (!cache.TryGetValue(cacheKey, out byte[]? cachedData)) {
@@ -328,7 +328,7 @@ public ByteWriter PersonalTrophy(long characterId) {
         return result;
     }
 
-    public ByteWriter GuildTrophy(string userName) {
+    private ByteWriter GuildTrophy(string userName) {
         if (!string.IsNullOrEmpty(userName)) {
             string cacheKey = $"GuildTrophy_{userName}";
 
@@ -359,7 +359,7 @@ public ByteWriter GuildTrophy(string userName) {
         return InGameRankPacket.GuildTrophy(GetCachedGuildTrophyRankings());
     }
 
-    public ByteWriter PersonalGuildTrophy(long characterId) {
+    private ByteWriter PersonalGuildTrophy(long characterId) {
         string cacheKey = $"PersonalGuildTrophy_{characterId}";
 
         if (!cache.TryGetValue(cacheKey, out byte[]? cachedData)) {
@@ -397,7 +397,7 @@ private IList<GuildTrophyRankInfo> GetCachedGuildTrophyRankings() {
     }
     #endregion
 
-    public ByteWriter MenteeList(long accountId, long characterId) {
+    private ByteWriter MenteeList(long accountId, long characterId) {
         using GameStorage.Request db = gameStorage.Context();
         IList<long> list = db.GetMentorList(accountId, characterId);