More QuestState related cleanups.

This commit is contained in:
MobiusDev
2017-08-15 15:22:42 +00:00
parent 4328a8dc6a
commit e8a760de9c
42 changed files with 109 additions and 159 deletions

View File

@ -59,7 +59,7 @@ public class QuestTimer
private final L2Npc _npc;
private final L2PcInstance _player;
private final boolean _isRepeating;
private ScheduledFuture<?> _schedular;
private final ScheduledFuture<?> _schedular;
public QuestTimer(Quest quest, String name, long time, L2Npc npc, L2PcInstance player, boolean repeating)
{
@ -68,14 +68,7 @@ public class QuestTimer
_player = player;
_npc = npc;
_isRepeating = repeating;
if (repeating)
{
_schedular = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new ScheduleTimerTask(), time, time); // Prepare auto end task
}
else
{
_schedular = ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleTimerTask(), time); // Prepare auto end task
}
_schedular = repeating ? ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new ScheduleTimerTask(), time, time) : ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleTimerTask(), time);
}
public QuestTimer(Quest quest, String name, long time, L2Npc npc, L2PcInstance player)

View File

@ -44,11 +44,17 @@ public class State
switch (state)
{
case 1:
{
return "Started";
}
case 2:
{
return "Completed";
}
default:
{
return "Start";
}
}
}
@ -62,11 +68,17 @@ public class State
switch (statename)
{
case "Started":
{
return 1;
}
case "Completed":
{
return 2;
}
default:
{
return 0;
}
}
}
}