Removed getQuestTimer method synchronization.

This commit is contained in:
MobiusDevelopment
2020-01-31 22:02:32 +00:00
parent 0f4835a0ee
commit ff157fe4bb
18 changed files with 198 additions and 252 deletions

View File

@ -302,23 +302,20 @@ public class Quest extends AbstractScript implements IIdentifiable
return null;
}
synchronized (_questTimers)
final List<QuestTimer> timers = _questTimers.get(name);
if ((timers == null) || timers.isEmpty())
{
final List<QuestTimer> 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;
}
/**

View File

@ -304,23 +304,20 @@ public class Quest extends AbstractScript implements IIdentifiable
return null;
}
synchronized (_questTimers)
final List<QuestTimer> timers = _questTimers.get(name);
if ((timers == null) || timers.isEmpty())
{
final List<QuestTimer> 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;
}
/**

View File

@ -305,23 +305,20 @@ public class Quest extends AbstractScript implements IIdentifiable
return null;
}
synchronized (_questTimers)
final List<QuestTimer> timers = _questTimers.get(name);
if ((timers == null) || timers.isEmpty())
{
final List<QuestTimer> 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;
}
/**

View File

@ -305,23 +305,20 @@ public class Quest extends AbstractScript implements IIdentifiable
return null;
}
synchronized (_questTimers)
final List<QuestTimer> timers = _questTimers.get(name);
if ((timers == null) || timers.isEmpty())
{
final List<QuestTimer> 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;
}
/**

View File

@ -305,23 +305,20 @@ public class Quest extends AbstractScript implements IIdentifiable
return null;
}
synchronized (_questTimers)
final List<QuestTimer> timers = _questTimers.get(name);
if ((timers == null) || timers.isEmpty())
{
final List<QuestTimer> 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;
}
/**

View File

@ -305,23 +305,20 @@ public class Quest extends AbstractScript implements IIdentifiable
return null;
}
synchronized (_questTimers)
final List<QuestTimer> timers = _questTimers.get(name);
if ((timers == null) || timers.isEmpty())
{
final List<QuestTimer> 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;
}
/**

View File

@ -305,23 +305,20 @@ public class Quest extends AbstractScript implements IIdentifiable
return null;
}
synchronized (_questTimers)
final List<QuestTimer> timers = _questTimers.get(name);
if ((timers == null) || timers.isEmpty())
{
final List<QuestTimer> 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;
}
/**

View File

@ -315,23 +315,20 @@ public class Quest extends AbstractScript implements IIdentifiable
return null;
}
synchronized (_questTimers)
final List<QuestTimer> timers = _questTimers.get(name);
if ((timers == null) || timers.isEmpty())
{
final List<QuestTimer> 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;
}
/**

View File

@ -374,23 +374,20 @@ public class Quest extends ManagedScript
return null;
}
synchronized (_questTimers)
final List<QuestTimer> timers = _questTimers.get(name);
if ((timers == null) || timers.isEmpty())
{
final List<QuestTimer> 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;
}
/**

View File

@ -277,23 +277,20 @@ public class Quest extends AbstractScript implements IIdentifiable
return null;
}
synchronized (_questTimers)
final List<QuestTimer> timers = _questTimers.get(name);
if ((timers == null) || timers.isEmpty())
{
final List<QuestTimer> 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;
}
/**

View File

@ -279,23 +279,20 @@ public class Quest extends AbstractScript implements IIdentifiable
return null;
}
synchronized (_questTimers)
final List<QuestTimer> timers = _questTimers.get(name);
if ((timers == null) || timers.isEmpty())
{
final List<QuestTimer> 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;
}
/**

View File

@ -303,23 +303,20 @@ public class Quest extends AbstractScript implements IIdentifiable
return null;
}
synchronized (_questTimers)
final List<QuestTimer> timers = _questTimers.get(name);
if ((timers == null) || timers.isEmpty())
{
final List<QuestTimer> 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;
}
/**

View File

@ -303,23 +303,20 @@ public class Quest extends AbstractScript implements IIdentifiable
return null;
}
synchronized (_questTimers)
final List<QuestTimer> timers = _questTimers.get(name);
if ((timers == null) || timers.isEmpty())
{
final List<QuestTimer> 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;
}
/**

View File

@ -303,23 +303,20 @@ public class Quest extends AbstractScript implements IIdentifiable
return null;
}
synchronized (_questTimers)
final List<QuestTimer> timers = _questTimers.get(name);
if ((timers == null) || timers.isEmpty())
{
final List<QuestTimer> 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;
}
/**

View File

@ -303,23 +303,20 @@ public class Quest extends AbstractScript implements IIdentifiable
return null;
}
synchronized (_questTimers)
final List<QuestTimer> timers = _questTimers.get(name);
if ((timers == null) || timers.isEmpty())
{
final List<QuestTimer> 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;
}
/**

View File

@ -303,23 +303,20 @@ public class Quest extends AbstractScript implements IIdentifiable
return null;
}
synchronized (_questTimers)
final List<QuestTimer> timers = _questTimers.get(name);
if ((timers == null) || timers.isEmpty())
{
final List<QuestTimer> 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;
}
/**

View File

@ -303,23 +303,20 @@ public class Quest extends AbstractScript implements IIdentifiable
return null;
}
synchronized (_questTimers)
final List<QuestTimer> timers = _questTimers.get(name);
if ((timers == null) || timers.isEmpty())
{
final List<QuestTimer> 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;
}
/**

View File

@ -303,23 +303,20 @@ public class Quest extends AbstractScript implements IIdentifiable
return null;
}
synchronized (_questTimers)
final List<QuestTimer> timers = _questTimers.get(name);
if ((timers == null) || timers.isEmpty())
{
final List<QuestTimer> 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;
}
/**