From 1a6536260a7faeb7cc99f1fde2bf1947bf4b91ad Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sun, 17 Oct 2021 21:25:48 +0000
Subject: [PATCH] Fixed fort manager not respawning. Contributed by Sero.

---
 .../java/org/l2jmobius/gameserver/model/siege/Fort.java          | 1 +
 .../java/org/l2jmobius/gameserver/model/siege/Fort.java          | 1 +
 .../java/org/l2jmobius/gameserver/model/siege/Fort.java          | 1 +
 .../java/org/l2jmobius/gameserver/model/siege/Fort.java          | 1 +
 .../java/org/l2jmobius/gameserver/model/siege/Fort.java          | 1 +
 .../java/org/l2jmobius/gameserver/model/siege/Fort.java          | 1 +
 .../java/org/l2jmobius/gameserver/model/siege/Fort.java          | 1 +
 .../java/org/l2jmobius/gameserver/model/siege/Fort.java          | 1 +
 .../java/org/l2jmobius/gameserver/model/siege/Fort.java          | 1 +
 .../java/org/l2jmobius/gameserver/model/siege/Fort.java          | 1 +
 .../java/org/l2jmobius/gameserver/model/siege/Fort.java          | 1 +
 .../java/org/l2jmobius/gameserver/model/siege/Fort.java          | 1 +
 .../java/org/l2jmobius/gameserver/model/siege/Fort.java          | 1 +
 .../java/org/l2jmobius/gameserver/model/siege/Fort.java          | 1 +
 .../java/org/l2jmobius/gameserver/model/siege/Fort.java          | 1 +
 .../java/org/l2jmobius/gameserver/model/siege/Fort.java          | 1 +
 .../java/org/l2jmobius/gameserver/model/siege/Fort.java          | 1 +
 .../java/org/l2jmobius/gameserver/model/siege/Fort.java          | 1 +
 .../java/org/l2jmobius/gameserver/model/siege/Fort.java          | 1 +
 .../java/org/l2jmobius/gameserver/model/siege/Fort.java          | 1 +
 .../java/org/l2jmobius/gameserver/model/siege/Fort.java          | 1 +
 21 files changed, 21 insertions(+)

diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/siege/Fort.java
index 6ecb479a1e..31b794b81f 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/siege/Fort.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/siege/Fort.java
@@ -1081,6 +1081,7 @@ public class Fort extends AbstractResidence
 			return;
 		}
 		_isSuspiciousMerchantSpawned = true;
+		initSiegeNpcs();
 		for (Spawn spawnDat : _siegeNpcs)
 		{
 			spawnDat.doSpawn();
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/siege/Fort.java
index 6ecb479a1e..31b794b81f 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/siege/Fort.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/siege/Fort.java
@@ -1081,6 +1081,7 @@ public class Fort extends AbstractResidence
 			return;
 		}
 		_isSuspiciousMerchantSpawned = true;
+		initSiegeNpcs();
 		for (Spawn spawnDat : _siegeNpcs)
 		{
 			spawnDat.doSpawn();
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/siege/Fort.java
index 6ecb479a1e..31b794b81f 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/siege/Fort.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/siege/Fort.java
@@ -1081,6 +1081,7 @@ public class Fort extends AbstractResidence
 			return;
 		}
 		_isSuspiciousMerchantSpawned = true;
+		initSiegeNpcs();
 		for (Spawn spawnDat : _siegeNpcs)
 		{
 			spawnDat.doSpawn();
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/siege/Fort.java
index 6ecb479a1e..31b794b81f 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/siege/Fort.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/siege/Fort.java
@@ -1081,6 +1081,7 @@ public class Fort extends AbstractResidence
 			return;
 		}
 		_isSuspiciousMerchantSpawned = true;
+		initSiegeNpcs();
 		for (Spawn spawnDat : _siegeNpcs)
 		{
 			spawnDat.doSpawn();
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/siege/Fort.java
index 6ecb479a1e..31b794b81f 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/siege/Fort.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/siege/Fort.java
@@ -1081,6 +1081,7 @@ public class Fort extends AbstractResidence
 			return;
 		}
 		_isSuspiciousMerchantSpawned = true;
+		initSiegeNpcs();
 		for (Spawn spawnDat : _siegeNpcs)
 		{
 			spawnDat.doSpawn();
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/siege/Fort.java
index 6ecb479a1e..31b794b81f 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/siege/Fort.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/siege/Fort.java
@@ -1081,6 +1081,7 @@ public class Fort extends AbstractResidence
 			return;
 		}
 		_isSuspiciousMerchantSpawned = true;
+		initSiegeNpcs();
 		for (Spawn spawnDat : _siegeNpcs)
 		{
 			spawnDat.doSpawn();
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/siege/Fort.java
index 6ecb479a1e..31b794b81f 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/siege/Fort.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/siege/Fort.java
@@ -1081,6 +1081,7 @@ public class Fort extends AbstractResidence
 			return;
 		}
 		_isSuspiciousMerchantSpawned = true;
+		initSiegeNpcs();
 		for (Spawn spawnDat : _siegeNpcs)
 		{
 			spawnDat.doSpawn();
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/siege/Fort.java
index 6ecb479a1e..31b794b81f 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/siege/Fort.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/siege/Fort.java
@@ -1081,6 +1081,7 @@ public class Fort extends AbstractResidence
 			return;
 		}
 		_isSuspiciousMerchantSpawned = true;
