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

Reuse System.currentTimeMillis in player restore whiles.

Browse Source
This commit is contained in:
MobiusDevelopment
2019-11-05 11:01:53 +00:00
parent 7ea755f7c6
commit a5f2203a9f
18 changed files with 101 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@@ -7631,6 +7631,7 @@ public class PlayerInstance extends Playable
statement.setInt(2, _classIndex);
try (ResultSet rset = statement.executeQuery())
{
final long currentTime = System.currentTimeMillis();
while (rset.next())
{
final int remainingTime = rset.getInt("remaining_time");
@@ -7644,7 +7645,7 @@ public class PlayerInstance extends Playable
continue;
}
final long time = systime - System.currentTimeMillis();
final long time = systime - currentTime;
if (time > 10)
{
disableSkill(skill, time);
@@ -7689,16 +7690,14 @@ public class PlayerInstance extends Playable
try (ResultSet rset = statement.executeQuery())
{
int itemId;
@SuppressWarnings("unused")
int itemObjId;
long reuseDelay;
long systime;
boolean isInInventory;
long remainingTime;
final long currentTime = System.currentTimeMillis();
while (rset.next())
{
itemId = rset.getInt("itemId");
itemObjId = rset.getInt("itemObjId");
reuseDelay = rset.getLong("reuseDelay");
systime = rset.getLong("systime");
isInInventory = true;
@@ -7713,8 +7712,7 @@ public class PlayerInstance extends Playable
if ((item != null) && (item.getId() == itemId) && (item.getReuseDelay() > 0))
{
remainingTime = systime - System.currentTimeMillis();
// Hardcoded to 10 seconds.
remainingTime = systime - currentTime;
if (remainingTime > 10)
{
addTimeStampItem(item, reuseDelay, systime);
@@ -7772,6 +7770,7 @@ public class PlayerInstance extends Playable
{
int slot;
int symbolId;
final long currentTime = System.currentTimeMillis();
while (rset.next())
{
slot = rset.getInt("slot");
@@ -7791,7 +7790,6 @@ public class PlayerInstance extends Playable
// Task for henna duration
if (henna.getDuration() > 0)
{
final long currentTime = System.currentTimeMillis();
final long remainingTime = getVariables().getLong("HennaDuration" + slot, currentTime) - currentTime;
if (remainingTime < 0)
{
@@ -7800,7 +7798,7 @@ public class PlayerInstance extends Playable
}
// Add the new task.
_hennaRemoveSchedules.put(slot, ThreadPool.schedule(new HennaDurationTask(this, slot), System.currentTimeMillis() + remainingTime));
_hennaRemoveSchedules.put(slot, ThreadPool.schedule(new HennaDurationTask(this, slot), currentTime + remainingTime));
}
_henna[slot - 1] = henna;