diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/quest/Quest.java index 238b606d15..7d7476aaa5 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/quest/Quest.java @@ -302,23 +302,20 @@ public class Quest extends AbstractScript implements IIdentifiable return null; } - synchronized (_questTimers) + final List timers = _questTimers.get(name); + if ((timers == null) || timers.isEmpty()) { - final List timers = _questTimers.get(name); - if ((timers == null) || timers.isEmpty()) - { - return null; - } - - for (QuestTimer timer : timers) - { - if ((timer != null) && timer.equals(this, name, npc, player)) - { - return timer; - } - } return null; } + + for (QuestTimer timer : timers) + { + if ((timer != null) && timer.equals(this, name, npc, player)) + { + return timer; + } + } + return null; } /** diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/quest/Quest.java index 6c739f9817..7b82bc283c 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/quest/Quest.java @@ -304,23 +304,20 @@ public class Quest extends AbstractScript implements IIdentifiable return null; } - synchronized (_questTimers) + final List timers = _questTimers.get(name); + if ((timers == null) || timers.isEmpty()) { - final List timers = _questTimers.get(name); - if ((timers == null) || timers.isEmpty()) - { - return null; - } - - for (QuestTimer timer : timers) - { - if ((timer != null) && timer.equals(this, name, npc, player)) - { - return timer; - } - } return null; } + + for (QuestTimer timer : timers) + { + if ((timer != null) && timer.equals(this, name, npc, player)) + { + return timer; + } + } + return null; } /** diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/quest/Quest.java index 23dcfc86b5..a1f14d33eb 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/quest/Quest.java @@ -305,23 +305,20 @@ public class Quest extends AbstractScript implements IIdentifiable return null; } - synchronized (_questTimers) + final List timers = _questTimers.get(name); + if ((timers == null) || timers.isEmpty()) { - final List timers = _questTimers.get(name); - if ((timers == null) || timers.isEmpty()) - { - return null; - } - - for (QuestTimer timer : timers) - { - if ((timer != null) && timer.equals(this, name, npc, player)) - { - return timer; - } - } return null; } + + for (QuestTimer timer : timers) + { + if ((timer != null) && timer.equals(this, name, npc, player)) + { + return timer; + } + } + return null; } /** diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/quest/Quest.java index c02e2fbc2e..aebbca98d7 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/quest/Quest.java @@ -305,23 +305,20 @@ public class Quest extends AbstractScript implements IIdentifiable return null; } - synchronized (_questTimers) + final List timers = _questTimers.get(name); + if ((timers == null) || timers.isEmpty()) { - final List timers = _questTimers.get(name); - if ((timers == null) || timers.isEmpty()) - { - return null; - } - - for (QuestTimer timer : timers) - { - if ((timer != null) && timer.equals(this, name, npc, player)) - { - return timer; - } - } return null; } + + for (QuestTimer timer : timers) + { + if ((timer != null) && timer.equals(this, name, npc, player)) + { + return timer; + } + } + return null; } /** diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/quest/Quest.java index 78627ca64c..808253f9c7 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/quest/Quest.java @@ -305,23 +305,20 @@ public class Quest extends AbstractScript implements IIdentifiable return null; } - synchronized (_questTimers) + final List timers = _questTimers.get(name); + if ((timers == null) || timers.isEmpty()) { - final List timers = _questTimers.get(name); - if ((timers == null) || timers.isEmpty()) - { - return null; - } - - for (QuestTimer timer : timers) - { - if ((timer != null) && timer.equals(this, name, npc, player)) - { - return timer; - } - } return null; } + + for (QuestTimer timer : timers) + { + if ((timer != null) && timer.equals(this, name, npc, player)) + { + return timer; + } + } + return null; } /** diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/quest/Quest.java index c02e2fbc2e..aebbca98d7 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/quest/Quest.java @@ -305,23 +305,20 @@ public class Quest extends AbstractScript implements IIdentifiable return null; } - synchronized (_questTimers) + final List timers = _questTimers.get(name); + if ((timers == null) || timers.isEmpty()) { - final List timers = _questTimers.get(name); - if ((timers == null) || timers.isEmpty()) - { - return null; - } - - for (QuestTimer timer : timers) - { - if ((timer != null) && timer.equals(this, name, npc, player)) - { - return timer; - } - } return null; } + + for (QuestTimer timer : timers) + { + if ((timer != null) && timer.equals(this, name, npc, player)) + { + return timer; + } + } + return null; } /** diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/quest/Quest.java index c02e2fbc2e..aebbca98d7 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/quest/Quest.java @@ -305,23 +305,20 @@ public class Quest extends AbstractScript implements IIdentifiable return null; } - synchronized (_questTimers) + final List timers = _questTimers.get(name); + if ((timers == null) || timers.isEmpty()) { - final List timers = _questTimers.get(name); - if ((timers == null) || timers.isEmpty()) - { - return null; - } - - for (QuestTimer timer : timers) - { - if ((timer != null) && timer.equals(this, name, npc, player)) - { - return timer; - } - } return null; } + + for (QuestTimer timer : timers) + { + if ((timer != null) && timer.equals(this, name, npc, player)) + { + return timer; + } + } + return null; } /** diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/quest/Quest.java index 5cac030813..64abf5bcc5 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/quest/Quest.java @@ -315,23 +315,20 @@ public class Quest extends AbstractScript implements IIdentifiable return null; } - synchronized (_questTimers) + final List timers = _questTimers.get(name); + if ((timers == null) || timers.isEmpty()) { - final List timers = _questTimers.get(name); - if ((timers == null) || timers.isEmpty()) - { - return null; - } - - for (QuestTimer timer : timers) - { - if ((timer != null) && timer.equals(this, name, npc, player)) - { - return timer; - } - } return null; } + + for (QuestTimer timer : timers) + { + if ((timer != null) && timer.equals(this, name, npc, player)) + { + return timer; + } + } + return null; } /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/quest/Quest.java index 1a138dcddd..d84f9dc878 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/quest/Quest.java @@ -374,23 +374,20 @@ public class Quest extends ManagedScript return null; } - synchronized (_questTimers) + final List timers = _questTimers.get(name); + if ((timers == null) || timers.isEmpty()) { - final List timers = _questTimers.get(name); - if ((timers == null) || timers.isEmpty()) - { - return null; - } - - for (QuestTimer timer : timers) - { - if ((timer != null) && timer.equals(this, name, npc, player)) - { - return timer; - } - } return null; } + + for (QuestTimer timer : timers) + { + if ((timer != null) && timer.equals(this, name, npc, player)) + { + return timer; + } + } + return null; } /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/quest/Quest.java index 7def894a2e..7f36d43198 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/quest/Quest.java @@ -277,23 +277,20 @@ public class Quest extends AbstractScript implements IIdentifiable return null; } - synchronized (_questTimers) + final List timers = _questTimers.get(name); + if ((timers == null) || timers.isEmpty()) { - final List timers = _questTimers.get(name); - if ((timers == null) || timers.isEmpty()) - { - return null; - } - - for (QuestTimer timer : timers) - { - if ((timer != null) && timer.equals(this, name, npc, player)) - { - return timer; - } - } return null; } + + for (QuestTimer timer : timers) + { + if ((timer != null) && timer.equals(this, name, npc, player)) + { + return timer; + } + } + return null; } /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/quest/Quest.java index bc3e1d02d8..74ddd2d9a2 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/quest/Quest.java @@ -279,23 +279,20 @@ public class Quest extends AbstractScript implements IIdentifiable return null; } - synchronized (_questTimers) + final List timers = _questTimers.get(name); + if ((timers == null) || timers.isEmpty()) { - final List timers = _questTimers.get(name); - if ((timers == null) || timers.isEmpty()) - { - return null; - } - - for (QuestTimer timer : timers) - { - if ((timer != null) && timer.equals(this, name, npc, player)) - { - return timer; - } - } return null; } + + for (QuestTimer timer : timers) + { + if ((timer != null) && timer.equals(this, name, npc, player)) + { + return timer; + } + } + return null; } /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/quest/Quest.java index 0cd66d8048..30d6ffd3a8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/quest/Quest.java @@ -303,23 +303,20 @@ public class Quest extends AbstractScript implements IIdentifiable return null; } - synchronized (_questTimers) + final List timers = _questTimers.get(name); + if ((timers == null) || timers.isEmpty()) { - final List timers = _questTimers.get(name); - if ((timers == null) || timers.isEmpty()) - { - return null; - } - - for (QuestTimer timer : timers) - { - if ((timer != null) && timer.equals(this, name, npc, player)) - { - return timer; - } - } return null; } + + for (QuestTimer timer : timers) + { + if ((timer != null) && timer.equals(this, name, npc, player)) + { + return timer; + } + } + return null; } /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/quest/Quest.java index 0cd66d8048..30d6ffd3a8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/quest/Quest.java @@ -303,23 +303,20 @@ public class Quest extends AbstractScript implements IIdentifiable return null; } - synchronized (_questTimers) + final List timers = _questTimers.get(name); + if ((timers == null) || timers.isEmpty()) { - final List timers = _questTimers.get(name); - if ((timers == null) || timers.isEmpty()) - { - return null; - } - - for (QuestTimer timer : timers) - { - if ((timer != null) && timer.equals(this, name, npc, player)) - { - return timer; - } - } return null; } + + for (QuestTimer timer : timers) + { + if ((timer != null) && timer.equals(this, name, npc, player)) + { + return timer; + } + } + return null; } /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/quest/Quest.java index 0cd66d8048..30d6ffd3a8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/quest/Quest.java @@ -303,23 +303,20 @@ public class Quest extends AbstractScript implements IIdentifiable return null; } - synchronized (_questTimers) + final List timers = _questTimers.get(name); + if ((timers == null) || timers.isEmpty()) { - final List timers = _questTimers.get(name); - if ((timers == null) || timers.isEmpty()) - { - return null; - } - - for (QuestTimer timer : timers) - { - if ((timer != null) && timer.equals(this, name, npc, player)) - { - return timer; - } - } return null; } + + for (QuestTimer timer : timers) + { + if ((timer != null) && timer.equals(this, name, npc, player)) + { + return timer; + } + } + return null; } /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/quest/Quest.java index 0cd66d8048..30d6ffd3a8 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/quest/Quest.java @@ -303,23 +303,20 @@ public class Quest extends AbstractScript implements IIdentifiable return null; } - synchronized (_questTimers) + final List timers = _questTimers.get(name); + if ((timers == null) || timers.isEmpty()) { - final List timers = _questTimers.get(name); - if ((timers == null) || timers.isEmpty()) - { - return null; - } - - for (QuestTimer timer : timers) - { - if ((timer != null) && timer.equals(this, name, npc, player)) - { - return timer; - } - } return null; } + + for (QuestTimer timer : timers) + { + if ((timer != null) && timer.equals(this, name, npc, player)) + { + return timer; + } + } + return null; } /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/quest/Quest.java index 0cd66d8048..30d6ffd3a8 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/quest/Quest.java @@ -303,23 +303,20 @@ public class Quest extends AbstractScript implements IIdentifiable return null; } - synchronized (_questTimers) + final List timers = _questTimers.get(name); + if ((timers == null) || timers.isEmpty()) { - final List timers = _questTimers.get(name); - if ((timers == null) || timers.isEmpty()) - { - return null; - } - - for (QuestTimer timer : timers) - { - if ((timer != null) && timer.equals(this, name, npc, player)) - { - return timer; - } - } return null; } + + for (QuestTimer timer : timers) + { + if ((timer != null) && timer.equals(this, name, npc, player)) + { + return timer; + } + } + return null; } /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/quest/Quest.java index 0cd66d8048..30d6ffd3a8 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/quest/Quest.java @@ -303,23 +303,20 @@ public class Quest extends AbstractScript implements IIdentifiable return null; } - synchronized (_questTimers) + final List timers = _questTimers.get(name); + if ((timers == null) || timers.isEmpty()) { - final List timers = _questTimers.get(name); - if ((timers == null) || timers.isEmpty()) - { - return null; - } - - for (QuestTimer timer : timers) - { - if ((timer != null) && timer.equals(this, name, npc, player)) - { - return timer; - } - } return null; } + + for (QuestTimer timer : timers) + { + if ((timer != null) && timer.equals(this, name, npc, player)) + { + return timer; + } + } + return null; } /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/quest/Quest.java index 0cd66d8048..30d6ffd3a8 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/quest/Quest.java @@ -303,23 +303,20 @@ public class Quest extends AbstractScript implements IIdentifiable return null; } - synchronized (_questTimers) + final List timers = _questTimers.get(name); + if ((timers == null) || timers.isEmpty()) { - final List timers = _questTimers.get(name); - if ((timers == null) || timers.isEmpty()) - { - return null; - } - - for (QuestTimer timer : timers) - { - if ((timer != null) && timer.equals(this, name, npc, player)) - { - return timer; - } - } return null; } + + for (QuestTimer timer : timers) + { + if ((timer != null) && timer.equals(this, name, npc, player)) + { + return timer; + } + } + return null; } /**