From d8ad639e3514cfc25d71750cf1898ea780d45394 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Thu, 12 Aug 2021 22:14:47 +0000
Subject: [PATCH] Unsummon pets on server shutdown.

---
 .../java/org/l2jmobius/gameserver/Shutdown.java             | 6 ++++++
 .../java/org/l2jmobius/gameserver/Shutdown.java             | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/Shutdown.java
index 91016226e0..c048ff319a 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/Shutdown.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/Shutdown.java
@@ -509,6 +509,12 @@ public class Shutdown extends Thread
 			// Logout Character
 			try
 			{
+				// Unsummon pets
+				if (player.getPet() != null)
+				{
+					player.getPet().unSummon(player);
+				}
+				
 				// Save player status
 				player.store();
 			}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/Shutdown.java
index b06fa42f84..1b53c6628c 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/Shutdown.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/Shutdown.java
@@ -518,6 +518,12 @@ public class Shutdown extends Thread
 			// Logout Character
 			try
 			{
+				// Unsummon pets
+				if (player.getPet() != null)
+				{
+					player.getPet().unSummon(player);
+				}
+				
 				// Save player status
 				player.store();
 			}