diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java
index 7b00a53ce4..0703e9b190 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java
@@ -73,8 +73,10 @@ public class ManaHeal extends AbstractEffect
 		amount = Math.max(Math.min(amount, effected.getMaxRecoverableMp() - effected.getCurrentMp()), 0);
 		if (amount != 0)
 		{
+			effected.setCurrentMp(effected.getCurrentMp() + amount);
 			effected.broadcastStatusUpdate(effector);
 		}
+		
 		SystemMessage sm;
 		if (effector.getObjectId() != effected.getObjectId())
 		{
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java
index 7b00a53ce4..0703e9b190 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java
@@ -73,8 +73,10 @@ public class ManaHeal extends AbstractEffect
 		amount = Math.max(Math.min(amount, effected.getMaxRecoverableMp() - effected.getCurrentMp()), 0);
 		if (amount != 0)
 		{
+			effected.setCurrentMp(effected.getCurrentMp() + amount);
 			effected.broadcastStatusUpdate(effector);
 		}
+		
 		SystemMessage sm;
 		if (effector.getObjectId() != effected.getObjectId())
 		{
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java
index 7b00a53ce4..0703e9b190 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java
@@ -73,8 +73,10 @@ public class ManaHeal extends AbstractEffect
 		amount = Math.max(Math.min(amount, effected.getMaxRecoverableMp() - effected.getCurrentMp()), 0);
 		if (amount != 0)
 		{
+			effected.setCurrentMp(effected.getCurrentMp() + amount);
 			effected.broadcastStatusUpdate(effector);
 		}
+		
 		SystemMessage sm;
 		if (effector.getObjectId() != effected.getObjectId())
 		{
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java
index 7b00a53ce4..0703e9b190 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java
@@ -73,8 +73,10 @@ public class ManaHeal extends AbstractEffect
 		amount = Math.max(Math.min(amount, effected.getMaxRecoverableMp() - effected.getCurrentMp()), 0);
 		if (amount != 0)
 		{
+			effected.setCurrentMp(effected.getCurrentMp() + amount);
 			effected.broadcastStatusUpdate(effector);
 		}
+		
 		SystemMessage sm;
 		if (effector.getObjectId() != effected.getObjectId())
 		{
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java
index 7b00a53ce4..0703e9b190 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java
@@ -73,8 +73,10 @@ public class ManaHeal extends AbstractEffect
 		amount = Math.max(Math.min(amount, effected.getMaxRecoverableMp() - effected.getCurrentMp()), 0);
 		if (amount != 0)
 		{
+			effected.setCurrentMp(effected.getCurrentMp() + amount);
 			effected.broadcastStatusUpdate(effector);
 		}
+		
 		SystemMessage sm;
 		if (effector.getObjectId() != effected.getObjectId())
 		{
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java
index 7b00a53ce4..0703e9b190 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java
@@ -73,8 +73,10 @@ public class ManaHeal extends AbstractEffect
 		amount = Math.max(Math.min(amount, effected.getMaxRecoverableMp() - effected.getCurrentMp()), 0);
 		if (amount != 0)
 		{
+			effected.setCurrentMp(effected.getCurrentMp() + amount);
 			effected.broadcastStatusUpdate(effector);
 		}
+		
 		SystemMessage sm;
 		if (effector.getObjectId() != effected.getObjectId())
 		{
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java
index 7b00a53ce4..0703e9b190 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java
@@ -73,8 +73,10 @@ public class ManaHeal extends AbstractEffect
 		amount = Math.max(Math.min(amount, effected.getMaxRecoverableMp() - effected.getCurrentMp()), 0);
 		if (amount != 0)
 		{
+			effected.setCurrentMp(effected.getCurrentMp() + amount);
 			effected.broadcastStatusUpdate(effector);
 		}
+		
 		SystemMessage sm;
 		if (effector.getObjectId() != effected.getObjectId())
 		{
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java
index 7b00a53ce4..0703e9b190 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java
@@ -73,8 +73,10 @@ public class ManaHeal extends AbstractEffect
 		amount = Math.max(Math.min(amount, effected.getMaxRecoverableMp() - effected.getCurrentMp()), 0);
 		if (amount != 0)
 		{
+			effected.setCurrentMp(effected.getCurrentMp() + amount);
 			effected.broadcastStatusUpdate(effector);
 		}
+		
 		SystemMessage sm;
 		if (effector.getObjectId() != effected.getObjectId())
 		{
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java
index 7b00a53ce4..0703e9b190 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java
@@ -73,8 +73,10 @@ public class ManaHeal extends AbstractEffect
 		amount = Math.max(Math.min(amount, effected.getMaxRecoverableMp() - effected.getCurrentMp()), 0);
 		if (amount != 0)
 		{
+			effected.setCurrentMp(effected.getCurrentMp() + amount);
 			effected.broadcastStatusUpdate(effector);
 		}
+		
 		SystemMessage sm;
 		if (effector.getObjectId() != effected.getObjectId())
 		{
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java
index 7b00a53ce4..0703e9b190 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java
@@ -73,8 +73,10 @@ public class ManaHeal extends AbstractEffect
 		amount = Math.max(Math.min(amount, effected.getMaxRecoverableMp() - effected.getCurrentMp()), 0);
 		if (amount != 0)
 		{
+			effected.setCurrentMp(effected.getCurrentMp() + amount);
 			effected.broadcastStatusUpdate(effector);
 		}
+		
 		SystemMessage sm;
 		if (effector.getObjectId() != effected.getObjectId())
 		{
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java
index 7b00a53ce4..0703e9b190 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java
@@ -73,8 +73,10 @@ public class ManaHeal extends AbstractEffect
 		amount = Math.max(Math.min(amount, effected.getMaxRecoverableMp() - effected.getCurrentMp()), 0);
 		if (amount != 0)
 		{
+			effected.setCurrentMp(effected.getCurrentMp() + amount);
 			effected.broadcastStatusUpdate(effector);
 		}
+		
 		SystemMessage sm;
 		if (effector.getObjectId() != effected.getObjectId())
 		{
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java
index 7b00a53ce4..0703e9b190 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java
@@ -73,8 +73,10 @@ public class ManaHeal extends AbstractEffect
 		amount = Math.max(Math.min(amount, effected.getMaxRecoverableMp() - effected.getCurrentMp()), 0);
 		if (amount != 0)
 		{
+			effected.setCurrentMp(effected.getCurrentMp() + amount);
 			effected.broadcastStatusUpdate(effector);
 		}
+		
 		SystemMessage sm;
 		if (effector.getObjectId() != effected.getObjectId())
 		{
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java
index 7b00a53ce4..0703e9b190 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java
@@ -73,8 +73,10 @@ public class ManaHeal extends AbstractEffect
 		amount = Math.max(Math.min(amount, effected.getMaxRecoverableMp() - effected.getCurrentMp()), 0);
 		if (amount != 0)
 		{
+			effected.setCurrentMp(effected.getCurrentMp() + amount);
 			effected.broadcastStatusUpdate(effector);
 		}
+		
 		SystemMessage sm;
 		if (effector.getObjectId() != effected.getObjectId())
 		{
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java
index 7b00a53ce4..0703e9b190 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java
@@ -73,8 +73,10 @@ public class ManaHeal extends AbstractEffect
 		amount = Math.max(Math.min(amount, effected.getMaxRecoverableMp() - effected.getCurrentMp()), 0);
 		if (amount != 0)
 		{
+			effected.setCurrentMp(effected.getCurrentMp() + amount);
 			effected.broadcastStatusUpdate(effector);
 		}
+		
 		SystemMessage sm;
 		if (effector.getObjectId() != effected.getObjectId())
 		{
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java
index 7b00a53ce4..0703e9b190 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java
@@ -73,8 +73,10 @@ public class ManaHeal extends AbstractEffect
 		amount = Math.max(Math.min(amount, effected.getMaxRecoverableMp() - effected.getCurrentMp()), 0);
 		if (amount != 0)
 		{
+			effected.setCurrentMp(effected.getCurrentMp() + amount);
 			effected.broadcastStatusUpdate(effector);
 		}
+		
 		SystemMessage sm;
 		if (effector.getObjectId() != effected.getObjectId())
 		{
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/items/custom/mana_potion.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/items/custom/mana_potion.xml
deleted file mode 100644
index 420c9d9a97..0000000000
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/items/custom/mana_potion.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../xsd/items.xsd">
-	<item id="728" name="Mana Potion" type="EtcItem">
-		<!-- Magical, liquid medicine that restores MP for a certain amount of time. -->
-		<set name="icon" val="icon.etc_reagent_blue_i00" />
-		<set name="displayId" val="90310" />
-		<set name="default_action" val="SKILL_REDUCE" />
-		<set name="etcitem_type" val="POTION" />
-		<set name="immediate_effect" val="true" />
-		<set name="material" val="LIQUID" />
-		<set name="weight" val="180" />
-		<set name="price" val="2000" />
-		<set name="is_stackable" val="true" />
-		<set name="is_oly_restricted" val="true" />
-		<set name="handler" val="ItemSkills" />
-		<set name="commissionItemType" val="POTION" />
-		<set name="for_npc" val="true" />
-		<cond addName="1" msgId="113">
-			<player flyMounted="false" />
-		</cond>
-		<skills>
-			<skill id="26030" level="1" /> <!-- Mana Potion -->
-		</skills>
-	</item>
-</list>