diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java
index f08215e11d..c6ab044e5a 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java
@@ -40,19 +40,20 @@ public class RespawnTaskManager
 			for (Entry<Spawn, List<Long>> entry : PENDING_RESPAWNS.entrySet())
 			{
 				final Spawn spawn = entry.getKey();
-				for (Long respawnTime : entry.getValue())
+				final List<Long> schedules = entry.getValue();
+				for (Long respawnTime : schedules)
 				{
 					if (time > respawnTime)
 					{
-						entry.getValue().remove(respawnTime);
+						schedules.remove(respawnTime);
+						if (schedules.isEmpty())
+						{
+							PENDING_RESPAWNS.remove(spawn);
+						}
 						spawn.doSpawn();
 						spawn._scheduledCount--;
 					}
 				}
-				if (entry.getValue().isEmpty())
-				{
-					PENDING_RESPAWNS.remove(spawn);
-				}
 			}
 		}, 0, 1000);
 	}
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java
index f08215e11d..c6ab044e5a 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java
@@ -40,19 +40,20 @@ public class RespawnTaskManager
 			for (Entry<Spawn, List<Long>> entry : PENDING_RESPAWNS.entrySet())
 			{
 				final Spawn spawn = entry.getKey();
-				for (Long respawnTime : entry.getValue())
+				final List<Long> schedules = entry.getValue();
+				for (Long respawnTime : schedules)
 				{
 					if (time > respawnTime)
 					{
-						entry.getValue().remove(respawnTime);
+						schedules.remove(respawnTime);
+						if (schedules.isEmpty())
+						{
+							PENDING_RESPAWNS.remove(spawn);
+						}
 						spawn.doSpawn();
 						spawn._scheduledCount--;
 					}
 				}
-				if (entry.getValue().isEmpty())
-				{
-					PENDING_RESPAWNS.remove(spawn);
-				}
 			}
 		}, 0, 1000);
 	}
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java
index f08215e11d..c6ab044e5a 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java
@@ -40,19 +40,20 @@ public class RespawnTaskManager
 			for (Entry<Spawn, List<Long>> entry : PENDING_RESPAWNS.entrySet())
 			{
 				final Spawn spawn = entry.getKey();
-				for (Long respawnTime : entry.getValue())
+				final List<Long> schedules = entry.getValue();
+				for (Long respawnTime : schedules)
 				{
 					if (time > respawnTime)
 					{
-						entry.getValue().remove(respawnTime);
+						schedules.remove(respawnTime);
+						if (schedules.isEmpty())
+						{
+							PENDING_RESPAWNS.remove(spawn);
+						}
 						spawn.doSpawn();
 						spawn._scheduledCount--;
 					}
 				}
-				if (entry.getValue().isEmpty())
-				{
-					PENDING_RESPAWNS.remove(spawn);
-				}
 			}
 		}, 0, 1000);
 	}
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java
index f08215e11d..c6ab044e5a 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java
@@ -40,19 +40,20 @@ public class RespawnTaskManager
 			for (Entry<Spawn, List<Long>> entry : PENDING_RESPAWNS.entrySet())
 			{
 				final Spawn spawn = entry.getKey();
-				for (Long respawnTime : entry.getValue())
+				final List<Long> schedules = entry.getValue();
+				for (Long respawnTime : schedules)
 				{
 					if (time > respawnTime)
 					{
-						entry.getValue().remove(respawnTime);
+						schedules.remove(respawnTime);
+						if (schedules.isEmpty())
+						{
+							PENDING_RESPAWNS.remove(spawn);
+						}
 						spawn.doSpawn();
 						spawn._scheduledCount--;
 					}
 				}
-				if (entry.getValue().isEmpty())
-				{
-					PENDING_RESPAWNS.remove(spawn);
-				}
 			}
 		}, 0, 1000);
 	}
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java
index f08215e11d..c6ab044e5a 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java
@@ -40,19 +40,20 @@ public class RespawnTaskManager
 			for (Entry<Spawn, List<Long>> entry : PENDING_RESPAWNS.entrySet())
 			{
 				final Spawn spawn = entry.getKey();
-				for (Long respawnTime : entry.getValue())
+				final List<Long> schedules = entry.getValue();
+				for (Long respawnTime : schedules)
 				{
 					if (time > respawnTime)
 					{
-						entry.getValue().remove(respawnTime);
+						schedules.remove(respawnTime);
+						if (schedules.isEmpty())
+						{
+							PENDING_RESPAWNS.remove(spawn);
+						}
 						spawn.doSpawn();
 						spawn._scheduledCount--;
 					}
 				}
-				if (entry.getValue().isEmpty())
-				{
-					PENDING_RESPAWNS.remove(spawn);
-				}
 			}
 		}, 0, 1000);
 	}
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java
index f08215e11d..c6ab044e5a 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java
@@ -40,19 +40,20 @@ public class RespawnTaskManager
 			for (Entry<Spawn, List<Long>> entry : PENDING_RESPAWNS.entrySet())
 			{
 				final Spawn spawn = entry.getKey();
-				for (Long respawnTime : entry.getValue())
+				final List<Long> schedules = entry.getValue();
+				for (Long respawnTime : schedules)
 				{
 					if (time > respawnTime)
 					{
-						entry.getValue().remove(respawnTime);
+						schedules.remove(respawnTime);
+						if (schedules.isEmpty())
+						{
+							PENDING_RESPAWNS.remove(spawn);
+						}
 						spawn.doSpawn();
 						spawn._scheduledCount--;
 					}
 				}
-				if (entry.getValue().isEmpty())
-				{
-					PENDING_RESPAWNS.remove(spawn);
-				}
 			}
 		}, 0, 1000);
 	}
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java
index f08215e11d..c6ab044e5a 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java
@@ -40,19 +40,20 @@ public class RespawnTaskManager
 			for (Entry<Spawn, List<Long>> entry : PENDING_RESPAWNS.entrySet())
 			{
 				final Spawn spawn = entry.getKey();
-				for (Long respawnTime : entry.getValue())
+				final List<Long> schedules = entry.getValue();
+				for (Long respawnTime : schedules)
 				{
 					if (time > respawnTime)
 					{
-						entry.getValue().remove(respawnTime);
+						schedules.remove(respawnTime);
+						if (schedules.isEmpty())
+						{
+							PENDING_RESPAWNS.remove(spawn);
+						}
 						spawn.doSpawn();
 						spawn._scheduledCount--;
 					}
 				}
-				if (entry.getValue().isEmpty())
-				{
-					PENDING_RESPAWNS.remove(spawn);
-				}
 			}
 		}, 0, 1000);
 	}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java
