lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use Set for quest timers and initialize conditions.

Browse Source
This commit is contained in:
MobiusDevelopment
2020-03-24 22:21:53 +00:00
parent 374eab6fdd
commit 993099e97a
50 changed files with 349 additions and 526 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
L2J_Mobius_Classic_Interlude/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java vendored
View File

@@ -20,6 +20,7 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import org.l2jmobius.gameserver.enums.PartyDistributionType;
@@ -814,7 +815,7 @@ public class TvT extends Event
EVENT_ACTIVE = true;
// Cancel timers. (In case event started immediately after another event was canceled.)
for (List<QuestTimer> timers : getQuestTimers().values())
for (Set<QuestTimer> timers : getQuestTimers().values())
{
for (QuestTimer timer : timers)
{
@@ -847,7 +848,7 @@ public class TvT extends Event
// Despawn event manager.
MANAGER_NPC_INSTANCE.deleteMe();
// Cancel timers.
for (List<QuestTimer> timers : getQuestTimers().values())
for (Set<QuestTimer> timers : getQuestTimers().values())
{
for (QuestTimer timer : timers)
{

3
L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminQuest.java vendored
View File

@@ -19,7 +19,6 @@ package handlers.admincommandhandlers;
import java.io.File;
import java.nio.file.Paths;
import java.util.Arrays;
import java.util.List;
import java.util.Set;
import java.util.StringTokenizer;
import java.util.TreeSet;
@@ -253,7 +252,7 @@ public class AdminQuest implements IAdminCommandHandler
items = quest.getRegisteredItemIds().length + ":" + items.substring(2);
}
for (List<QuestTimer> list : quest.getQuestTimers().values())
for (Set<QuestTimer> list : quest.getQuestTimers().values())
{
for (QuestTimer timer : list)
{