From 02ca14558a343356313f148d3c7cb2f6fc624419 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Tue, 30 Jul 2019 20:57:36 +0000
Subject: [PATCH] Speed multiplier already calculated at getRunSpeed method.

---
 .../gameserver/model/actor/stat/CreatureStat.java | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
index c4d8abab3e..f30f4438c2 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
@@ -568,12 +568,15 @@ public class CreatureStat
 	 */
 	public final float getMovementSpeedMultiplier()
 	{
-		if (_creature == null)
-		{
-			return 1;
-		}
+		// No need: getRunSpeed() calculates multipliers.
 		
-		return getRunSpeed() / _creature.getTemplate().baseRunSpd;
+		// if (_creature == null)
+		// {
+		// return 1;
+		// }
+		// return getRunSpeed() / _creature.getTemplate().baseRunSpd;
+		
+		return 1;
 	}
 	
 	public void setGmSpeedMultiplier(float multipier)
@@ -883,7 +886,6 @@ public class CreatureStat
 		
 		// err we should be adding TO the persons run speed not making it a constant
 		int val = (int) calcStat(Stats.RUN_SPEED, _creature.getTemplate().baseRunSpd, null, null) + Config.RUN_SPD_BOOST;
-		
 		if (_creature.isInsideZone(ZoneId.WATER))
 		{
 			val /= 2;
@@ -902,7 +904,6 @@ public class CreatureStat
 		}
 		
 		val /= _creature.getArmourExpertisePenalty();
-		
 		if ((val > Config.MAX_RUN_SPEED) && !_creature.charIsGM())
 		{
 			val = Config.MAX_RUN_SPEED;