index 40b1f36799..844d303fd2 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java
@@ -40,19 +40,20 @@ public class RespawnTaskManager
 			for (Entry<Spawn, List<Long>> entry : PENDING_RESPAWNS.entrySet())
 			{
 				final Spawn spawn = entry.getKey();
-				for (Long respawnTime : entry.getValue())
+				final List<Long> schedules = entry.getValue();
+				for (Long respawnTime : schedules)
 				{
 					if (time > respawnTime)
 					{
-						entry.getValue().remove(respawnTime);
+						schedules.remove(respawnTime);
+						if (schedules.isEmpty())
+						{
+							PENDING_RESPAWNS.remove(spawn);
+						}
 						spawn.doSpawn();
 						spawn._scheduledCount--;
 					}
 				}
-				if (entry.getValue().isEmpty())
-				{
-					PENDING_RESPAWNS.remove(spawn);
-				}
 			}
 		}, 0, 1000);
 	}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java
index f08215e11d..c6ab044e5a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java
@@ -40,19 +40,20 @@ public class RespawnTaskManager
 			for (Entry<Spawn, List<Long>> entry : PENDING_RESPAWNS.entrySet())
 			{
 				final Spawn spawn = entry.getKey();
-				for (Long respawnTime : entry.getValue())
+				final List<Long> schedules = entry.getValue();
+				for (Long respawnTime : schedules)
 				{
 					if (time > respawnTime)
 					{
-						entry.getValue().remove(respawnTime);
+						schedules.remove(respawnTime);
+						if (schedules.isEmpty())
+						{
+							PENDING_RESPAWNS.remove(spawn);
+						}
 						spawn.doSpawn();
 						spawn._scheduledCount--;
 					}
 				}
-				if (entry.getValue().isEmpty())
-				{
-					PENDING_RESPAWNS.remove(spawn);
-				}
 			}
 		}, 0, 1000);
 	}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java
