Reintroduction of CopyOnWriteArrayList for storing QuestTimers.

This commit is contained in:
MobiusDevelopment
2020-05-17 02:49:50 +00:00
parent e23fb9f6e6
commit 1464b1ab8b
50 changed files with 316 additions and 284 deletions

View File

@ -27,8 +27,7 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.stream.Collectors;
@ -68,7 +67,7 @@ public class Quest extends ManagedScript
/** Map containing events from String value of the event */
private static Map<String, Quest> _allEvents = new HashMap<>();
/** Map containing lists of timers from the name of the timer */
private final Map<String, Set<QuestTimer>> _questTimers = new HashMap<>();
private final Map<String, List<QuestTimer>> _questTimers = new HashMap<>();
private final int _questId;
private final String _prefixPath; // used only for admin_quest_reload
@ -334,7 +333,7 @@ public class Quest extends ManagedScript
* Gets the quest timers.
* @return the quest timers
*/
public Map<String, Set<QuestTimer>> getQuestTimers()
public Map<String, List<QuestTimer>> getQuestTimers()
{
return _questTimers;
}
@ -357,11 +356,15 @@ public class Quest extends ManagedScript
synchronized (_questTimers)
{
final Set<QuestTimer> timers = _questTimers.getOrDefault(name, ConcurrentHashMap.newKeySet(1));
if (!_questTimers.containsKey(name))
{
_questTimers.put(name, new CopyOnWriteArrayList<>());
}
// If there exists a timer with this name, allow the timer only if the [npc, player] set is unique nulls act as wildcards.
if (getQuestTimer(name, npc, player) == null)
{
timers.add(new QuestTimer(this, name, time, npc, player, repeating));
_questTimers.get(name).add(new QuestTimer(this, name, time, npc, player, repeating));
}
}
}
@ -380,7 +383,7 @@ public class Quest extends ManagedScript
return null;
}
final Set<QuestTimer> timers = _questTimers.get(name);
final List<QuestTimer> timers = _questTimers.get(name);
if ((timers == null) || timers.isEmpty())
{
return null;
@ -408,7 +411,7 @@ public class Quest extends ManagedScript
return;
}
final Set<QuestTimer> timers = _questTimers.get(name);
final List<QuestTimer> timers = _questTimers.get(name);
if ((timers == null) || timers.isEmpty())
{
return;
@ -438,7 +441,7 @@ public class Quest extends ManagedScript
return;
}
final Set<QuestTimer> timers = _questTimers.get(name);
final List<QuestTimer> timers = _questTimers.get(name);
if ((timers == null) || timers.isEmpty())
{
return;
@ -449,7 +452,6 @@ public class Quest extends ManagedScript
if ((timer != null) && timer.equals(this, name, npc, player))
{
timer.cancel();
return;
}
}
}
@ -466,7 +468,7 @@ public class Quest extends ManagedScript
return;
}
final Set<QuestTimer> timers = _questTimers.get(timer.toString());
final List<QuestTimer> timers = _questTimers.get(timer.toString());
if (timers != null)
{
timers.remove(timer);
@ -1660,16 +1662,14 @@ public class Quest extends ManagedScript
// 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).
for (Set<QuestTimer> timers : _questTimers.values())
for (List<QuestTimer> timers : _questTimers.values())
{
for (QuestTimer timer : timers)
{
timer.cancel();
}
timers.clear();
}
_questTimers.clear();
return QuestManager.getInstance().removeQuest(this);