From c3356e408c0339362105ce8ed2ea07c61200299c Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Fri, 27 Dec 2019 10:26:24 +0000
Subject: [PATCH] Fixed regen task would not stop for summons. Contributed by
 Sahar.

---
 .../java/org/l2jmobius/gameserver/model/actor/Summon.java       | 2 ++
 .../l2jmobius/gameserver/model/actor/instance/PetInstance.java  | 1 -
 .../java/org/l2jmobius/gameserver/model/actor/Summon.java       | 2 ++
 .../l2jmobius/gameserver/model/actor/instance/PetInstance.java  | 1 -
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Summon.java
index 3168dfa954..eaacc51f08 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Summon.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Summon.java
@@ -379,6 +379,8 @@ public abstract class Summon extends Playable
 	{
 		if (isSpawned() && !isDead())
 		{
+			stopHpMpRegeneration();
+			
 			getAI().stopFollow();
 			if (owner != null)
 			{
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java
index 87b776f95f..4e00d4d3f3 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java
@@ -1109,7 +1109,6 @@ public class PetInstance extends Summon
 	public synchronized void unSummon(PlayerInstance owner)
 	{
 		stopFeed();
-		stopHpMpRegeneration();
 		super.unSummon(owner);
 		
 		if (!isDead())
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Summon.java
index 962b1ee64c..ddceb9c8ab 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Summon.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Summon.java
@@ -379,6 +379,8 @@ public abstract class Summon extends Playable
 	{
 		if (isSpawned() && !isDead())
 		{
+			stopHpMpRegeneration();
+			
 			getAI().stopFollow();
 			if (owner != null)
 			{
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java
index 87b776f95f..4e00d4d3f3 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java
@@ -1109,7 +1109,6 @@ public class PetInstance extends Summon
 	public synchronized void unSummon(PlayerInstance owner)
 	{
 		stopFeed();
-		stopHpMpRegeneration();
 		super.unSummon(owner);
 		
 		if (!isDead())