From 0ea3ed60b9981ceb5bb494ce136fe823b9660896 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Thu, 26 Mar 2020 09:54:44 +0000
Subject: [PATCH] Stop skill effects with RequestResetAbilityPoint.

---
 .../network/clientpackets/ability/RequestResetAbilityPoint.java | 2 ++
 .../network/clientpackets/ability/RequestResetAbilityPoint.java | 2 ++
 .../network/clientpackets/ability/RequestResetAbilityPoint.java | 2 ++
 .../network/clientpackets/ability/RequestResetAbilityPoint.java | 2 ++
 .../network/clientpackets/ability/RequestResetAbilityPoint.java | 2 ++
 .../network/clientpackets/ability/RequestResetAbilityPoint.java | 2 ++
 .../network/clientpackets/ability/RequestResetAbilityPoint.java | 2 ++
 .../network/clientpackets/ability/RequestResetAbilityPoint.java | 2 ++
 8 files changed, 16 insertions(+)

diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java
index be34ce5e84..4eea7ea42b 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java
@@ -97,6 +97,8 @@ public class RequestResetAbilityPoint implements IClientIncomingPacket
 				if (skill != null)
 				{
 					player.removeSkill(skill);
+					// TODO: Check if this needs to be moved to PlayerIstance removeSkill method.
+					player.getEffectList().stopSkillEffects(false, skill);
 				}
 			}
 			player.setAbilityPointsUsed(0);
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java
index d440e9bb99..7dc37ebcb8 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java
@@ -97,6 +97,8 @@ public class RequestResetAbilityPoint implements IClientIncomingPacket
 				if (skill != null)
 				{
 					player.removeSkill(skill);
+					// TODO: Check if this needs to be moved to PlayerIstance removeSkill method.
+					player.getEffectList().stopSkillEffects(false, skill);
 				}
 			}
 			player.setAbilityPointsUsed(0);
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java
index d440e9bb99..7dc37ebcb8 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java
@@ -97,6 +97,8 @@ public class RequestResetAbilityPoint implements IClientIncomingPacket
 				if (skill != null)
 				{
 					player.removeSkill(skill);
+					// TODO: Check if this needs to be moved to PlayerIstance removeSkill method.
+					player.getEffectList().stopSkillEffects(false, skill);
 				}
 			}
 			player.setAbilityPointsUsed(0);
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java
index 91bf8c9558..0854b7a819 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java
@@ -95,6 +95,8 @@ public class RequestResetAbilityPoint implements IClientIncomingPacket
 			if (skill != null)
 			{
 				player.removeSkill(skill);
+				// TODO: Check if this needs to be moved to PlayerIstance removeSkill method.
+				player.getEffectList().stopSkillEffects(false, skill);
 			}
 		}
 		player.setAbilityPointsUsed(0);
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java
index 91bf8c9558..0854b7a819 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java
@@ -95,6 +95,8 @@ public class RequestResetAbilityPoint implements IClientIncomingPacket
 			if (skill != null)
 			{
 				player.removeSkill(skill);
+				// TODO: Check if this needs to be moved to PlayerIstance removeSkill method.
+				player.getEffectList().stopSkillEffects(false, skill);
 			}
 		}
 		player.setAbilityPointsUsed(0);
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java
index 91bf8c9558..0854b7a819 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java
@@ -95,6 +95,8 @@ public class RequestResetAbilityPoint implements IClientIncomingPacket
 			if (skill != null)
 			{
 				player.removeSkill(skill);
+				// TODO: Check if this needs to be moved to PlayerIstance removeSkill method.
+				player.getEffectList().stopSkillEffects(false, skill);
 			}
 		}
 		player.setAbilityPointsUsed(0);
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java
index 91bf8c9558..0854b7a819 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java
@@ -95,6 +95,8 @@ public class RequestResetAbilityPoint implements IClientIncomingPacket
 			if (skill != null)
 			{
 				player.removeSkill(skill);
+				// TODO: Check if this needs to be moved to PlayerIstance removeSkill method.
+				player.getEffectList().stopSkillEffects(false, skill);
 			}
 		}
 		player.setAbilityPointsUsed(0);
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java
index 91bf8c9558..0854b7a819 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java
@@ -95,6 +95,8 @@ public class RequestResetAbilityPoint implements IClientIncomingPacket
 			if (skill != null)
 			{
 				player.removeSkill(skill);
+				// TODO: Check if this needs to be moved to PlayerIstance removeSkill method.
+				player.getEffectList().stopSkillEffects(false, skill);
 			}
 		}
 		player.setAbilityPointsUsed(0);