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

Sync with L2jServer HighFive Jul 3rd 2015.

Browse Source
This commit is contained in:
MobiusDev
2015-07-03 21:10:51 +00:00
parent 9c11f00722
commit ac006cde6a
29 changed files with 311 additions and 268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
trunk/java/com/l2jserver/gameserver/model/event/LongTimeEvent.java
View File

@ -97,7 +97,7 @@ public class LongTimeEvent extends Quest
{
long delay = _eventPeriod.getStartDate().getTime() - System.currentTimeMillis();
ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleStart(), delay);
_log.info("Event " + _eventName + " will be started at " + _eventPeriod.getEndDate());
_log.info("Event " + _eventName + " will be started at " + _eventPeriod.getStartDate());
}
else
{
@ -266,17 +266,21 @@ public class LongTimeEvent extends Quest
*/
protected void startEvent()
{
long currentTime = System.currentTimeMillis();
// Add drop
if (_dropList != null)
{
for (GeneralDropItem drop : _dropList)
if (currentTime < _dropPeriod.getEndDate().getTime())
{
EventDroplist.getInstance().addGlobalDrop(drop.getItemId(), drop.getMin(), drop.getMax(), (int) drop.getChance(), _dropPeriod);
for (GeneralDropItem drop : _dropList)
{
EventDroplist.getInstance().addGlobalDrop(drop.getItemId(), drop.getMin(), drop.getMax(), (int) drop.getChance(), _dropPeriod);
}
}
}
// Add spawns
Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - System.currentTimeMillis();
Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - currentTime;
if (_spawnList != null)
{
for (NpcSpawn spawn : _spawnList)