From 64635f208c8e55c67c8d03a37d7d2d2cd113a1bb Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Tue, 5 Apr 2022 22:43:16 +0000
Subject: [PATCH] MinionList onMinionDie should set leader to null when
 respawnTime is 0. Thanks to kamikadzz.

---
 .../java/org/l2jmobius/gameserver/util/MinionList.java      | 6 +++++-
 .../java/org/l2jmobius/gameserver/util/MinionList.java      | 6 +++++-
 .../java/org/l2jmobius/gameserver/util/MinionList.java      | 6 +++++-
 .../java/org/l2jmobius/gameserver/util/MinionList.java      | 6 +++++-
 .../java/org/l2jmobius/gameserver/util/MinionList.java      | 6 +++++-
 .../java/org/l2jmobius/gameserver/util/MinionList.java      | 6 +++++-
 .../java/org/l2jmobius/gameserver/util/MinionList.java      | 6 +++++-
 .../java/org/l2jmobius/gameserver/util/MinionList.java      | 6 +++++-
 .../java/org/l2jmobius/gameserver/util/MinionList.java      | 6 +++++-
 .../java/org/l2jmobius/gameserver/util/MinionList.java      | 6 +++++-
 .../java/org/l2jmobius/gameserver/util/MinionList.java      | 6 +++++-
 .../java/org/l2jmobius/gameserver/util/MinionList.java      | 6 +++++-
 .../java/org/l2jmobius/gameserver/util/MinionList.java      | 6 +++++-
 .../java/org/l2jmobius/gameserver/util/MinionList.java      | 6 +++++-
 .../java/org/l2jmobius/gameserver/util/MinionList.java      | 6 +++++-
 .../java/org/l2jmobius/gameserver/util/MinionList.java      | 6 +++++-
 .../java/org/l2jmobius/gameserver/util/MinionList.java      | 6 +++++-
 .../java/org/l2jmobius/gameserver/util/MinionList.java      | 6 +++++-
 .../java/org/l2jmobius/gameserver/util/MinionList.java      | 6 +++++-
 .../java/org/l2jmobius/gameserver/util/MinionList.java      | 6 +++++-
 .../java/org/l2jmobius/gameserver/util/MinionList.java      | 6 +++++-
 .../java/org/l2jmobius/gameserver/util/MinionList.java      | 6 +++++-
 .../java/org/l2jmobius/gameserver/util/MinionList.java      | 6 +++++-
 .../java/org/l2jmobius/gameserver/util/MinionList.java      | 6 +++++-
 .../java/org/l2jmobius/gameserver/util/MinionList.java      | 6 +++++-
 25 files changed, 125 insertions(+), 25 deletions(-)

diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/util/MinionList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/util/MinionList.java
index 0360ecf5ae..bcfcc2d48b 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/util/MinionList.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/util/MinionList.java
@@ -141,7 +141,11 @@ public class MinionList
 	 */
 	public void onMinionDie(Monster minion, int respawnTime)
 	{
-		minion.setLeader(null); // prevent memory leaks
+		// Prevent memory leaks.
+		if (respawnTime == 0)
+		{
+			minion.setLeader(null);
+		}
 		_spawnedMinions.remove(minion);
 		
 		final int time = respawnTime < 0 ? _master.isRaid() ? (int) Config.RAID_MINION_RESPAWN_TIMER : 0 : respawnTime;
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/util/MinionList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/util/MinionList.java
index 0360ecf5ae..bcfcc2d48b 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/util/MinionList.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/util/MinionList.java
@@ -141,7 +141,11 @@ public class MinionList
 	 */
 	public void onMinionDie(Monster minion, int respawnTime)
 	{
-		minion.setLeader(null); // prevent memory leaks
+		// Prevent memory leaks.
+		if (respawnTime == 0)
+		{
+			minion.setLeader(null);
+		}
 		_spawnedMinions.remove(minion);
 		
 		final int time = respawnTime < 0 ? _master.isRaid() ? (int) Config.RAID_MINION_RESPAWN_TIMER : 0 : respawnTime;
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/util/MinionList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/util/MinionList.java
index 0360ecf5ae..bcfcc2d48b 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/util/MinionList.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/util/MinionList.java
@@ -141,7 +141,11 @@ public class MinionList
 	 */
 	public void onMinionDie(Monster minion, int respawnTime)
 	{
-		minion.setLeader(null); // prevent memory leaks
+		// Prevent memory leaks.
+		if (respawnTime == 0)
+		{
+			minion.setLeader(null);
+		}
 		_spawnedMinions.remove(minion);
 		
 		final int time = respawnTime < 0 ? _master.isRaid() ? (int) Config.RAID_MINION_RESPAWN_TIMER : 0 : respawnTime;
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/util/MinionList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/util/MinionList.java
index 0360ecf5ae..bcfcc2d48b 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/util/MinionList.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/util/MinionList.java
@@ -141,7 +141,11 @@ public class MinionList
 	 */
 	public void onMinionDie(Monster minion, int respawnTime)
 	{
-		minion.setLeader(null); // prevent memory leaks
+		// Prevent memory leaks.
+		if (respawnTime == 0)
+		{
+			minion.setLeader(null);
+		}
 		_spawnedMinions.remove(minion);
 		
 		final int time = respawnTime < 0 ? _master.isRaid() ? (int) Config.RAID_MINION_RESPAWN_TIMER : 0 : respawnTime;
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/util/MinionList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/util/MinionList.java
index 0360ecf5ae..bcfcc2d48b 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/util/MinionList.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/util/MinionList.java
@@ -141,7 +141,11 @@ public class MinionList
 	 */
 	public void onMinionDie(Monster minion, int respawnTime)
 	{
-		minion.setLeader(null); // prevent memory leaks
+		// Prevent memory leaks.
+		if (respawnTime == 0)
+		{
+			minion.setLeader(null);
+		}
 		_spawnedMinions.remove(minion);
 		
 		final int time = respawnTime < 0 ? _master.isRaid() ? (int) Config.RAID_MINION_RESPAWN_TIMER : 0 : respawnTime;
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/util/MinionList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/util/MinionList.java
index 0360ecf5ae..bcfcc2d48b 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/util/MinionList.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/util/MinionList.java
@@ -141,7 +141,11 @@ public class MinionList
 	 */
 	public void onMinionDie(Monster minion, int respawnTime)
 	{
-		minion.setLeader(null); // prevent memory leaks
+		// Prevent memory leaks.
+		if (respawnTime == 0)
+		{
+			minion.setLeader(null);
+		}
 		_spawnedMinions.remove(minion);
 		
 		final int time = respawnTime < 0 ? _master.isRaid() ? (int) Config.RAID_MINION_RESPAWN_TIMER : 0 : respawnTime;
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/util/MinionList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/util/MinionList.java
index 0360ecf5ae..bcfcc2d48b 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/util/MinionList.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/util/MinionList.java
@@ -141,7 +141,11 @@ public class MinionList
 	 */
 	public void onMinionDie(Monster minion, int respawnTime)
 	{
-		minion.setLeader(null); // prevent memory leaks
+		// Prevent memory leaks.
+		if (respawnTime == 0)
+		{
+			minion.setLeader(null);
+		}
 		_spawnedMinions.remove(minion);
 		
 		final int time = respawnTime < 0 ? _master.isRaid() ? (int) Config.RAID_MINION_RESPAWN_TIMER : 0 : respawnTime;
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/MinionList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/MinionList.java
index 0360ecf5ae..bcfcc2d48b 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/MinionList.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/MinionList.java
@@ -141,7 +141,11 @@ public class MinionList
 	 */
 	public void onMinionDie(Monster minion, int respawnTime)
 	{
-		minion.setLeader(null); // prevent memory leaks
+		// Prevent memory leaks.
+		if (respawnTime == 0)
+		{
+			minion.setLeader(null);
+		}
 		_spawnedMinions.remove(minion);
 		
 		final int time = respawnTime < 0 ? _master.isRaid() ? (int) Config.RAID_MINION_RESPAWN_TIMER : 0 : respawnTime;
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/util/MinionList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/util/MinionList.java
index 0360ecf5ae..bcfcc2d48b 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/util/MinionList.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/util/MinionList.java
@@ -141,7 +141,11 @@ public class MinionList
 	 */
 	public void onMinionDie(Monster minion, int respawnTime)
 	{
-		minion.setLeader(null); // prevent memory leaks
+		// Prevent memory leaks.
+		if (respawnTime == 0)
+		{
+			minion.setLeader(null);
+		}
 		_spawnedMinions.remove(minion);
 		
 		final int time = respawnTime < 0 ? _master.isRaid() ? (int) Config.RAID_MINION_RESPAWN_TIMER : 0 : respawnTime;
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/util/MinionList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/util/MinionList.java
index 0360ecf5ae..bcfcc2d48b 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/util/MinionList.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/util/MinionList.java
@@ -141,7 +141,11 @@ public class MinionList
 	 */
 	public void onMinionDie(Monster minion, int respawnTime)
 	{
-		minion.setLeader(null); // prevent memory leaks
+		// Prevent memory leaks.
+		if (respawnTime == 0)
+		{
+			minion.setLeader(null);
+		}
 		_spawnedMinions.remove(minion);
 		
 		final int time = respawnTime < 0 ? _master.isRaid() ? (int) Config.RAID_MINION_RESPAWN_TIMER : 0 : respawnTime;
diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/util/MinionList.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/util/MinionList.java
index 0360ecf5ae..bcfcc2d48b 100644
--- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/util/MinionList.java
+++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/util/MinionList.java
@@ -141,7 +141,11 @@ public class MinionList
 	 */
 	public void onMinionDie(Monster minion, int respawnTime)
 	{
-		minion.setLeader(null); // prevent memory leaks
+		// Prevent memory leaks.
+		if (respawnTime == 0)
+		{
+			minion.setLeader(null);
+		}
 		_spawnedMinions.remove(minion);
 		
 		final int time = respawnTime < 0 ? _master.isRaid() ? (int) Config.RAID_MINION_RESPAWN_TIMER : 0 : respawnTime;
diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/util/MinionList.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/util/MinionList.java
index 0360ecf5ae..bcfcc2d48b 100644
--- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/util/MinionList.java
+++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/util/MinionList.java
@@ -141,7 +141,11 @@ public class MinionList
 	 */
 	public void onMinionDie(Monster minion, int respawnTime)
 	{
-		minion.setLeader(null); // prevent memory leaks
+		// Prevent memory leaks.
+		if (respawnTime == 0)
+		{
+			minion.setLeader(null);
+		}
 		_spawnedMinions.remove(minion);
 		
 		final int time = respawnTime < 0 ? _master.isRaid() ? (int) Config.RAID_MINION_RESPAWN_TIMER : 0 : respawnTime;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/MinionList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/MinionList.java
index f19cfb850c..7ba16aee1a 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/MinionList.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/MinionList.java
@@ -141,7 +141,11 @@ public class MinionList
 	 */
 	public void onMinionDie(Monster minion, int respawnTime)
 	{
-		minion.setLeader(null); // prevent memory leaks
+		// Prevent memory leaks.
+		if (respawnTime == 0)
+		{
+			minion.setLeader(null);
+		}
 		_spawnedMinions.remove(minion);
 		
 		final int time = respawnTime < 0 ? _master.isRaid() ? (int) Config.RAID_MINION_RESPAWN_TIMER : 0 : respawnTime;
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/MinionList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/MinionList.java
index d309d088d4..d38c39d7a3 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/MinionList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/MinionList.java
@@ -141,7 +141,11 @@ public class MinionList
 	 */
 	public void onMinionDie(Monster minion, int respawnTime)
 	{
-		minion.setLeader(null); // prevent memory leaks
+		// Prevent memory leaks.
+		if (respawnTime == 0)
+		{
+			minion.setLeader(null);
+		}
 		_spawnedMinions.remove(minion);
 		
 		final int time = respawnTime < 0 ? _master.isRaid() ? (int) Config.RAID_MINION_RESPAWN_TIMER : 0 : respawnTime;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/MinionList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/MinionList.java
index 0360ecf5ae..bcfcc2d48b 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/MinionList.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/MinionList.java
@@ -141,7 +141,11 @@ public class MinionList
 	 */
 	public void onMinionDie(Monster minion, int respawnTime)
 	{
-		minion.setLeader(null); // prevent memory leaks
+		// Prevent memory leaks.
+		if (respawnTime == 0)
+		{
+			minion.setLeader(null);
+		}
 		_spawnedMinions.remove(minion);
 		
 		final int time = respawnTime < 0 ? _master.isRaid() ? (int) Config.RAID_MINION_RESPAWN_TIMER : 0 : respawnTime;
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/MinionList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/MinionList.java
index 0360ecf5ae..bcfcc2d48b 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/MinionList.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/MinionList.java
@@ -141,7 +141,11 @@ public class MinionList
 	 */
 	public void onMinionDie(Monster minion, int respawnTime)
 	{
-		minion.setLeader(null); // prevent memory leaks
+		// Prevent memory leaks.
+		if (respawnTime == 0)
+		{
+			minion.setLeader(null);
+		}
 		_spawnedMinions.remove(minion);
 		
 		final int time = respawnTime < 0 ? _master.isRaid() ? (int) Config.RAID_MINION_RESPAWN_TIMER : 0 : respawnTime;
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/MinionList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/MinionList.java
index 0360ecf5ae..bcfcc2d48b 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/MinionList.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/MinionList.java
@@ -141,7 +141,11 @@ public class MinionList
 	 */
 	public void onMinionDie(Monster minion, int respawnTime)
 	{
-		minion.setLeader(null); // prevent memory leaks
+		// Prevent memory leaks.
+		if (respawnTime == 0)
+		{
+			minion.setLeader(null);
+		}
 		_spawnedMinions.remove(minion);
 		
 		final int time = respawnTime < 0 ? _master.isRaid() ? (int) Config.RAID_MINION_RESPAWN_TIMER : 0 : respawnTime;
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/MinionList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/MinionList.java
index 0360ecf5ae..bcfcc2d48b 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/MinionList.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/MinionList.java
@@ -141,7 +141,11 @@ public class MinionList
 	 */
 	public void onMinionDie(Monster minion, int respawnTime)
 	{
-		minion.setLeader(null); // prevent memory leaks
+		// Prevent memory leaks.
+		if (respawnTime == 0)
+		{
+			minion.setLeader(null);
+		}
 		_spawnedMinions.remove(minion);
 		
 		final int time = respawnTime < 0 ? _master.isRaid() ? (int) Config.RAID_MINION_RESPAWN_TIMER : 0 : respawnTime;
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/MinionList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/MinionList.java
index 0360ecf5ae..bcfcc2d48b 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/MinionList.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/MinionList.java
@@ -141,7 +141,11 @@ public class MinionList
 	 */
 	public void onMinionDie(Monster minion, int respawnTime)
 	{
-		minion.setLeader(null); // prevent memory leaks
+		// Prevent memory leaks.
+		if (respawnTime == 0)
+		{
+			minion.setLeader(null);
+		}
 		_spawnedMinions.remove(minion);
 		
 		final int time = respawnTime < 0 ? _master.isRaid() ? (int) Config.RAID_MINION_RESPAWN_TIMER : 0 : respawnTime;
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/MinionList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/MinionList.java
index 0360ecf5ae..bcfcc2d48b 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/MinionList.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/MinionList.java
@@ -141,7 +141,11 @@ public class MinionList
 	 */
 	public void onMinionDie(Monster minion, int respawnTime)
 	{
-		minion.setLeader(null); // prevent memory leaks
+		// Prevent memory leaks.
+		if (respawnTime == 0)
+		{
+			minion.setLeader(null);
+		}
 		_spawnedMinions.remove(minion);
 		
 		final int time = respawnTime < 0 ? _master.isRaid() ? (int) Config.RAID_MINION_RESPAWN_TIMER : 0 : respawnTime;
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/MinionList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/MinionList.java
index 0360ecf5ae..bcfcc2d48b 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/MinionList.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/MinionList.java
@@ -141,7 +141,11 @@ public class MinionList
 	 */
 	public void onMinionDie(Monster minion, int respawnTime)
 	{
-		minion.setLeader(null); // prevent memory leaks
+		// Prevent memory leaks.
+		if (respawnTime == 0)
+		{
+			minion.setLeader(null);
+		}
 		_spawnedMinions.remove(minion);
 		
 		final int time = respawnTime < 0 ? _master.isRaid() ? (int) Config.RAID_MINION_RESPAWN_TIMER : 0 : respawnTime;
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/util/MinionList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/util/MinionList.java
index 0360ecf5ae..bcfcc2d48b 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/util/MinionList.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/util/MinionList.java
@@ -141,7 +141,11 @@ public class MinionList
 	 */
 	public void onMinionDie(Monster minion, int respawnTime)
 	{
-		minion.setLeader(null); // prevent memory leaks
+		// Prevent memory leaks.
+		if (respawnTime == 0)
+		{
+			minion.setLeader(null);
+		}
 		_spawnedMinions.remove(minion);
 		
 		final int time = respawnTime < 0 ? _master.isRaid() ? (int) Config.RAID_MINION_RESPAWN_TIMER : 0 : respawnTime;
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/util/MinionList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/util/MinionList.java
index 0360ecf5ae..bcfcc2d48b 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/util/MinionList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/util/MinionList.java
@@ -141,7 +141,11 @@ public class MinionList
 	 */
 	public void onMinionDie(Monster minion, int respawnTime)
 	{
-		minion.setLeader(null); // prevent memory leaks
+		// Prevent memory leaks.
+		if (respawnTime == 0)
+		{
+			minion.setLeader(null);
+		}
 		_spawnedMinions.remove(minion);
 		
 		final int time = respawnTime < 0 ? _master.isRaid() ? (int) Config.RAID_MINION_RESPAWN_TIMER : 0 : respawnTime;
diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/util/MinionList.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/util/MinionList.java
index 0360ecf5ae..bcfcc2d48b 100644
--- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/util/MinionList.java
+++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/util/MinionList.java
@@ -141,7 +141,11 @@ public class MinionList
 	 */
 	public void onMinionDie(Monster minion, int respawnTime)
 	{
-		minion.setLeader(null); // prevent memory leaks
+		// Prevent memory leaks.
+		if (respawnTime == 0)
+		{
+			minion.setLeader(null);
+		}
 		_spawnedMinions.remove(minion);
 		
 		final int time = respawnTime < 0 ? _master.isRaid() ? (int) Config.RAID_MINION_RESPAWN_TIMER : 0 : respawnTime;
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/util/MinionList.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/util/MinionList.java
index 0360ecf5ae..bcfcc2d48b 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/util/MinionList.java
+++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/util/MinionList.java
@@ -141,7 +141,11 @@ public class MinionList
 	 */
 	public void onMinionDie(Monster minion, int respawnTime)
 	{
-		minion.setLeader(null); // prevent memory leaks
+		// Prevent memory leaks.
+		if (respawnTime == 0)
+		{
+			minion.setLeader(null);
+		}
 		_spawnedMinions.remove(minion);
 		
 		final int time = respawnTime < 0 ? _master.isRaid() ? (int) Config.RAID_MINION_RESPAWN_TIMER : 0 : respawnTime;