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

Sync with L2jServer HighFive Feb 15th 2015.

Browse Source
This commit is contained in:
mobius
2015-02-15 23:48:35 +00:00
parent f2d6aedabe
commit 06c765ea63
45 changed files with 474 additions and 843 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
trunk/java/com/l2jserver/gameserver/model/quest/Quest.java
View File

@ -35,7 +35,6 @@ import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock;
import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
import java.util.function.Predicate;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.stream.Collectors;
import com.l2jserver.Config;
@ -81,8 +80,6 @@ import com.l2jserver.util.Util;
*/
public class Quest extends AbstractScript implements IIdentifiable
{
public static final Logger _log = Logger.getLogger(Quest.class.getName());
/** Map containing lists of timers from the name of the timer. */
private volatile Map<String, List<QuestTimer>> _questTimers = null;
private final ReentrantReadWriteLock _rwLock = new ReentrantReadWriteLock();
@ -109,22 +106,6 @@ public class Quest extends AbstractScript implements IIdentifiable
private static final int RESET_HOUR = 6;
private static final int RESET_MINUTES = 30;
/**
* @return the reset hour for a daily quest, could be overridden on a script.
*/
public int getResetHour()
{
return RESET_HOUR;
}
/**
* @return the reset minutes for a daily quest, could be overridden on a script.
*/
public int getResetMinutes()
{
return RESET_MINUTES;
}
/**
* The Quest object constructor.<br>
* Constructing a quest also calls the {@code init_LoadGlobalData} convenience method.
@ -149,6 +130,24 @@ public class Quest extends AbstractScript implements IIdentifiable
loadGlobalData();
}
/**
* Gets the reset hour for a daily quest.
* @return the reset hour
*/
public int getResetHour()
{
return RESET_HOUR;
}
/**
* Gets the reset minutes for a daily quest.
* @return the reset minutes
*/
public int getResetMinutes()
{
return RESET_MINUTES;
}
/**
* This method is, by default, called by the constructor of all scripts.<br>
* Children of this class can implement this function in order to define what variables to load and what structures to save them in.<br>
@ -217,9 +216,7 @@ public class Quest extends AbstractScript implements IIdentifiable
return _initialState;
}
/**
* @return the name of the quest
*/
@Override
public String getName()
{
return _name;
@ -2725,12 +2722,6 @@ public class Quest extends AbstractScript implements IIdentifiable
takeItems(player, -1, questItemIds);
}
@Override
public String getScriptName()
{
return getName();
}
@Override
public void setActive(boolean status)
{
@ -2789,7 +2780,7 @@ public class Quest extends AbstractScript implements IIdentifiable
}
@Override
public ScriptManager<?> getScriptManager()
public ScriptManager<?> getManager()
{
return QuestManager.getInstance();
}