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

Lottery end time should not be scheduled in the past.

Browse Source
This commit is contained in:
MobiusDevelopment
2022-10-31 22:24:01 +00:00
parent 259bde1f0f
commit d4e60159b4
6 changed files with 38 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/games/Lottery.java
View File

@@ -189,8 +189,9 @@ public class Lottery
_enddate = finishtime.getTimeInMillis();
}
ThreadPool.schedule(new stopSellingTickets(), _enddate - System.currentTimeMillis() - (10 * MINUTE));
ThreadPool.schedule(new finishLottery(), _enddate - System.currentTimeMillis());
final long endDate = _enddate - System.currentTimeMillis();
ThreadPool.schedule(new stopSellingTickets(), Math.max(endDate - (10 * MINUTE), 0));
ThreadPool.schedule(new finishLottery(), Math.max(endDate, 0));
try (Connection con = DatabaseFactory.getConnection())
{

5
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/games/Lottery.java
View File

@@ -189,8 +189,9 @@ public class Lottery
_enddate = finishtime.getTimeInMillis();
}
ThreadPool.schedule(new stopSellingTickets(), _enddate - System.currentTimeMillis() - (10 * MINUTE));
ThreadPool.schedule(new finishLottery(), _enddate - System.currentTimeMillis());
final long endDate = _enddate - System.currentTimeMillis();
ThreadPool.schedule(new stopSellingTickets(), Math.max(endDate - (10 * MINUTE), 0));
ThreadPool.schedule(new finishLottery(), Math.max(endDate, 0));
try (Connection con = DatabaseFactory.getConnection())
{

15
L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/instancemanager/games/Lottery.java
View File

@@ -67,11 +67,6 @@ public class Lottery
}
}
public static Lottery getInstance()
{
return SingletonHolder.INSTANCE;
}
public int getId()
{
return _number;
@@ -185,8 +180,9 @@ public class Lottery
_enddate = finishtime.getTimeInMillis();
}
ThreadPool.schedule(new stopSellingTickets(), _enddate - System.currentTimeMillis() - (10 * MINUTE));
ThreadPool.schedule(new finishLottery(), _enddate - System.currentTimeMillis());
final long endDate = _enddate - System.currentTimeMillis();
ThreadPool.schedule(new stopSellingTickets(), Math.max(endDate - (10 * MINUTE), 0));
ThreadPool.schedule(new finishLottery(), Math.max(endDate, 0));
try (Connection con = DatabaseFactory.getConnection();
PreparedStatement ps = con.prepareStatement(INSERT_LOTTERY))
@@ -513,6 +509,11 @@ public class Lottery
return res;
}
public static Lottery getInstance()
{
return SingletonHolder.INSTANCE;
}
private static class SingletonHolder
{
protected static final Lottery INSTANCE = new Lottery();

15
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/games/Lottery.java
View File

@@ -67,11 +67,6 @@ public class Lottery
}
}
public static Lottery getInstance()
{
return SingletonHolder.INSTANCE;
}
public int getId()
{
return _number;
@@ -185,8 +180,9 @@ public class Lottery
_enddate = finishtime.getTimeInMillis();
}
ThreadPool.schedule(new stopSellingTickets(), _enddate - System.currentTimeMillis() - (10 * MINUTE));
ThreadPool.schedule(new finishLottery(), _enddate - System.currentTimeMillis());
final long endDate = _enddate - System.currentTimeMillis();
ThreadPool.schedule(new stopSellingTickets(), Math.max(endDate - (10 * MINUTE), 0));
ThreadPool.schedule(new finishLottery(), Math.max(endDate, 0));
try (Connection con = DatabaseFactory.getConnection();
PreparedStatement ps = con.prepareStatement(INSERT_LOTTERY))
@@ -513,6 +509,11 @@ public class Lottery
return res;
}
public static Lottery getInstance()
{
return SingletonHolder.INSTANCE;
}
private static class SingletonHolder
{
protected static final Lottery INSTANCE = new Lottery();

15
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/games/Lottery.java
View File

@@ -67,11 +67,6 @@ public class Lottery
}
}
public static Lottery getInstance()
{
return SingletonHolder.INSTANCE;
}
public int getId()
{
return _number;
@@ -185,8 +180,9 @@ public class Lottery
_enddate = finishtime.getTimeInMillis();
}
ThreadPool.schedule(new stopSellingTickets(), _enddate - System.currentTimeMillis() - (10 * MINUTE));
ThreadPool.schedule(new finishLottery(), _enddate - System.currentTimeMillis());
final long endDate = _enddate - System.currentTimeMillis();
ThreadPool.schedule(new stopSellingTickets(), Math.max(endDate - (10 * MINUTE), 0));
ThreadPool.schedule(new finishLottery(), Math.max(endDate, 0));
try (Connection con = DatabaseFactory.getConnection();
PreparedStatement ps = con.prepareStatement(INSERT_LOTTERY))
@@ -513,6 +509,11 @@ public class Lottery
return res;
}
public static Lottery getInstance()
{
return SingletonHolder.INSTANCE;
}
private static class SingletonHolder
{
protected static final Lottery INSTANCE = new Lottery();

15
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/games/Lottery.java
View File

@@ -67,11 +67,6 @@ public class Lottery
}
}
public static Lottery getInstance()
{
return SingletonHolder.INSTANCE;
}
public int getId()
{
return _number;
@@ -185,8 +180,9 @@ public class Lottery
_enddate = finishtime.getTimeInMillis();
}
ThreadPool.schedule(new stopSellingTickets(), _enddate - System.currentTimeMillis() - (10 * MINUTE));
ThreadPool.schedule(new finishLottery(), _enddate - System.currentTimeMillis());
final long endDate = _enddate - System.currentTimeMillis();
ThreadPool.schedule(new stopSellingTickets(), Math.max(endDate - (10 * MINUTE), 0));
ThreadPool.schedule(new finishLottery(), Math.max(endDate, 0));
try (Connection con = DatabaseFactory.getConnection();
PreparedStatement ps = con.prepareStatement(INSERT_LOTTERY))
@@ -513,6 +509,11 @@ public class Lottery
return res;
}
public static Lottery getInstance()
{
return SingletonHolder.INSTANCE;
}
private static class SingletonHolder
{
protected static final Lottery INSTANCE = new Lottery();