index f08215e11d..c6ab044e5a 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java
@@ -40,19 +40,20 @@ public class RespawnTaskManager
 			for (Entry<Spawn, List<Long>> entry : PENDING_RESPAWNS.entrySet())
 			{
 				final Spawn spawn = entry.getKey();
-				for (Long respawnTime : entry.getValue())
+				final List<Long> schedules = entry.getValue();
+				for (Long respawnTime : schedules)
 				{
 					if (time > respawnTime)
 					{
-						entry.getValue().remove(respawnTime);
+						schedules.remove(respawnTime);
+						if (schedules.isEmpty())
+						{
+							PENDING_RESPAWNS.remove(spawn);
+						}
 						spawn.doSpawn();
 						spawn._scheduledCount--;
 					}
 				}
-				if (entry.getValue().isEmpty())
-				{
-					PENDING_RESPAWNS.remove(spawn);
-				}
 			}
 		}, 0, 1000);
 	}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java
index f08215e11d..c6ab044e5a 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java
@@ -40,19 +40,20 @@ public class RespawnTaskManager
 			for (Entry<Spawn, List<Long>> entry : PENDING_RESPAWNS.entrySet())
 			{
 				final Spawn spawn = entry.getKey();
-				for (Long respawnTime : entry.getValue())
+				final List<Long> schedules = entry.getValue();
+				for (Long respawnTime : schedules)
 				{
 					if (time > respawnTime)
 					{
-						entry.getValue().remove(respawnTime);
+						schedules.remove(respawnTime);
+						if (schedules.isEmpty())
+						{
+							PENDING_RESPAWNS.remove(spawn);
+						}
 						spawn.doSpawn();
 						spawn._scheduledCount--;
 					}
 				}
-				if (entry.getValue().isEmpty())
-				{
-					PENDING_RESPAWNS.remove(spawn);
-				}
 			}
 		}, 0, 1000);
 	}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java
index f08215e11d..c6ab044e5a 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java
@@ -40,19 +40,20 @@ public class RespawnTaskManager
 			for (Entry<Spawn, List<Long>> entry : PENDING_RESPAWNS.entrySet())
 			{
 				final Spawn spawn = entry.getKey();
-				for (Long respawnTime : entry.getValue())
+				final List<Long> schedules = entry.getValue();
+				for (Long respawnTime : schedules)
 				{
 					if (time > respawnTime)
 					{
-						entry.getValue().remove(respawnTime);
+						schedules.remove(respawnTime);
+						if (schedules.isEmpty())
+						{
+							PENDING_RESPAWNS.remove(spawn);
+						}
 						spawn.doSpawn();
 						spawn._scheduledCount--;
 					}
 				}
-				if (entry.getValue().isEmpty())
-				{
-					PENDING_RESPAWNS.remove(spawn);
-				}
 			}
 		}, 0, 1000);
 	}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java
index f08215e11d..c6ab044e5a 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java
@@ -40,19 +40,20 @@ public class RespawnTaskManager
 			for (Entry<Spawn, List<Long>> entry : PENDING_RESPAWNS.entrySet())
 			{
 				final Spawn spawn = entry.getKey();
-				for (Long respawnTime : entry.getValue())
+				final List<Long> schedules = entry.getValue();
+				for (Long respawnTime : schedules)
 				{
 					if (time > respawnTime)
 					{
-						entry.getValue().remove(respawnTime);
+						schedules.remove(respawnTime);
+						if (schedules.isEmpty())
+						{
+							PENDING_RESPAWNS.remove(spawn);
+						}
 						spawn.doSpawn();
 						spawn._scheduledCount--;
 					}
 				}
-				if (entry.getValue().isEmpty())
-				{
-					PENDING_RESPAWNS.remove(spawn);
-				}
 			}
 		}, 0, 1000);
 	}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java
index f08215e11d..c6ab044e5a 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java
@@ -40,19 +40,20 @@ public class RespawnTaskManager
 			for (Entry<Spawn, List<Long>> entry : PENDING_RESPAWNS.entrySet())
 			{
 				final Spawn spawn = entry.getKey();
-				for (Long respawnTime : entry.getValue())
+				final List<Long> schedules = entry.getValue();
+				for (Long respawnTime : schedules)
 				{
 					if (time > respawnTime)
 					{
-						entry.getValue().remove(respawnTime);
+						schedules.remove(respawnTime);
+						if (schedules.isEmpty())
+						{
+							PENDING_RESPAWNS.remove(spawn);
+						}
 						spawn.doSpawn();
 						spawn._scheduledCount--;
 					}
 				}
-				if (entry.getValue().isEmpty())
-				{
-					PENDING_RESPAWNS.remove(spawn);
-				}
 			}
 		}, 0, 1000);
 	}