+		initSiegeNpcs();
 		for (Spawn spawnDat : _siegeNpcs)
 		{
 			spawnDat.doSpawn();
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/siege/Fort.java
index 6ecb479a1e..31b794b81f 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/siege/Fort.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/siege/Fort.java
@@ -1081,6 +1081,7 @@ public class Fort extends AbstractResidence
 			return;
 		}
 		_isSuspiciousMerchantSpawned = true;
+		initSiegeNpcs();
 		for (Spawn spawnDat : _siegeNpcs)
 		{
 			spawnDat.doSpawn();
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/siege/Fort.java
index 6ecb479a1e..31b794b81f 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/siege/Fort.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/siege/Fort.java
@@ -1081,6 +1081,7 @@ public class Fort extends AbstractResidence
 			return;
 		}
 		_isSuspiciousMerchantSpawned = true;
+		initSiegeNpcs();
 		for (Spawn spawnDat : _siegeNpcs)
 		{
 			spawnDat.doSpawn();
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/siege/Fort.java
index d01c3dac3a..9a72cee7ff 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/siege/Fort.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/siege/Fort.java
@@ -1074,6 +1074,7 @@ public class Fort extends AbstractResidence
 			return;
 		}
 		_isSuspiciousMerchantSpawned = true;
+		initSiegeNpcs();
 		for (Spawn spawnDat : _siegeNpcs)
 		{
 			spawnDat.doSpawn();
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/siege/Fort.java
index d01c3dac3a..9a72cee7ff 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/siege/Fort.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/siege/Fort.java
@@ -1074,6 +1074,7 @@ public class Fort extends AbstractResidence
 			return;
 		}
 		_isSuspiciousMerchantSpawned = true;
+		initSiegeNpcs();
 		for (Spawn spawnDat : _siegeNpcs)
 		{
 			spawnDat.doSpawn();
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/siege/Fort.java
index 6ecb479a1e..31b794b81f 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/siege/Fort.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/siege/Fort.java
@@ -1081,6 +1081,7 @@ public class Fort extends AbstractResidence
 			return;
 		}
 		_isSuspiciousMerchantSpawned = true;
+		initSiegeNpcs();
 		for (Spawn spawnDat : _siegeNpcs)
 		{
 			spawnDat.doSpawn();
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/siege/Fort.java
index 6ecb479a1e..31b794b81f 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/siege/Fort.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/siege/Fort.java
@@ -1081,6 +1081,7 @@ public class Fort extends AbstractResidence
 			return;
 		}
 		_isSuspiciousMerchantSpawned = true;
+		initSiegeNpcs();
 		for (Spawn spawnDat : _siegeNpcs)
 		{
 			spawnDat.doSpawn();
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/siege/Fort.java
index 6ecb479a1e..31b794b81f 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/siege/Fort.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/siege/Fort.java
@@ -1081,6 +1081,7 @@ public class Fort extends AbstractResidence
 			return;
 		}
 		_isSuspiciousMerchantSpawned = true;
+		initSiegeNpcs();
 		for (Spawn spawnDat : _siegeNpcs)
 		{
 			spawnDat.doSpawn();
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/siege/Fort.java
index 6ecb479a1e..31b794b81f 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/siege/Fort.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/siege/Fort.java
@@ -1081,6 +1081,7 @@ public class Fort extends AbstractResidence
 			return;
 		}
 		_isSuspiciousMerchantSpawned = true;
+		initSiegeNpcs();
 		for (Spawn spawnDat : _siegeNpcs)
 		{
 			spawnDat.doSpawn();
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/siege/Fort.java
index 6ecb479a1e..31b794b81f 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/siege/Fort.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/siege/Fort.java
@@ -1081,6 +1081,7 @@ public class Fort extends AbstractResidence
 			return;
 		}
 		_isSuspiciousMerchantSpawned = true;
+		initSiegeNpcs();
 		for (Spawn spawnDat : _siegeNpcs)
 		{
 			spawnDat.doSpawn();
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/siege/Fort.java
index 6ecb479a1e..31b794b81f 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/siege/Fort.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/siege/Fort.java
@@ -1081,6 +1081,7 @@ public class Fort extends AbstractResidence
 			return;
 		}
 		_isSuspiciousMerchantSpawned = true;
+		initSiegeNpcs();
 		for (Spawn spawnDat : _siegeNpcs)
 		{
 			spawnDat.doSpawn();
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/siege/Fort.java
index 6ecb479a1e..31b794b81f 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/siege/Fort.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/siege/Fort.java
@@ -1081,6 +1081,7 @@ public class Fort extends AbstractResidence
 			return;
 		}
 		_isSuspiciousMerchantSpawned = true;
+		initSiegeNpcs();
 		for (Spawn spawnDat : _siegeNpcs)
 		{
 			spawnDat.doSpawn();
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/siege/Fort.java
index 6ecb479a1e..31b794b81f 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/siege/Fort.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/siege/Fort.java
@@ -1081,6 +1081,7 @@ public class Fort extends AbstractResidence
 			return;
 		}
 		_isSuspiciousMerchantSpawned = true;
+		initSiegeNpcs();
 		for (Spawn spawnDat : _siegeNpcs)
 		{
 			spawnDat.doSpawn();
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/siege/Fort.java
index 6ecb479a1e..31b794b81f 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/siege/Fort.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/siege/Fort.java
@@ -1081,6 +1081,7 @@ public class Fort extends AbstractResidence
 			return;
 		}
 		_isSuspiciousMerchantSpawned = true;
+		initSiegeNpcs();
 		for (Spawn spawnDat : _siegeNpcs)
 		{
 			spawnDat.doSpawn();