Removed some unnecessary synchronizations from quest timers.

L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/quest/Quest.java

@@ -315,6 +315,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 				return timer;
 			}
 		}
+		
 		return null;
 	}
 	
@@ -329,8 +330,6 @@ public class Quest extends AbstractScript implements IIdentifiable
 			return;
 		}
 		
-		synchronized (_questTimers)
-		{
 		final List<QuestTimer> timers = _questTimers.get(name);
 		if ((timers == null) || timers.isEmpty())
 		{
@@ -344,9 +343,9 @@ public class Quest extends AbstractScript implements IIdentifiable
 				timer.cancel();
 			}
 		}
+		
 		timers.clear();
 	}
-	}
 	
 	/**
 	 * Cancel the quest timer that matches the specified name and parameters.
@@ -361,8 +360,6 @@ public class Quest extends AbstractScript implements IIdentifiable
 			return;
 		}
 		
-		synchronized (_questTimers)
-		{
 		final List<QuestTimer> timers = _questTimers.get(name);
 		if ((timers == null) || timers.isEmpty())
 		{
@@ -374,12 +371,10 @@ public class Quest extends AbstractScript implements IIdentifiable
 			if ((timer != null) && timer.equals(this, name, npc, player))
 			{
 				timer.cancel();
-					timers.remove(timer);
 				return;
 			}
 		}
 	}
-	}
 	
 	/**
 	 * Remove a quest timer from the list of all timers.<br>
@@ -393,15 +388,12 @@ public class Quest extends AbstractScript implements IIdentifiable
 			return;
 		}
 		
-		synchronized (_questTimers)
-		{
 		final List<QuestTimer> timers = _questTimers.get(timer.toString());
 		if (timers != null)
 		{
 			timers.remove(timer);
 		}
 	}
-	}
 	
 	// These are methods to call within the core to call the quest events.
 	
@@ -2813,21 +2805,20 @@ public class Quest extends AbstractScript implements IIdentifiable
 	public boolean unload(boolean removeFromList)
 	{
 		onSave();
-		// cancel all pending timers before reloading.
+		
-		// if timers ought to be restarted, the quest can take care of it
+		// Cancel all pending timers before reloading.
-		// with its code (example: save global data indicating what timer must be restarted).
+		// If timers ought to be restarted, the quest can take care of it with its code (example: save global data indicating what timer must be restarted).
-		synchronized (_questTimers)
-		{
 		for (List<QuestTimer> timers : _questTimers.values())
 		{
 			for (QuestTimer timer : timers)
 			{
 				timer.cancel();
 			}
+			
 			timers.clear();
 		}
+		
 		_questTimers.clear();
-		}
 		
 		if (removeFromList)
 		{

L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/quest/Quest.java

@@ -317,6 +317,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 				return timer;
 			}
 		}
+		
 		return null;
 	}
 	
@@ -331,8 +332,6 @@ public class Quest extends AbstractScript implements IIdentifiable
 			return;
 		}
 		
-		synchronized (_questTimers)
-		{
 		final List<QuestTimer> timers = _questTimers.get(name);
 		if ((timers == null) || timers.isEmpty())
 		{
@@ -346,9 +345,9 @@ public class Quest extends AbstractScript implements IIdentifiable
 				timer.cancel();
 			}
 		}
+		
 		timers.clear();
 	}
-	}
 	
 	/**
 	 * Cancel the quest timer that matches the specified name and parameters.
@@ -363,8 +362,6 @@ public class Quest extends AbstractScript implements IIdentifiable
 			return;
 		}
 		
-		synchronized (_questTimers)
-		{
 		final List<QuestTimer> timers = _questTimers.get(name);
 		if ((timers == null) || timers.isEmpty())
 		{
@@ -376,12 +373,10 @@ public class Quest extends AbstractScript implements IIdentifiable
 			if ((timer != null) && timer.equals(this, name, npc, player))
 			{
 				timer.cancel();
-					timers.remove(timer);
 				return;
 			}
 		}
 	}
-	}
 	
 	/**
 	 * Remove a quest timer from the list of all timers.<br>
@@ -395,15 +390,12 @@ public class Quest extends AbstractScript implements IIdentifiable
 			return;
 		}
 		
-		synchronized (_questTimers)
-		{
 		final List<QuestTimer> timers = _questTimers.get(timer.toString());
 		if (timers != null)
 		{
 			timers.remove(timer);
 		}
 	}
-	}
 	
 	// These are methods to call within the core to call the quest events.
 	
@@ -2815,21 +2807,20 @@ public class Quest extends AbstractScript implements IIdentifiable
 	public boolean unload(boolean removeFromList)
 	{
 		onSave();
-		// cancel all pending timers before reloading.
+		
-		// if timers ought to be restarted, the quest can take care of it
+		// Cancel all pending timers before reloading.
-		// with its code (example: save global data indicating what timer must be restarted).
+		// If timers ought to be restarted, the quest can take care of it with its code (example: save global data indicating what timer must be restarted).
-		synchronized (_questTimers)
-		{
 		for (List<QuestTimer> timers : _questTimers.values())
 		{
 			for (QuestTimer timer : timers)
 			{
 				timer.cancel();
 			}
+			
 			timers.clear();
 		}
+		
 		_questTimers.clear();
-		}
 		
 		if (removeFromList)
 		{

L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/quest/Quest.java

@@ -318,6 +318,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 				return timer;
 			}
 		}
+		
 		return null;
 	}
 	
@@ -332,8 +333,6 @@ public class Quest extends AbstractScript implements IIdentifiable
 			return;
 		}
 		
-		synchronized (_questTimers)
-		{
 		final List<QuestTimer> timers = _questTimers.get(name);
 		if ((timers == null) || timers.isEmpty())
 		{
@@ -347,9 +346,9 @@ public class Quest extends AbstractScript implements IIdentifiable
 				timer.cancel();
 			}
 		}
+		
 		timers.clear();
 	}
-	}
 	
 	/**
 	 * Cancel the quest timer that matches the specified name and parameters.
@@ -364,8 +363,6 @@ public class Quest extends AbstractScript implements IIdentifiable
 			return;
 		}
 		
-		synchronized (_questTimers)
-		{
 		final List<QuestTimer> timers = _questTimers.get(name);
 		if ((timers == null) || timers.isEmpty())
 		{
@@ -377,12 +374,10 @@ public class Quest extends AbstractScript implements IIdentifiable
 			if ((timer != null) && timer.equals(this, name, npc, player))
 			{
 				timer.cancel();
-					timers.remove(timer);
 				return;
 			}
 		}
 	}
-	}
 	
 	/**
 	 * Remove a quest timer from the list of all timers.<br>
@@ -396,15 +391,12 @@ public class Quest extends AbstractScript implements IIdentifiable
 			return;
 		}
 		
-		synchronized (_questTimers)
-		{
 		final List<QuestTimer> timers = _questTimers.get(timer.toString());
 		if (timers != null)
 		{
 			timers.remove(timer);
 		}
 	}
-	}
 	
 	// These are methods to call within the core to call the quest events.
 	
@@ -2816,21 +2808,20 @@ public class Quest extends AbstractScript implements IIdentifiable
 	public boolean unload(boolean removeFromList)
 	{
 		onSave();
-		// cancel all pending timers before reloading.
+		
-		// if timers ought to be restarted, the quest can take care of it
+		// Cancel all pending timers before reloading.
-		// with its code (example: save global data indicating what timer must be restarted).
+		// If timers ought to be restarted, the quest can take care of it with its code (example: save global data indicating what timer must be restarted).
-		synchronized (_questTimers)
-		{
 		for (List<QuestTimer> timers : _questTimers.values())
 		{
 			for (QuestTimer timer : timers)
 			{
 				timer.cancel();
 			}
+			
 			timers.clear();
 		}
+		
 		_questTimers.clear();
-		}
 		
 		if (removeFromList)
 		{

L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/quest/Quest.java

@@ -318,6 +318,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 				return timer;
 			}
 		}
+		
 		return null;
 	}
 	
@@ -332,8 +333,6 @@ public class Quest extends AbstractScript implements IIdentifiable
 			return;
 		}
 		
-		synchronized (_questTimers)
-		{
 		final List<QuestTimer> timers = _questTimers.get(name);
 		if ((timers == null) || timers.isEmpty())
 		{
@@ -347,9 +346,9 @@ public class Quest extends AbstractScript implements IIdentifiable
 				timer.cancel();
 			}
 		}
+		
 		timers.clear();
 	}
-	}
 	
 	/**
 	 * Cancel the quest timer that matches the specified name and parameters.
@@ -364,8 +363,6 @@ public class Quest extends AbstractScript implements IIdentifiable
 			return;
 		}
 		
-		synchronized (_questTimers)
-		{
 		final List<QuestTimer> timers = _questTimers.get(name);
 		if ((timers == null) || timers.isEmpty())
 		{
@@ -377,12 +374,10 @@ public class Quest extends AbstractScript implements IIdentifiable
 			if ((timer != null) && timer.equals(this, name, npc, player))
 			{
 				timer.cancel();
-					timers.remove(timer);
 				return;
 			}
 		}
 	}
-	}
 	
 	/**
 	 * Remove a quest timer from the list of all timers.<br>
@@ -396,15 +391,12 @@ public class Quest extends AbstractScript implements IIdentifiable
 			return;
 		}
 		
-		synchronized (_questTimers)
-		{
 		final List<QuestTimer> timers = _questTimers.get(timer.toString());
 		if (timers != null)
 		{
 			timers.remove(timer);
 		}
 	}
-	}
 	
 	// These are methods to call within the core to call the quest events.
 	
@@ -2816,21 +2808,20 @@ public class Quest extends AbstractScript implements IIdentifiable
 	public boolean unload(boolean removeFromList)
 	{
 		onSave();
-		// cancel all pending timers before reloading.
+		
-		// if timers ought to be restarted, the quest can take care of it
+		// Cancel all pending timers before reloading.
-		// with its code (example: save global data indicating what timer must be restarted).
+		// If timers ought to be restarted, the quest can take care of it with its code (example: save global data indicating what timer must be restarted).
-		synchronized (_questTimers)
-		{
 		for (List<QuestTimer> timers : _questTimers.values())
 		{
 			for (QuestTimer timer : timers)
 			{
 				timer.cancel();
 			}
+			
 			timers.clear();
 		}
+		
 		_questTimers.clear();
-		}
 		
 		if (removeFromList)
 		{

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/quest/Quest.java

@@ -318,6 +318,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 				return timer;
 			}
 		}
+		
 		return null;
 	}
 	
@@ -332,8 +333,6 @@ public class Quest extends AbstractScript implements IIdentifiable
 			return;
 		}
 		
-		synchronized (_questTimers)
-		{
 		final List<QuestTimer> timers = _questTimers.get(name);
 		if ((timers == null) || timers.isEmpty())
 		{
@@ -347,9 +346,9 @@ public class Quest extends AbstractScript implements IIdentifiable
 				timer.cancel();
 			}
 		}
+		
 		timers.clear();
 	}
-	}
 	
 	/**
 	 * Cancel the quest timer that matches the specified name and parameters.
@@ -364,8 +363,6 @@ public class Quest extends AbstractScript implements IIdentifiable
 			return;
 		}
 		
-		synchronized (_questTimers)
-		{
 		final List<QuestTimer> timers = _questTimers.get(name);
 		if ((timers == null) || timers.isEmpty())
 		{
@@ -377,12 +374,10 @@ public class Quest extends AbstractScript implements IIdentifiable
 			if ((timer != null) && timer.equals(this, name, npc, player))
 			{
 				timer.cancel();
-					timers.remove(timer);
 				return;
 			}
 		}
 	}
-	}
 	
 	/**
 	 * Remove a quest timer from the list of all timers.<br>
@@ -396,15 +391,12 @@ public class Quest extends AbstractScript implements IIdentifiable
 			return;
 		}
 		
-		synchronized (_questTimers)
-		{
 		final List<QuestTimer> timers = _questTimers.get(timer.toString());
 		if (timers != null)
 		{
 			timers.remove(timer);
 		}
 	}
-	}
 	
 	// These are methods to call within the core to call the quest events.
 	
@@ -2816,21 +2808,20 @@ public class Quest extends AbstractScript implements IIdentifiable
 	public boolean unload(boolean removeFromList)
 	{
 		onSave();
-		// cancel all pending timers before reloading.
+		
-		// if timers ought to be restarted, the quest can take care of it
+		// Cancel all pending timers before reloading.
-		// with its code (example: save global data indicating what timer must be restarted).
+		// If timers ought to be restarted, the quest can take care of it with its code (example: save global data indicating what timer must be restarted).
-		synchronized (_questTimers)
-		{
 		for (List<QuestTimer> timers : _questTimers.values())
 		{
 			for (QuestTimer timer : timers)
 			{
 				timer.cancel();
 			}
+			
 			timers.clear();
 		}
+		
 		_questTimers.clear();
-		}
 		
 		if (removeFromList)
 		{

L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/quest/Quest.java

@@ -318,6 +318,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 				return timer;
 			}
 		}
+		
 		return null;
 	}
 	
@@ -332,8 +333,6 @@ public class Quest extends AbstractScript implements IIdentifiable
 			return;
 		}
 		
-		synchronized (_questTimers)
-		{
 		final List<QuestTimer> timers = _questTimers.get(name);
 		if ((timers == null) || timers.isEmpty())
 		{
@@ -347,9 +346,9 @@ public class Quest extends AbstractScript implements IIdentifiable
 				timer.cancel();
 			}
 		}
+		
 		timers.clear();
 	}
-	}
 	
 	/**
 	 * Cancel the quest timer that matches the specified name and parameters.
@@ -364,8 +363,6 @@ public class Quest extends AbstractScript implements IIdentifiable
 			return;
 		}
 		
-		synchronized (_questTimers)
-		{
 		final List<QuestTimer> timers = _questTimers.get(name);
 		if ((timers == null) || timers.isEmpty())
 		{
@@ -377,12 +374,10 @@ public class Quest extends AbstractScript implements IIdentifiable
 			if ((timer != null) && timer.equals(this, name, npc, player))
 			{
 				timer.cancel();
-					timers.remove(timer);
 				return;
 			}
 		}
 	}
-	}
 	
 	/**
 	 * Remove a quest timer from the list of all timers.<br>
@@ -396,15 +391,12 @@ public class Quest extends AbstractScript implements IIdentifiable
 			return;
 		}
 		
-		synchronized (_questTimers)
-		{
 		final List<QuestTimer> timers = _questTimers.get(timer.toString());
 		if (timers != null)
 		{
 			timers.remove(timer);
 		}
 	}
-	}
 	
 	// These are methods to call within the core to call the quest events.
 	
@@ -2816,21 +2808,20 @@ public class Quest extends AbstractScript implements IIdentifiable
 	public boolean unload(boolean removeFromList)
 	{
 		onSave();
-		// cancel all pending timers before reloading.
+		
-		// if timers ought to be restarted, the quest can take care of it
+		// Cancel all pending timers before reloading.
-		// with its code (example: save global data indicating what timer must be restarted).
+		// If timers ought to be restarted, the quest can take care of it with its code (example: save global data indicating what timer must be restarted).
-		synchronized (_questTimers)
-		{
 		for (List<QuestTimer> timers : _questTimers.values())
 		{
 			for (QuestTimer timer : timers)
 			{
 				timer.cancel();
 			}
+			
 			timers.clear();
 		}
+		
 		_questTimers.clear();
-		}
 		
 		if (removeFromList)
 		{

L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/quest/Quest.java

@@ -318,6 +318,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 				return timer;
 			}
 		}
+		
 		return null;
 	}
 	
@@ -332,8 +333,6 @@ public class Quest extends AbstractScript implements IIdentifiable
 			return;
 		}
 		
-		synchronized (_questTimers)
-		{
 		final List<QuestTimer> timers = _questTimers.get(name);
 		if ((timers == null) || timers.isEmpty())
 		{
@@ -347,9 +346,9 @@ public class Quest extends AbstractScript implements IIdentifiable
 				timer.cancel();
 			}
 		}
+		
 		timers.clear();
 	}
-	}
 	
 	/**
 	 * Cancel the quest timer that matches the specified name and parameters.
@@ -364,8 +363,6 @@ public class Quest extends AbstractScript implements IIdentifiable
 			return;
 		}
 		
-		synchronized (_questTimers)
-		{
 		final List<QuestTimer> timers = _questTimers.get(name);
 		if ((timers == null) || timers.isEmpty())
 		{
@@ -377,12 +374,10 @@ public class Quest extends AbstractScript implements IIdentifiable
 			if ((timer != null) && timer.equals(this, name, npc, player))
 			{
 				timer.cancel();
-					timers.remove(timer);
 				return;
 			}
 		}
 	}
-	}
 	
 	/**
 	 * Remove a quest timer from the list of all timers.<br>
@@ -396,15 +391,12 @@ public class Quest extends AbstractScript implements IIdentifiable
 			return;
 		}
 		
-		synchronized (_questTimers)
-		{
 		final List<QuestTimer> timers = _questTimers.get(timer.toString());
 		if (timers != null)
 		{
 			timers.remove(timer);
 		}
 	}
-	}
 	
 	// These are methods to call within the core to call the quest events.
 	
@@ -2816,21 +2808,20 @@ public class Quest extends AbstractScript implements IIdentifiable
 	public boolean unload(boolean removeFromList)
 	{
 		onSave();
-		// cancel all pending timers before reloading.
+		
-		// if timers ought to be restarted, the quest can take care of it
+		// Cancel all pending timers before reloading.
-		// with its code (example: save global data indicating what timer must be restarted).
+		// If timers ought to be restarted, the quest can take care of it with its code (example: save global data indicating what timer must be restarted).
-		synchronized (_questTimers)
-		{
 		for (List<QuestTimer> timers : _questTimers.values())
 		{
 			for (QuestTimer timer : timers)
 			{
 				timer.cancel();
 			}
+			
 			timers.clear();
 		}
+		
 		_questTimers.clear();
-		}
 		
 		if (removeFromList)
 		{

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/quest/Quest.java

@@ -328,6 +328,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 				return timer;
 			}
 		}
+		
 		return null;
 	}
 	
@@ -342,8 +343,6 @@ public class Quest extends AbstractScript implements IIdentifiable
 			return;
 		}
 		
-		synchronized (_questTimers)
-		{
 		final List<QuestTimer> timers = _questTimers.get(name);
 		if ((timers == null) || timers.isEmpty())
 		{
@@ -357,9 +356,9 @@ public class Quest extends AbstractScript implements IIdentifiable
 				timer.cancel();
 			}
 		}
+		
 		timers.clear();
 	}
-	}
 	
 	/**
 	 * Cancel the quest timer that matches the specified name and parameters.
@@ -374,8 +373,6 @@ public class Quest extends AbstractScript implements IIdentifiable
 			return;
 		}
 		
-		synchronized (_questTimers)
-		{
 		final List<QuestTimer> timers = _questTimers.get(name);
 		if ((timers == null) || timers.isEmpty())
 		{
@@ -387,12 +384,10 @@ public class Quest extends AbstractScript implements IIdentifiable
 			if ((timer != null) && timer.equals(this, name, npc, player))
 			{
 				timer.cancel();
-					timers.remove(timer);
 				return;
 			}
 		}
 	}
-	}
 	
 	/**
 	 * Remove a quest timer from the list of all timers.<br>
@@ -406,15 +401,12 @@ public class Quest extends AbstractScript implements IIdentifiable
 			return;
 		}
 		
-		synchronized (_questTimers)
-		{
 		final List<QuestTimer> timers = _questTimers.get(timer.toString());
 		if (timers != null)
 		{
 			timers.remove(timer);
 		}
 	}
-	}
 	
 	// These are methods to call within the core to call the quest events.
 	
@@ -2826,21 +2818,20 @@ public class Quest extends AbstractScript implements IIdentifiable
 	public boolean unload(boolean removeFromList)
 	{
 		onSave();
-		// cancel all pending timers before reloading.
+		
-		// if timers ought to be restarted, the quest can take care of it
+		// Cancel all pending timers before reloading.
-		// with its code (example: save global data indicating what timer must be restarted).
+		// If timers ought to be restarted, the quest can take care of it with its code (example: save global data indicating what timer must be restarted).
-		synchronized (_questTimers)
-		{
 		for (List<QuestTimer> timers : _questTimers.values())
 		{
 			for (QuestTimer timer : timers)
 			{
 				timer.cancel();
 			}
+			
 			timers.clear();
 		}
+		
 		_questTimers.clear();
-		}
 		
 		if (removeFromList)
 		{

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/quest/Quest.java

@@ -387,6 +387,7 @@ public class Quest extends ManagedScript
 				return timer;
 			}
 		}
+		
 		return null;
 	}
 	
@@ -401,8 +402,6 @@ public class Quest extends ManagedScript
 			return;
 		}
 		
-		synchronized (_questTimers)
-		{
 		final List<QuestTimer> timers = _questTimers.get(name);
 		if ((timers == null) || timers.isEmpty())
 		{
@@ -416,9 +415,9 @@ public class Quest extends ManagedScript
 				timer.cancel();
 			}
 		}
+		
 		timers.clear();
 	}
-	}
 	
 	/**
 	 * Cancel the quest timer that matches the specified name and parameters.
@@ -433,8 +432,6 @@ public class Quest extends ManagedScript
 			return;
 		}
 		
-		synchronized (_questTimers)
-		{
 		final List<QuestTimer> timers = _questTimers.get(name);
 		if ((timers == null) || timers.isEmpty())
 		{
@@ -446,12 +443,10 @@ public class Quest extends ManagedScript
 			if ((timer != null) && timer.equals(this, name, npc, player))
 			{
 				timer.cancel();
-					timers.remove(timer);
 				return;
 			}
 		}
 	}
-	}
 	
 	/**
 	 * Remove a quest timer from the list of all timers.<br>
@@ -465,15 +460,12 @@ public class Quest extends ManagedScript
 			return;
 		}
 		
-		synchronized (_questTimers)
-		{
 		final List<QuestTimer> timers = _questTimers.get(timer.toString());
 		if (timers != null)
 		{
 			timers.remove(timer);
 		}
 	}
-	}
 	
 	// These are methods to call within the core to call the quest events.
 	
@@ -1668,20 +1660,21 @@ public class Quest extends ManagedScript
 	public boolean unload()
 	{
 		saveGlobalData();
+		
 		// Cancel all pending timers before reloading.
 		// If timers ought to be restarted, the quest can take care of it with its code (example: save global data indicating what timer must be restarted).
-		synchronized (_questTimers)
-		{
 		for (List<QuestTimer> timers : _questTimers.values())
 		{
 			for (QuestTimer timer : timers)
 			{
 				timer.cancel();
 			}
+			
 			timers.clear();
 		}
+		
 		_questTimers.clear();
-		}
+		
 		return QuestManager.getInstance().removeQuest(this);
 	}
 	

L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/quest/Quest.java

@@ -290,6 +290,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 				return timer;
 			}
 		}
+		
 		return null;
 	}
 	
@@ -304,8 +305,6 @@ public class Quest extends AbstractScript implements IIdentifiable
 			return;
 		}
 		
-		synchronized (_questTimers)
-		{
 		final List<QuestTimer> timers = _questTimers.get(name);
 		if ((timers == null) || timers.isEmpty())
 		{
@@ -319,9 +318,9 @@ public class Quest extends AbstractScript implements IIdentifiable
 				timer.cancel();
 			}
 		}
+		
 		timers.clear();
 	}
-	}
 	
 	/**
 	 * Cancel the quest timer that matches the specified name and parameters.
@@ -336,8 +335,6 @@ public class Quest extends AbstractScript implements IIdentifiable
 			return;
 		}
 		
-		synchronized (_questTimers)
-		{
 		final List<QuestTimer> timers = _questTimers.get(name);
 		if ((timers == null) || timers.isEmpty())
 		{
@@ -349,12 +346,10 @@ public class Quest extends AbstractScript implements IIdentifiable
 			if ((timer != null) && timer.equals(this, name, npc, player))
 			{
 				timer.cancel();
-					timers.remove(timer);
 				return;
 			}
 		}
 	}
-	}
 	
 	/**
 	 * Remove a quest timer from the list of all timers.<br>
@@ -368,15 +363,12 @@ public class Quest extends AbstractScript implements IIdentifiable
 			return;
 		}
 		
-		synchronized (_questTimers)
-		{
 		final List<QuestTimer> timers = _questTimers.get(timer.toString());
 		if (timers != null)
 		{
 			timers.remove(timer);
 		}
 	}
-	}
 	
 	// These are methods to call within the core to call the quest events.
 	
@@ -2503,21 +2495,20 @@ public class Quest extends AbstractScript implements IIdentifiable
 	public boolean unload(boolean removeFromList)
 	{
 		onSave();
-		// cancel all pending timers before reloading.
+		
-		// if timers ought to be restarted, the quest can take care of it
+		// Cancel all pending timers before reloading.
-		// with its code (example: save global data indicating what timer must be restarted).
+		// If timers ought to be restarted, the quest can take care of it with its code (example: save global data indicating what timer must be restarted).
-		synchronized (_questTimers)
-		{
 		for (List<QuestTimer> timers : _questTimers.values())
 		{
 			for (QuestTimer timer : timers)
 			{
 				timer.cancel();
 			}
+			
 			timers.clear();
 		}
+		
 		_questTimers.clear();
-		}
 		
 		if (removeFromList)
 		{

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/quest/Quest.java

@@ -292,6 +292,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 				return timer;
 			}
 		}
+		
 		return null;
 	}
 	
@@ -306,8 +307,6 @@ public class Quest extends AbstractScript implements IIdentifiable
 			return;
 		}
 		
-		synchronized (_questTimers)
-		{
 		final List<QuestTimer> timers = _questTimers.get(name);
 		if ((timers == null) || timers.isEmpty())
 		{
@@ -321,9 +320,9 @@ public class Quest extends AbstractScript implements IIdentifiable
 				timer.cancel();
 			}
 		}
+		
 		timers.clear();
 	}
-	}
 	
 	/**
 	 * Cancel the quest timer that matches the specified name and parameters.
@@ -338,8 +337,6 @@ public class Quest extends AbstractScript implements IIdentifiable
 			return;
 		}
 		
-		synchronized (_questTimers)
-		{
 		final List<QuestTimer> timers = _questTimers.get(name);
 		if ((timers == null) || timers.isEmpty())
 		{
@@ -351,12 +348,10 @@ public class Quest extends AbstractScript implements IIdentifiable
 			if ((timer != null) && timer.equals(this, name, npc, player))
 			{
 				timer.cancel();
-					timers.remove(timer);
 				return;
 			}
 		}
 	}
-	}
 	
 	/**
 	 * Remove a quest timer from the list of all timers.<br>
@@ -370,15 +365,12 @@ public class Quest extends AbstractScript implements IIdentifiable
 			return;
 		}
 		
-		synchronized (_questTimers)
-		{
 		final List<QuestTimer> timers = _questTimers.get(timer.toString());
 		if (timers != null)
 		{
 			timers.remove(timer);
 		}
 	}
-	}
 	
 	// These are methods to call within the core to call the quest events.
 	
@@ -2546,21 +2538,20 @@ public class Quest extends AbstractScript implements IIdentifiable
 	public boolean unload(boolean removeFromList)
 	{
 		onSave();
-		// cancel all pending timers before reloading.
+		
-		// if timers ought to be restarted, the quest can take care of it
+		// Cancel all pending timers before reloading.
-		// with its code (example: save global data indicating what timer must be restarted).
+		// If timers ought to be restarted, the quest can take care of it with its code (example: save global data indicating what timer must be restarted).
-		synchronized (_questTimers)
-		{
 		for (List<QuestTimer> timers : _questTimers.values())
 		{
 			for (QuestTimer timer : timers)
 			{
 				timer.cancel();
 			}
+			
 			timers.clear();
 		}
+		
 		_questTimers.clear();
-		}
 		
 		if (removeFromList)
 		{

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/quest/Quest.java

@@ -316,6 +316,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 				return timer;
 			}
 		}
+		
 		return null;
 	}
 	
@@ -330,8 +331,6 @@ public class Quest extends AbstractScript implements IIdentifiable
 			return;
 		}
 		
-		synchronized (_questTimers)
-		{
 		final List<QuestTimer> timers = _questTimers.get(name);
 		if ((timers == null) || timers.isEmpty())
 		{
@@ -345,9 +344,9 @@ public class Quest extends AbstractScript implements IIdentifiable
 				timer.cancel();
 			}
 		}
+		
 		timers.clear();
 	}
-	}
 	
 	/**
 	 * Cancel the quest timer that matches the specified name and parameters.
@@ -362,8 +361,6 @@ public class Quest extends AbstractScript implements IIdentifiable
 			return;
 		}
 		
-		synchronized (_questTimers)
-		{
 		final List<QuestTimer> timers = _questTimers.get(name);
 		if ((timers == null) || timers.isEmpty())
 		{
@@ -375,12 +372,10 @@ public class Quest extends AbstractScript implements IIdentifiable
 			if ((timer != null) && timer.equals(this, name, npc, player))
 			{
 				timer.cancel();
-					timers.remove(timer);
 				return;
 			}
 		}
 	}
-	}
 	
 	/**
 	 * Remove a quest timer from the list of all timers.<br>
@@ -394,15 +389,12 @@ public class Quest extends AbstractScript implements IIdentifiable
 			return;
 		}
 		
-		synchronized (_questTimers)
-		{
 		final List<QuestTimer> timers = _questTimers.get(timer.toString());
 		if (timers != null)
 		{
 			timers.remove(timer);
 		}
 	}
-	}
 	
 	// These are methods to call within the core to call the quest events.
 	
@@ -2770,21 +2762,20 @@ public class Quest extends AbstractScript implements IIdentifiable
 	public boolean unload(boolean removeFromList)
 	{
 		onSave();
-		// cancel all pending timers before reloading.
+		
-		// if timers ought to be restarted, the quest can take care of it
+		// Cancel all pending timers before reloading.
-		// with its code (example: save global data indicating what timer must be restarted).
+		// If timers ought to be restarted, the quest can take care of it with its code (example: save global data indicating what timer must be restarted).
-		synchronized (_questTimers)
-		{
 		for (List<QuestTimer> timers : _questTimers.values())
 		{
 			for (QuestTimer timer : timers)
 			{
 				timer.cancel();
 			}
+			
 			timers.clear();
 		}
+		
 		_questTimers.clear();
-		}
 		
 		if (removeFromList)
 		{

L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/quest/Quest.java

@@ -316,6 +316,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 				return timer;
 			}
 		}
+		
 		return null;
 	}
 	
@@ -330,8 +331,6 @@ public class Quest extends AbstractScript implements IIdentifiable
 			return;
 		}
 		
-		synchronized (_questTimers)
-		{
 		final List<QuestTimer> timers = _questTimers.get(name);
 		if ((timers == null) || timers.isEmpty())
 		{
@@ -345,9 +344,9 @@ public class Quest extends AbstractScript implements IIdentifiable
 				timer.cancel();
 			}
 		}
+		
 		timers.clear();
 	}
-	}
 	
 	/**
 	 * Cancel the quest timer that matches the specified name and parameters.
@@ -362,8 +361,6 @@ public class Quest extends AbstractScript implements IIdentifiable
 			return;
 		}
 		
-		synchronized (_questTimers)
-		{
 		final List<QuestTimer> timers = _questTimers.get(name);
 		if ((timers == null) || timers.isEmpty())
 		{
@@ -375,12 +372,10 @@ public class Quest extends AbstractScript implements IIdentifiable
 			if ((timer != null) && timer.equals(this, name, npc, player))
 			{
 				timer.cancel();
-					timers.remove(timer);
 				return;
 			}
 		}
 	}
-	}
 	
 	/**
 	 * Remove a quest timer from the list of all timers.<br>
@@ -394,15 +389,12 @@ public class Quest extends AbstractScript implements IIdentifiable
 			return;
 		}
 		
-		synchronized (_questTimers)
-		{
 		final List<QuestTimer> timers = _questTimers.get(timer.toString());
 		if (timers != null)
 		{
 			timers.remove(timer);
 		}
 	}
-	}
 	
 	// These are methods to call within the core to call the quest events.
 	
@@ -2770,21 +2762,20 @@ public class Quest extends AbstractScript implements IIdentifiable
 	public boolean unload(boolean removeFromList)
 	{
 		onSave();
-		// cancel all pending timers before reloading.
+		
-		// if timers ought to be restarted, the quest can take care of it
+		// Cancel all pending timers before reloading.
-		// with its code (example: save global data indicating what timer must be restarted).
+		// If timers ought to be restarted, the quest can take care of it with its code (example: save global data indicating what timer must be restarted).
-		synchronized (_questTimers)
-		{
 		for (List<QuestTimer> timers : _questTimers.values())
 		{
 			for (QuestTimer timer : timers)
 			{
 				timer.cancel();
 			}
+			
 			timers.clear();
 		}
+		
 		_questTimers.clear();
-		}
 		
 		if (removeFromList)
 		{

L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/quest/Quest.java

@@ -316,6 +316,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 				return timer;
 			}
 		}
+		
 		return null;
 	}
 	
@@ -330,8 +331,6 @@ public class Quest extends AbstractScript implements IIdentifiable
 			return;
 		}
 		
-		synchronized (_questTimers)
-		{
 		final List<QuestTimer> timers = _questTimers.get(name);
 		if ((timers == null) || timers.isEmpty())
 		{
@@ -345,9 +344,9 @@ public class Quest extends AbstractScript implements IIdentifiable
 				timer.cancel();
 			}
 		}
+		
 		timers.clear();
 	}
-	}
 	
 	/**
 	 * Cancel the quest timer that matches the specified name and parameters.
@@ -362,8 +361,6 @@ public class Quest extends AbstractScript implements IIdentifiable
 			return;
 		}
 		
-		synchronized (_questTimers)
-		{
 		final List<QuestTimer> timers = _questTimers.get(name);
 		if ((timers == null) || timers.isEmpty())
 		{
@@ -375,12 +372,10 @@ public class Quest extends AbstractScript implements IIdentifiable
 			if ((timer != null) && timer.equals(this, name, npc, player))
 			{
 				timer.cancel();
-					timers.remove(timer);
 				return;
 			}
 		}
 	}
-	}
 	
 	/**
 	 * Remove a quest timer from the list of all timers.<br>
@@ -394,15 +389,12 @@ public class Quest extends AbstractScript implements IIdentifiable
 			return;
 		}
 		
-		synchronized (_questTimers)
-		{
 		final List<QuestTimer> timers = _questTimers.get(timer.toString());
 		if (timers != null)
 		{
 			timers.remove(timer);
 		}
 	}
-	}
 	
 	// These are methods to call within the core to call the quest events.
 	
@@ -2770,21 +2762,20 @@ public class Quest extends AbstractScript implements IIdentifiable
 	public boolean unload(boolean removeFromList)
 	{
 		onSave();
-		// cancel all pending timers before reloading.
+		
-		// if timers ought to be restarted, the quest can take care of it
+		// Cancel all pending timers before reloading.
-		// with its code (example: save global data indicating what timer must be restarted).
+		// If timers ought to be restarted, the quest can take care of it with its code (example: save global data indicating what timer must be restarted).
-		synchronized (_questTimers)
-		{
 		for (List<QuestTimer> timers : _questTimers.values())
 		{
 			for (QuestTimer timer : timers)
 			{
 				timer.cancel();
 			}
+			
 			timers.clear();
 		}
+		
 		_questTimers.clear();
-		}
 		
 		if (removeFromList)
 		{

L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/quest/Quest.java

@@ -316,6 +316,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 				return timer;
 			}
 		}
+		
 		return null;
 	}
 	
@@ -330,8 +331,6 @@ public class Quest extends AbstractScript implements IIdentifiable
 			return;
 		}
 		
-		synchronized (_questTimers)
-		{
 		final List<QuestTimer> timers = _questTimers.get(name);
 		if ((timers == null) || timers.isEmpty())
 		{
@@ -345,9 +344,9 @@ public class Quest extends AbstractScript implements IIdentifiable
 				timer.cancel();
 			}
 		}
+		
 		timers.clear();
 	}
-	}
 	
 	/**
 	 * Cancel the quest timer that matches the specified name and parameters.
@@ -362,8 +361,6 @@ public class Quest extends AbstractScript implements IIdentifiable
 			return;
 		}
 		
-		synchronized (_questTimers)
-		{
 		final List<QuestTimer> timers = _questTimers.get(name);
 		if ((timers == null) || timers.isEmpty())
 		{
@@ -375,12 +372,10 @@ public class Quest extends AbstractScript implements IIdentifiable
 			if ((timer != null) && timer.equals(this, name, npc, player))
 			{
 				timer.cancel();
-					timers.remove(timer);
 				return;
 			}
 		}
 	}
-	}
 	
 	/**
 	 * Remove a quest timer from the list of all timers.<br>
@@ -394,15 +389,12 @@ public class Quest extends AbstractScript implements IIdentifiable
 			return;
 		}
 		
-		synchronized (_questTimers)
-		{
 		final List<QuestTimer> timers = _questTimers.get(timer.toString());
 		if (timers != null)
 		{
 			timers.remove(timer);
 		}
 	}
-	}
 	
 	// These are methods to call within the core to call the quest events.
 	
@@ -2770,21 +2762,20 @@ public class Quest extends AbstractScript implements IIdentifiable
 	public boolean unload(boolean removeFromList)
 	{
 		onSave();
-		// cancel all pending timers before reloading.
+		
-		// if timers ought to be restarted, the quest can take care of it
+		// Cancel all pending timers before reloading.
-		// with its code (example: save global data indicating what timer must be restarted).
+		// If timers ought to be restarted, the quest can take care of it with its code (example: save global data indicating what timer must be restarted).
-		synchronized (_questTimers)
-		{
 		for (List<QuestTimer> timers : _questTimers.values())
 		{
 			for (QuestTimer timer : timers)
 			{
 				timer.cancel();
 			}
+			
 			timers.clear();
 		}
+		
 		_questTimers.clear();
-		}
 		
 		if (removeFromList)
 		{

L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/quest/Quest.java

@@ -316,6 +316,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 				return timer;
 			}
 		}
+		
 		return null;
 	}
 	
@@ -330,8 +331,6 @@ public class Quest extends AbstractScript implements IIdentifiable
 			return;
 		}
 		
-		synchronized (_questTimers)
-		{
 		final List<QuestTimer> timers = _questTimers.get(name);
 		if ((timers == null) || timers.isEmpty())
 		{
@@ -345,9 +344,9 @@ public class Quest extends AbstractScript implements IIdentifiable
 				timer.cancel();
 			}
 		}
+		
 		timers.clear();
 	}
-	}
 	
 	/**
 	 * Cancel the quest timer that matches the specified name and parameters.
@@ -362,8 +361,6 @@ public class Quest extends AbstractScript implements IIdentifiable
 			return;
 		}
 		
-		synchronized (_questTimers)
-		{
 		final List<QuestTimer> timers = _questTimers.get(name);
 		if ((timers == null) || timers.isEmpty())
 		{
@@ -375,12 +372,10 @@ public class Quest extends AbstractScript implements IIdentifiable
 			if ((timer != null) && timer.equals(this, name, npc, player))
 			{
 				timer.cancel();
-					timers.remove(timer);
 				return;
 			}
 		}
 	}
-	}
 	
 	/**
 	 * Remove a quest timer from the list of all timers.<br>
@@ -394,15 +389,12 @@ public class Quest extends AbstractScript implements IIdentifiable
 			return;
 		}
 		
-		synchronized (_questTimers)
-		{
 		final List<QuestTimer> timers = _questTimers.get(timer.toString());
 		if (timers != null)
 		{
 			timers.remove(timer);
 		}
 	}
-	}
 	
 	// These are methods to call within the core to call the quest events.
 	
@@ -2770,21 +2762,20 @@ public class Quest extends AbstractScript implements IIdentifiable
 	public boolean unload(boolean removeFromList)
 	{
 		onSave();
-		// cancel all pending timers before reloading.
+		
-		// if timers ought to be restarted, the quest can take care of it
+		// Cancel all pending timers before reloading.
-		// with its code (example: save global data indicating what timer must be restarted).
+		// If timers ought to be restarted, the quest can take care of it with its code (example: save global data indicating what timer must be restarted).
-		synchronized (_questTimers)
-		{
 		for (List<QuestTimer> timers : _questTimers.values())
 		{
 			for (QuestTimer timer : timers)
 			{
 				timer.cancel();
 			}
+			
 			timers.clear();
 		}
+		
 		_questTimers.clear();
-		}
 		
 		if (removeFromList)
 		{

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/quest/Quest.java

@@ -316,6 +316,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 				return timer;
 			}
 		}
+		
 		return null;
 	}
 	
@@ -330,8 +331,6 @@ public class Quest extends AbstractScript implements IIdentifiable
 			return;
 		}
 		
-		synchronized (_questTimers)
-		{
 		final List<QuestTimer> timers = _questTimers.get(name);
 		if ((timers == null) || timers.isEmpty())
 		{
@@ -345,9 +344,9 @@ public class Quest extends AbstractScript implements IIdentifiable
 				timer.cancel();
 			}
 		}
+		
 		timers.clear();
 	}
-	}
 	
 	/**
 	 * Cancel the quest timer that matches the specified name and parameters.
@@ -362,8 +361,6 @@ public class Quest extends AbstractScript implements IIdentifiable
 			return;
 		}
 		
-		synchronized (_questTimers)
-		{
 		final List<QuestTimer> timers = _questTimers.get(name);
 		if ((timers == null) || timers.isEmpty())
 		{
@@ -375,12 +372,10 @@ public class Quest extends AbstractScript implements IIdentifiable
 			if ((timer != null) && timer.equals(this, name, npc, player))
 			{
 				timer.cancel();
-					timers.remove(timer);
 				return;
 			}
 		}
 	}
-	}
 	
 	/**
 	 * Remove a quest timer from the list of all timers.<br>
@@ -394,15 +389,12 @@ public class Quest extends AbstractScript implements IIdentifiable
 			return;
 		}
 		
-		synchronized (_questTimers)
-		{
 		final List<QuestTimer> timers = _questTimers.get(timer.toString());
 		if (timers != null)
 		{
 			timers.remove(timer);
 		}
 	}
-	}
 	
 	// These are methods to call within the core to call the quest events.
 	
@@ -2770,21 +2762,20 @@ public class Quest extends AbstractScript implements IIdentifiable
 	public boolean unload(boolean removeFromList)
 	{
 		onSave();
-		// cancel all pending timers before reloading.
+		
-		// if timers ought to be restarted, the quest can take care of it
+		// Cancel all pending timers before reloading.
-		// with its code (example: save global data indicating what timer must be restarted).
+		// If timers ought to be restarted, the quest can take care of it with its code (example: save global data indicating what timer must be restarted).
-		synchronized (_questTimers)
-		{
 		for (List<QuestTimer> timers : _questTimers.values())
 		{
 			for (QuestTimer timer : timers)
 			{
 				timer.cancel();
 			}
+			
 			timers.clear();
 		}
+		
 		_questTimers.clear();
-		}
 		
 		if (removeFromList)
 		{

L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/quest/Quest.java

@@ -316,6 +316,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 				return timer;
 			}
 		}
+		
 		return null;
 	}
 	
@@ -330,8 +331,6 @@ public class Quest extends AbstractScript implements IIdentifiable
 			return;
 		}
 		
-		synchronized (_questTimers)
-		{
 		final List<QuestTimer> timers = _questTimers.get(name);
 		if ((timers == null) || timers.isEmpty())
 		{
@@ -345,9 +344,9 @@ public class Quest extends AbstractScript implements IIdentifiable
 				timer.cancel();
 			}
 		}
+		
 		timers.clear();
 	}
-	}
 	
 	/**
 	 * Cancel the quest timer that matches the specified name and parameters.
@@ -362,8 +361,6 @@ public class Quest extends AbstractScript implements IIdentifiable
 			return;
 		}
 		
-		synchronized (_questTimers)
-		{
 		final List<QuestTimer> timers = _questTimers.get(name);
 		if ((timers == null) || timers.isEmpty())
 		{
@@ -375,12 +372,10 @@ public class Quest extends AbstractScript implements IIdentifiable
 			if ((timer != null) && timer.equals(this, name, npc, player))
 			{
 				timer.cancel();
-					timers.remove(timer);
 				return;
 			}
 		}
 	}
-	}
 	
 	/**
 	 * Remove a quest timer from the list of all timers.<br>
@@ -394,15 +389,12 @@ public class Quest extends AbstractScript implements IIdentifiable
 			return;
 		}
 		
-		synchronized (_questTimers)
-		{
 		final List<QuestTimer> timers = _questTimers.get(timer.toString());
 		if (timers != null)
 		{
 			timers.remove(timer);
 		}
 	}
-	}
 	
 	// These are methods to call within the core to call the quest events.
 	
@@ -2770,21 +2762,20 @@ public class Quest extends AbstractScript implements IIdentifiable
 	public boolean unload(boolean removeFromList)
 	{
 		onSave();
-		// cancel all pending timers before reloading.
+		
-		// if timers ought to be restarted, the quest can take care of it
+		// Cancel all pending timers before reloading.
-		// with its code (example: save global data indicating what timer must be restarted).
+		// If timers ought to be restarted, the quest can take care of it with its code (example: save global data indicating what timer must be restarted).
-		synchronized (_questTimers)
-		{
 		for (List<QuestTimer> timers : _questTimers.values())
 		{
 			for (QuestTimer timer : timers)
 			{
 				timer.cancel();
 			}
+			
 			timers.clear();
 		}
+		
 		_questTimers.clear();
-		}
 		
 		if (removeFromList)
 		{