diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java
index 2d6d174825..82a36fbbdc 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java
@@ -26,12 +26,21 @@ import com.l2jmobius.gameserver.network.serverpackets.EtcStatusUpdate;
 import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 
 /**
- * @author Sdw
+ * @author Sdw, Mobius
  */
 public class GetMomentum extends AbstractEffect
 {
+	public static int _ticks;
+	
 	public GetMomentum(StatsSet params)
 	{
+		_ticks = params.getInt("ticks", 0);
+	}
+	
+	@Override
+	public int getTicks()
+	{
+		return _ticks;
 	}
 	
 	@Override
@@ -40,10 +49,10 @@ public class GetMomentum extends AbstractEffect
 		if (info.getEffected().isPlayer())
 		{
 			final L2PcInstance player = info.getEffected().getActingPlayer();
-			final int maxCharge = (int) info.getEffected().getStat().getValue(Stats.MAX_MOMENTUM, 0);
+			final int maxCharge = (int) player.getStat().getValue(Stats.MAX_MOMENTUM, 0);
 			final int newCharge = Math.min(player.getCharges() + 1, maxCharge);
 			
-			player.setCharges(maxCharge);
+			player.setCharges(newCharge);
 			
 			if (newCharge == maxCharge)
 			{
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java
index 2d6d174825..82a36fbbdc 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java
@@ -26,12 +26,21 @@ import com.l2jmobius.gameserver.network.serverpackets.EtcStatusUpdate;
 import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 
 /**
- * @author Sdw
+ * @author Sdw, Mobius
  */
 public class GetMomentum extends AbstractEffect
 {
+	public static int _ticks;
+	
 	public GetMomentum(StatsSet params)
 	{
+		_ticks = params.getInt("ticks", 0);
+	}
+	
+	@Override
+	public int getTicks()
+	{
+		return _ticks;
 	}
 	
 	@Override
@@ -40,10 +49,10 @@ public class GetMomentum extends AbstractEffect
 		if (info.getEffected().isPlayer())
 		{
 			final L2PcInstance player = info.getEffected().getActingPlayer();
-			final int maxCharge = (int) info.getEffected().getStat().getValue(Stats.MAX_MOMENTUM, 0);
+			final int maxCharge = (int) player.getStat().getValue(Stats.MAX_MOMENTUM, 0);
 			final int newCharge = Math.min(player.getCharges() + 1, maxCharge);
 			
-			player.setCharges(maxCharge);
+			player.setCharges(newCharge);
 			
 			if (newCharge == maxCharge)
 			{
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java
index 2d6d174825..82a36fbbdc 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java
@@ -26,12 +26,21 @@ import com.l2jmobius.gameserver.network.serverpackets.EtcStatusUpdate;
 import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 
 /**
- * @author Sdw
+ * @author Sdw, Mobius
  */
 public class GetMomentum extends AbstractEffect
 {
+	public static int _ticks;
+	
 	public GetMomentum(StatsSet params)
 	{
+		_ticks = params.getInt("ticks", 0);
+	}
+	
+	@Override
+	public int getTicks()
+	{
+		return _ticks;
 	}
 	
 	@Override
@@ -40,10 +49,10 @@ public class GetMomentum extends AbstractEffect
 		if (info.getEffected().isPlayer())
 		{
 			final L2PcInstance player = info.getEffected().getActingPlayer();
-			final int maxCharge = (int) info.getEffected().getStat().getValue(Stats.MAX_MOMENTUM, 0);
+			final int maxCharge = (int) player.getStat().getValue(Stats.MAX_MOMENTUM, 0);
 			final int newCharge = Math.min(player.getCharges() + 1, maxCharge);
 			
-			player.setCharges(maxCharge);
+			player.setCharges(newCharge);
 			
 			if (newCharge == maxCharge)
 			{
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java
index 2d6d174825..82a36fbbdc 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java
@@ -26,12 +26,21 @@ import com.l2jmobius.gameserver.network.serverpackets.EtcStatusUpdate;
 import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 
 /**
- * @author Sdw
+ * @author Sdw, Mobius
  */
 public class GetMomentum extends AbstractEffect
 {
+	public static int _ticks;
+	
 	public GetMomentum(StatsSet params)
 	{
+		_ticks = params.getInt("ticks", 0);
+	}
+	
+	@Override
+	public int getTicks()
+	{
+		return _ticks;
 	}
 	
 	@Override
@@ -40,10 +49,10 @@ public class GetMomentum extends AbstractEffect
 		if (info.getEffected().isPlayer())
 		{
 			final L2PcInstance player = info.getEffected().getActingPlayer();
-			final int maxCharge = (int) info.getEffected().getStat().getValue(Stats.MAX_MOMENTUM, 0);
+			final int maxCharge = (int) player.getStat().getValue(Stats.MAX_MOMENTUM, 0);
 			final int newCharge = Math.min(player.getCharges() + 1, maxCharge);
 			
-			player.setCharges(maxCharge);
+			player.setCharges(newCharge);
 			
 			if (newCharge == maxCharge)
 			{
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java
index 2d6d174825..82a36fbbdc 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java
@@ -26,12 +26,21 @@ import com.l2jmobius.gameserver.network.serverpackets.EtcStatusUpdate;
 import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 
 /**
- * @author Sdw
+ * @author Sdw, Mobius
  */
 public class GetMomentum extends AbstractEffect
 {
+	public static int _ticks;
+	
 	public GetMomentum(StatsSet params)
 	{
+		_ticks = params.getInt("ticks", 0);
+	}
+	
+	@Override
+	public int getTicks()
+	{
+		return _ticks;
 	}
 	
 	@Override
@@ -40,10 +49,10 @@ public class GetMomentum extends AbstractEffect
 		if (info.getEffected().isPlayer())
 		{
 			final L2PcInstance player = info.getEffected().getActingPlayer();
-			final int maxCharge = (int) info.getEffected().getStat().getValue(Stats.MAX_MOMENTUM, 0);
+			final int maxCharge = (int) player.getStat().getValue(Stats.MAX_MOMENTUM, 0);
 			final int newCharge = Math.min(player.getCharges() + 1, maxCharge);
 			
-			player.setCharges(maxCharge);
+			player.setCharges(newCharge);
 			
 			if (newCharge == maxCharge)
 			{