From a5f2203a9f557c8704916e93dd83dbf2b84aae42 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Tue, 5 Nov 2019 11:01:53 +0000 Subject: [PATCH] Reuse System.currentTimeMillis in player restore whiles. --- .../model/actor/instance/PlayerInstance.java | 14 ++++++-------- .../model/actor/instance/PlayerInstance.java | 14 ++++++-------- .../model/actor/instance/PlayerInstance.java | 14 ++++++-------- .../model/actor/instance/PlayerInstance.java | 14 ++++++-------- .../model/actor/instance/PlayerInstance.java | 14 ++++++-------- .../model/actor/instance/PlayerInstance.java | 14 ++++++-------- .../model/actor/instance/PlayerInstance.java | 14 ++++++-------- .../model/actor/instance/PlayerInstance.java | 14 ++++++-------- .../model/actor/instance/PlayerInstance.java | 5 +++-- .../model/actor/instance/PlayerInstance.java | 10 ++++------ .../model/actor/instance/PlayerInstance.java | 10 ++++------ .../model/actor/instance/PlayerInstance.java | 14 ++++++-------- .../model/actor/instance/PlayerInstance.java | 14 ++++++-------- .../model/actor/instance/PlayerInstance.java | 14 ++++++-------- .../model/actor/instance/PlayerInstance.java | 14 ++++++-------- .../model/actor/instance/PlayerInstance.java | 14 ++++++-------- .../model/actor/instance/PlayerInstance.java | 14 ++++++-------- .../model/actor/instance/PlayerInstance.java | 14 ++++++-------- 18 files changed, 101 insertions(+), 134 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index e6b9ced7ac..3d992c66c2 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -7660,6 +7660,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"); @@ -7673,7 +7674,7 @@ public class PlayerInstance extends Playable continue; } - final long time = systime - System.currentTimeMillis(); + final long time = systime - currentTime; if (time > 10) { disableSkill(skill, time); @@ -7718,16 +7719,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; @@ -7742,8 +7741,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); @@ -7801,6 +7799,7 @@ public class PlayerInstance extends Playable { int slot; int symbolId; + final long currentTime = System.currentTimeMillis(); while (rset.next()) { slot = rset.getInt("slot"); @@ -7820,7 +7819,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) { @@ -7829,7 +7827,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; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index a6b1d28572..aef40402b4 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -7667,6 +7667,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"); @@ -7680,7 +7681,7 @@ public class PlayerInstance extends Playable continue; } - final long time = systime - System.currentTimeMillis(); + final long time = systime - currentTime; if (time > 10) { disableSkill(skill, time); @@ -7725,16 +7726,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; @@ -7749,8 +7748,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); @@ -7808,6 +7806,7 @@ public class PlayerInstance extends Playable { int slot; int symbolId; + final long currentTime = System.currentTimeMillis(); while (rset.next()) { slot = rset.getInt("slot"); @@ -7827,7 +7826,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) { @@ -7836,7 +7834,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; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 9352269d24..f6f770f365 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -7669,6 +7669,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"); @@ -7682,7 +7683,7 @@ public class PlayerInstance extends Playable continue; } - final long time = systime - System.currentTimeMillis(); + final long time = systime - currentTime; if (time > 10) { disableSkill(skill, time); @@ -7727,16 +7728,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; @@ -7751,8 +7750,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); @@ -7810,6 +7808,7 @@ public class PlayerInstance extends Playable { int slot; int symbolId; + final long currentTime = System.currentTimeMillis(); while (rset.next()) { slot = rset.getInt("slot"); @@ -7829,7 +7828,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) { @@ -7838,7 +7836,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; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index e37530ac5a..d9920e9358 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -7664,6 +7664,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"); @@ -7677,7 +7678,7 @@ public class PlayerInstance extends Playable continue; } - final long time = systime - System.currentTimeMillis(); + final long time = systime - currentTime; if (time > 10) { disableSkill(skill, time); @@ -7722,16 +7723,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; @@ -7746,8 +7745,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); @@ -7805,6 +7803,7 @@ public class PlayerInstance extends Playable { int slot; int symbolId; + final long currentTime = System.currentTimeMillis(); while (rset.next()) { slot = rset.getInt("slot"); @@ -7824,7 +7823,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) { @@ -7833,7 +7831,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; diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 77b65efa4d..cab7773285 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -7642,6 +7642,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"); @@ -7655,7 +7656,7 @@ public class PlayerInstance extends Playable continue; } - final long time = systime - System.currentTimeMillis(); + final long time = systime - currentTime; if (time > 10) { disableSkill(skill, time); @@ -7700,16 +7701,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; @@ -7724,8 +7723,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); @@ -7783,6 +7781,7 @@ public class PlayerInstance extends Playable { int slot; int symbolId; + final long currentTime = System.currentTimeMillis(); while (rset.next()) { slot = rset.getInt("slot"); @@ -7802,7 +7801,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) { @@ -7811,7 +7809,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; diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 40001cf652..d3b253e6ac 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -7642,6 +7642,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"); @@ -7655,7 +7656,7 @@ public class PlayerInstance extends Playable continue; } - final long time = systime - System.currentTimeMillis(); + final long time = systime - currentTime; if (time > 10) { disableSkill(skill, time); @@ -7700,16 +7701,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; @@ -7724,8 +7723,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); @@ -7783,6 +7781,7 @@ public class PlayerInstance extends Playable { int slot; int symbolId; + final long currentTime = System.currentTimeMillis(); while (rset.next()) { slot = rset.getInt("slot"); @@ -7802,7 +7801,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) { @@ -7811,7 +7809,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; diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 277f5a0068..400e3daebe 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -7643,6 +7643,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"); @@ -7656,7 +7657,7 @@ public class PlayerInstance extends Playable continue; } - final long time = systime - System.currentTimeMillis(); + final long time = systime - currentTime; if (time > 10) { disableSkill(skill, time); @@ -7701,16 +7702,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; @@ -7725,8 +7724,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); @@ -7784,6 +7782,7 @@ public class PlayerInstance extends Playable { int slot; int symbolId; + final long currentTime = System.currentTimeMillis(); while (rset.next()) { slot = rset.getInt("slot"); @@ -7803,7 +7802,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) { @@ -7812,7 +7810,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; diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 54d5b5e39a..0789b0e71b 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -7604,6 +7604,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"); @@ -7617,7 +7618,7 @@ public class PlayerInstance extends Playable continue; } - final long time = systime - System.currentTimeMillis(); + final long time = systime - currentTime; if (time > 10) { disableSkill(skill, time); @@ -7662,16 +7663,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; @@ -7686,8 +7685,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); @@ -7745,6 +7743,7 @@ public class PlayerInstance extends Playable { int slot; int symbolId; + final long currentTime = System.currentTimeMillis(); while (rset.next()) { slot = rset.getInt("slot"); @@ -7764,7 +7763,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) { @@ -7773,7 +7771,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; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 6690e8ec78..ef6b785214 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -10139,6 +10139,7 @@ public class PlayerInstance extends Playable { PreparedStatement statement; ResultSet rset; + final long currentTime = System.currentTimeMillis(); // Restore Type 0 These skill were still in effect on the character upon logout. Some of which were self casted and might still have had a long reuse delay which also is restored. statement = con.prepareStatement(RESTORE_SKILL_SAVE); @@ -10178,7 +10179,7 @@ public class PlayerInstance extends Playable } } - final long remainingTime = systime - System.currentTimeMillis(); + final long remainingTime = systime - currentTime; if (remainingTime > 10) { final Skill skill = SkillTable.getInstance().getInfo(skillId, skillLvl); @@ -10208,7 +10209,7 @@ public class PlayerInstance extends Playable final long reuseDelay = rset.getLong("reuse_delay"); final long systime = rset.getLong("systime"); - final long remainingTime = systime - System.currentTimeMillis(); + final long remainingTime = systime - currentTime; if (remainingTime > 0) { final Skill skill = SkillTable.getInstance().getInfo(skillId, skillLvl); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index cea30608bc..e8c7649d72 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -7971,6 +7971,7 @@ public class PlayerInstance extends Playable ps.setInt(2, _classIndex); try (ResultSet rs = ps.executeQuery()) { + final long currentTime = System.currentTimeMillis(); while (rs.next()) { final int remainingTime = rs.getInt("remaining_time"); @@ -7984,7 +7985,7 @@ public class PlayerInstance extends Playable continue; } - final long time = systime - System.currentTimeMillis(); + final long time = systime - currentTime; if (time > 10) { disableSkill(skill, time); @@ -8029,16 +8030,14 @@ public class PlayerInstance extends Playable try (ResultSet rs = ps.executeQuery()) { int itemId; - @SuppressWarnings("unused") - int itemObjId; long reuseDelay; long systime; boolean isInInventory; long remainingTime; + final long currentTime = System.currentTimeMillis(); while (rs.next()) { itemId = rs.getInt("itemId"); - itemObjId = rs.getInt("itemObjId"); reuseDelay = rs.getLong("reuseDelay"); systime = rs.getLong("systime"); isInInventory = true; @@ -8053,8 +8052,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); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 53b9dda308..5e3d1047fd 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -7849,6 +7849,7 @@ public class PlayerInstance extends Playable ps.setInt(2, _classIndex); try (ResultSet rs = ps.executeQuery()) { + final long currentTime = System.currentTimeMillis(); while (rs.next()) { final int remainingTime = rs.getInt("remaining_time"); @@ -7862,7 +7863,7 @@ public class PlayerInstance extends Playable continue; } - final long time = systime - System.currentTimeMillis(); + final long time = systime - currentTime; if (time > 10) { disableSkill(skill, time); @@ -7907,16 +7908,14 @@ public class PlayerInstance extends Playable try (ResultSet rs = ps.executeQuery()) { int itemId; - @SuppressWarnings("unused") - int itemObjId; long reuseDelay; long systime; boolean isInInventory; long remainingTime; + final long currentTime = System.currentTimeMillis(); while (rs.next()) { itemId = rs.getInt("itemId"); - itemObjId = rs.getInt("itemObjId"); reuseDelay = rs.getLong("reuseDelay"); systime = rs.getLong("systime"); isInInventory = true; @@ -7931,8 +7930,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); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index bbe9016159..f244da4615 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -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; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 73d08b2914..57d0c46b2c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -7632,6 +7632,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"); @@ -7645,7 +7646,7 @@ public class PlayerInstance extends Playable continue; } - final long time = systime - System.currentTimeMillis(); + final long time = systime - currentTime; if (time > 10) { disableSkill(skill, time); @@ -7690,16 +7691,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; @@ -7714,8 +7713,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); @@ -7773,6 +7771,7 @@ public class PlayerInstance extends Playable { int slot; int symbolId; + final long currentTime = System.currentTimeMillis(); while (rset.next()) { slot = rset.getInt("slot"); @@ -7792,7 +7791,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) { @@ -7801,7 +7799,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; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 858950b02e..0802b4f961 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -7617,6 +7617,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"); @@ -7630,7 +7631,7 @@ public class PlayerInstance extends Playable continue; } - final long time = systime - System.currentTimeMillis(); + final long time = systime - currentTime; if (time > 10) { disableSkill(skill, time); @@ -7675,16 +7676,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; @@ -7699,8 +7698,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); @@ -7758,6 +7756,7 @@ public class PlayerInstance extends Playable { int slot; int symbolId; + final long currentTime = System.currentTimeMillis(); while (rset.next()) { slot = rset.getInt("slot"); @@ -7777,7 +7776,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) { @@ -7786,7 +7784,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; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 8c00ee3161..ec6f54e690 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -7644,6 +7644,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"); @@ -7657,7 +7658,7 @@ public class PlayerInstance extends Playable continue; } - final long time = systime - System.currentTimeMillis(); + final long time = systime - currentTime; if (time > 10) { disableSkill(skill, time); @@ -7702,16 +7703,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; @@ -7726,8 +7725,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); @@ -7785,6 +7783,7 @@ public class PlayerInstance extends Playable { int slot; int symbolId; + final long currentTime = System.currentTimeMillis(); while (rset.next()) { slot = rset.getInt("slot"); @@ -7804,7 +7803,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) { @@ -7813,7 +7811,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; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index df063a2a04..fe048e89dd 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -7644,6 +7644,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"); @@ -7657,7 +7658,7 @@ public class PlayerInstance extends Playable continue; } - final long time = systime - System.currentTimeMillis(); + final long time = systime - currentTime; if (time > 10) { disableSkill(skill, time); @@ -7702,16 +7703,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; @@ -7726,8 +7725,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); @@ -7785,6 +7783,7 @@ public class PlayerInstance extends Playable { int slot; int symbolId; + final long currentTime = System.currentTimeMillis(); while (rset.next()) { slot = rset.getInt("slot"); @@ -7804,7 +7803,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) { @@ -7813,7 +7811,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; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index e4be35c9e1..7c2135110e 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -7543,6 +7543,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"); @@ -7556,7 +7557,7 @@ public class PlayerInstance extends Playable continue; } - final long time = systime - System.currentTimeMillis(); + final long time = systime - currentTime; if (time > 10) { disableSkill(skill, time); @@ -7601,16 +7602,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; @@ -7625,8 +7624,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); @@ -7684,6 +7682,7 @@ public class PlayerInstance extends Playable { int slot; int symbolId; + final long currentTime = System.currentTimeMillis(); while (rset.next()) { slot = rset.getInt("slot"); @@ -7703,7 +7702,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) { @@ -7712,7 +7710,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; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index aa3d6a21b6..a6491037f5 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -7632,6 +7632,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"); @@ -7645,7 +7646,7 @@ public class PlayerInstance extends Playable continue; } - final long time = systime - System.currentTimeMillis(); + final long time = systime - currentTime; if (time > 10) { disableSkill(skill, time); @@ -7690,16 +7691,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; @@ -7714,8 +7713,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); @@ -7773,6 +7771,7 @@ public class PlayerInstance extends Playable { int slot; int symbolId; + final long currentTime = System.currentTimeMillis(); while (rset.next()) { slot = rset.getInt("slot"); @@ -7792,7 +7791,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) { @@ -7801,7 +7799,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;