Lifesteal and manasteal

cydyn · Mar 30, 2024 · 0baa30f · 0baa30f
1 parent 054bd3c
commit 0baa30f
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/Intersect.Client/Interface/Game/Character/CharacterWindow.cs b/Intersect.Client/Interface/Game/Character/CharacterWindow.cs
@@ -463,7 +463,15 @@ public void UpdateExtraBuffs(Guid itemId)
                             break;
                         case ItemEffect.Lifesteal:
                             LifeStealAmount += effect.Percentage;
-                            mLifeSteal?.SetText(Strings.Character.Lifesteal.ToString(LifeStealAmount));
+                            // Checks if LifeStealAmount is less than 0, if so, sets the text to "0"
+                            if (LifeStealAmount < 0)
+                            {
+                                mLifeSteal?.SetText(Strings.Character.Lifesteal.ToString($"0 ({LifeStealAmount})"));
+                            }
+                            else
+                            {
+                                mLifeSteal?.SetText(Strings.Character.Lifesteal.ToString(LifeStealAmount));
+                            }
 
                             break;
                         case ItemEffect.Tenacity:
@@ -483,7 +491,15 @@ public void UpdateExtraBuffs(Guid itemId)
                             break;
                         case ItemEffect.Manasteal:
                             ManaStealAmount += effect.Percentage;
-                            mManaSteal?.SetText(Strings.Character.Manasteal.ToString(ManaStealAmount));
+                            // Checks if ManaStealAmount is less than 0, if so, sets the text to "0"
+                            if (ManaStealAmount < 0)
+                            {
+                                mManaSteal?.SetText(Strings.Character.Manasteal.ToString(0));
+                            }
+                            else
+                            {
+                                mManaSteal?.SetText(Strings.Character.Manasteal.ToString($"0 ({ManaStealAmount})"));
+                            }
 
                             break;
                     }

diff --git a/Intersect.Server.Core/Entities/Entity.cs b/Intersect.Server.Core/Entities/Entity.cs
@@ -2067,7 +2067,8 @@ public void Attack(
             var thisPlayer = this as Player;
 
             //Check for lifesteal/manasteal
-            if (this is Player && !(enemy is Resource))
+            if (baseDamage > 0 && this != enemy)
+                if (this is Player && !(enemy is Resource))
             {
                 var lifestealRate = thisPlayer.GetEquipmentBonusEffect(ItemEffect.Lifesteal) / 100f;
                 if (lifestealRate < 0)