Make use of existing TimeStamp getRemaining method.

This commit is contained in:
MobiusDevelopment
2022-11-25 04:58:23 +00:00
parent bb9fbfbdde
commit d3c943349f
32 changed files with 40 additions and 65 deletions

View File

@@ -46,7 +46,6 @@ public class SkillCoolTime extends ServerPacket
@Override
public void write()
{
final long currentTime = System.currentTimeMillis();
ServerPackets.SKILL_COOL_TIME.writeId(this);
writeInt(_reuseTimestamps.size());
for (TimeStamp ts : _reuseTimestamps)
@@ -54,7 +53,7 @@ public class SkillCoolTime extends ServerPacket
writeInt(ts.getSkillId());
writeInt(ts.getSkillLevel());
writeInt((int) ts.getReuse() / 1000);
writeInt((int) Math.max(ts.getStamp() - currentTime, 0) / 1000);
writeInt((int) ts.getRemaining() / 1000);
}
}
}

View File

@@ -46,7 +46,6 @@ public class SkillCoolTime extends ServerPacket
@Override
public void write()
{
final long currentTime = System.currentTimeMillis();
ServerPackets.SKILL_COOL_TIME.writeId(this);
writeInt(_reuseTimestamps.size());
for (TimeStamp ts : _reuseTimestamps)
@@ -54,7 +53,7 @@ public class SkillCoolTime extends ServerPacket
writeInt(ts.getSkillId());
writeInt(ts.getSkillLevel());
writeInt((int) ts.getReuse() / 1000);
writeInt((int) Math.max(ts.getStamp() - currentTime, 0) / 1000);
writeInt((int) ts.getRemaining() / 1000);
}
}
}

View File

@@ -46,7 +46,6 @@ public class SkillCoolTime extends ServerPacket
@Override
public void write()
{
final long currentTime = System.currentTimeMillis();
ServerPackets.SKILL_COOL_TIME.writeId(this);
writeInt(_reuseTimestamps.size());
for (TimeStamp ts : _reuseTimestamps)
@@ -54,7 +53,7 @@ public class SkillCoolTime extends ServerPacket
writeInt(ts.getSkillId());
writeInt(ts.getSkillLevel());
writeInt((int) ts.getReuse() / 1000);
writeInt((int) Math.max(ts.getStamp() - currentTime, 0) / 1000);
writeInt((int) ts.getRemaining() / 1000);
}
}
}

View File

@@ -46,7 +46,6 @@ public class SkillCoolTime extends ServerPacket
@Override
public void write()
{
final long currentTime = System.currentTimeMillis();
ServerPackets.SKILL_COOL_TIME.writeId(this);
writeInt(_reuseTimestamps.size());
for (TimeStamp ts : _reuseTimestamps)
@@ -54,7 +53,7 @@ public class SkillCoolTime extends ServerPacket
writeInt(ts.getSkillId());
writeInt(ts.getSkillLevel());
writeInt((int) ts.getReuse() / 1000);
writeInt((int) Math.max(ts.getStamp() - currentTime, 0) / 1000);
writeInt((int) ts.getRemaining() / 1000);
}
}
}

View File

@@ -46,7 +46,6 @@ public class SkillCoolTime extends ServerPacket
@Override
public void write()
{
final long currentTime = System.currentTimeMillis();
ServerPackets.SKILL_COOL_TIME.writeId(this);
writeInt(_reuseTimestamps.size());
for (TimeStamp ts : _reuseTimestamps)
@@ -54,7 +53,7 @@ public class SkillCoolTime extends ServerPacket
writeInt(ts.getSkillId());
writeInt(ts.getSkillLevel());
writeInt((int) ts.getReuse() / 1000);
writeInt((int) Math.max(ts.getStamp() - currentTime, 0) / 1000);
writeInt((int) ts.getRemaining() / 1000);
}
}
}

View File

@@ -46,7 +46,6 @@ public class SkillCoolTime extends ServerPacket
@Override
public void write()
{
final long currentTime = System.currentTimeMillis();
ServerPackets.SKILL_COOL_TIME.writeId(this);
writeInt(_reuseTimestamps.size());
for (TimeStamp ts : _reuseTimestamps)
@@ -54,7 +53,7 @@ public class SkillCoolTime extends ServerPacket
writeInt(ts.getSkillId());
writeInt(ts.getSkillLevel());
writeInt((int) ts.getReuse() / 1000);
writeInt((int) Math.max(ts.getStamp() - currentTime, 0) / 1000);
writeInt((int) ts.getRemaining() / 1000);
}
}
}

View File

@@ -46,7 +46,6 @@ public class SkillCoolTime extends ServerPacket
@Override
public void write()
{
final long currentTime = System.currentTimeMillis();
ServerPackets.SKILL_COOL_TIME.writeId(this);
writeInt(_reuseTimestamps.size());
for (TimeStamp ts : _reuseTimestamps)
@@ -54,7 +53,7 @@ public class SkillCoolTime extends ServerPacket
writeInt(ts.getSkillId());
writeInt(ts.getSkillLevel());
writeInt((int) ts.getReuse() / 1000);
writeInt((int) Math.max(ts.getStamp() - currentTime, 0) / 1000);
writeInt((int) ts.getRemaining() / 1000);
}
}
}

View File

@@ -46,7 +46,6 @@ public class SkillCoolTime extends ServerPacket
@Override
public void write()
{
final long currentTime = System.currentTimeMillis();
ServerPackets.SKILL_COOL_TIME.writeId(this);
writeInt(_reuseTimestamps.size());
for (TimeStamp ts : _reuseTimestamps)
@@ -54,7 +53,7 @@ public class SkillCoolTime extends ServerPacket
writeInt(ts.getSkillId());
writeInt(ts.getSkillLevel());
writeInt((int) ts.getReuse() / 1000);
writeInt((int) Math.max(ts.getStamp() - currentTime, 0) / 1000);
writeInt((int) ts.getRemaining() / 1000);
}
}
}

View File

@@ -46,7 +46,6 @@ public class SkillCoolTime extends ServerPacket
@Override
public void write()
{
final long currentTime = System.currentTimeMillis();
ServerPackets.SKILL_COOL_TIME.writeId(this);
writeInt(_reuseTimestamps.size());
for (TimeStamp ts : _reuseTimestamps)
@@ -54,7 +53,7 @@ public class SkillCoolTime extends ServerPacket
writeInt(ts.getSkillId());
writeInt(ts.getSkillLevel());
writeInt((int) ts.getReuse() / 1000);
writeInt((int) Math.max(ts.getStamp() - currentTime, 0) / 1000);
writeInt((int) ts.getRemaining() / 1000);
}
}
}

View File

@@ -46,7 +46,6 @@ public class SkillCoolTime extends ServerPacket
@Override
public void write()
{
final long currentTime = System.currentTimeMillis();
ServerPackets.SKILL_COOL_TIME.writeId(this);
writeInt(_reuseTimestamps.size());
for (TimeStamp ts : _reuseTimestamps)
@@ -54,7 +53,7 @@ public class SkillCoolTime extends ServerPacket
writeInt(ts.getSkillId());
writeInt(ts.getSkillLevel());
writeInt((int) ts.getReuse() / 1000);
writeInt((int) Math.max(ts.getStamp() - currentTime, 0) / 1000);
writeInt((int) ts.getRemaining() / 1000);
}
}
}

View File

@@ -46,7 +46,6 @@ public class SkillCoolTime extends ServerPacket
@Override
public void write()
{
final long currentTime = System.currentTimeMillis();
ServerPackets.SKILL_COOL_TIME.writeId(this);
writeInt(_reuseTimestamps.size());
for (TimeStamp ts : _reuseTimestamps)
@@ -54,7 +53,7 @@ public class SkillCoolTime extends ServerPacket
writeInt(ts.getSkillId());
writeInt(ts.getSkillLevel());
writeInt((int) ts.getReuse() / 1000);
writeInt((int) Math.max(ts.getStamp() - currentTime, 0) / 1000);
writeInt((int) ts.getRemaining() / 1000);
}
}
}

View File

@@ -46,7 +46,6 @@ public class SkillCoolTime extends ServerPacket
@Override
public void write()
{
final long currentTime = System.currentTimeMillis();
ServerPackets.SKILL_COOL_TIME.writeId(this);
writeInt(_reuseTimestamps.size());
for (TimeStamp ts : _reuseTimestamps)
@@ -54,7 +53,7 @@ public class SkillCoolTime extends ServerPacket
writeInt(ts.getSkillId());
writeInt(ts.getSkillLevel());
writeInt((int) ts.getReuse() / 1000);
writeInt((int) Math.max(ts.getStamp() - currentTime, 0) / 1000);
writeInt((int) ts.getRemaining() / 1000);
}
}
}

View File

@@ -16,7 +16,6 @@
*/
package org.l2jmobius.gameserver.model;
/**
* Simple class containing all necessary information to maintain<br>
* valid time stamps and reuse for skills and items reuse upon re-login.<br>

View File

@@ -16,7 +16,6 @@
*/
package org.l2jmobius.gameserver.model;
/**
* Simple class containing all necessary information to maintain<br>
* valid time stamps and reuse for skills and items reuse upon re-login.<br>

View File

@@ -16,7 +16,8 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
import org.l2jmobius.gameserver.model.Timestamp;
import org.l2jmobius.gameserver.model.actor.Player;
@@ -28,17 +29,22 @@ import org.l2jmobius.gameserver.network.ServerPackets;
*/
public class SkillCoolTime extends ServerPacket
{
public Collection<Timestamp> _reuseTimestamps;
private final List<Timestamp> _reuseTimestamps = new LinkedList<>();
public SkillCoolTime(Player player)
{
_reuseTimestamps = player.getReuseTimeStamps();
for (Timestamp ts : player.getReuseTimeStamps())
{
if (ts.hasNotPassed())
{
_reuseTimestamps.add(ts);
}
}
}
@Override
public void write()
{
final long currentTime = System.currentTimeMillis();
ServerPackets.SKILL_COOL_TIME.writeId(this);
writeInt(_reuseTimestamps.size());
for (Timestamp ts : _reuseTimestamps)
@@ -46,7 +52,7 @@ public class SkillCoolTime extends ServerPacket
writeInt(ts.getSkillId());
writeInt(ts.getSkillLevel());
writeInt((int) ts.getReuse() / 1000);
writeInt((int) Math.max(ts.getStamp() - currentTime, 0) / 1000);
writeInt((int) ts.getRemaining() / 1000);
}
}
}

View File

@@ -45,7 +45,6 @@ public class SkillCoolTime extends ServerPacket
@Override
public void write()
{
final long currentTime = System.currentTimeMillis();
ServerPackets.SKILL_COOL_TIME.writeId(this);
writeInt(_reuseTimestamps.size());
for (TimeStamp ts : _reuseTimestamps)
@@ -53,7 +52,7 @@ public class SkillCoolTime extends ServerPacket
writeInt(ts.getSkillId());
writeInt(ts.getSkillLevel());
writeInt((int) ts.getReuse() / 1000);
writeInt((int) Math.max(ts.getStamp() - currentTime, 0) / 1000);
writeInt((int) ts.getRemaining() / 1000);
}
}
}

View File

@@ -45,7 +45,6 @@ public class SkillCoolTime extends ServerPacket
@Override
public void write()
{
final long currentTime = System.currentTimeMillis();
ServerPackets.SKILL_COOL_TIME.writeId(this);
writeInt(_reuseTimestamps.size());
for (TimeStamp ts : _reuseTimestamps)
@@ -53,7 +52,7 @@ public class SkillCoolTime extends ServerPacket
writeInt(ts.getSkillId());
writeInt(ts.getSkillLevel());
writeInt((int) ts.getReuse() / 1000);
writeInt((int) Math.max(ts.getStamp() - currentTime, 0) / 1000);
writeInt((int) ts.getRemaining() / 1000);
}
}
}

View File

@@ -45,7 +45,6 @@ public class SkillCoolTime extends ServerPacket
@Override
public void write()
{
final long currentTime = System.currentTimeMillis();
ServerPackets.SKILL_COOL_TIME.writeId(this);
writeInt(_reuseTimestamps.size());
for (TimeStamp ts : _reuseTimestamps)
@@ -53,7 +52,7 @@ public class SkillCoolTime extends ServerPacket
writeInt(ts.getSkillId());
writeInt(ts.getSkillLevel());
writeInt((int) ts.getReuse() / 1000);
writeInt((int) Math.max(ts.getStamp() - currentTime, 0) / 1000);
writeInt((int) ts.getRemaining() / 1000);
}
}
}

View File

@@ -46,7 +46,6 @@ public class SkillCoolTime extends ServerPacket
@Override
public void write()
{
final long currentTime = System.currentTimeMillis();
ServerPackets.SKILL_COOL_TIME.writeId(this);
writeInt(_reuseTimestamps.size());
for (TimeStamp ts : _reuseTimestamps)
@@ -54,7 +53,7 @@ public class SkillCoolTime extends ServerPacket
writeInt(ts.getSkillId());
writeInt(ts.getSkillLevel());
writeInt((int) ts.getReuse() / 1000);
writeInt((int) Math.max(ts.getStamp() - currentTime, 0) / 1000);
writeInt((int) ts.getRemaining() / 1000);
}
}
}

View File

@@ -46,7 +46,6 @@ public class SkillCoolTime extends ServerPacket
@Override
public void write()
{
final long currentTime = System.currentTimeMillis();
ServerPackets.SKILL_COOL_TIME.writeId(this);
writeInt(_reuseTimestamps.size());
for (TimeStamp ts : _reuseTimestamps)
@@ -54,7 +53,7 @@ public class SkillCoolTime extends ServerPacket
writeInt(ts.getSkillId());
writeInt(ts.getSkillLevel());
writeInt((int) ts.getReuse() / 1000);
writeInt((int) Math.max(ts.getStamp() - currentTime, 0) / 1000);
writeInt((int) ts.getRemaining() / 1000);
}
}
}

View File

@@ -46,7 +46,6 @@ public class SkillCoolTime extends ServerPacket
@Override
public void write()
{
final long currentTime = System.currentTimeMillis();
ServerPackets.SKILL_COOL_TIME.writeId(this);
writeInt(_reuseTimestamps.size());
for (TimeStamp ts : _reuseTimestamps)
@@ -54,7 +53,7 @@ public class SkillCoolTime extends ServerPacket
writeInt(ts.getSkillId());
writeInt(ts.getSkillLevel());
writeInt((int) ts.getReuse() / 1000);
writeInt((int) Math.max(ts.getStamp() - currentTime, 0) / 1000);
writeInt((int) ts.getRemaining() / 1000);
}
}
}

View File

@@ -46,7 +46,6 @@ public class SkillCoolTime extends ServerPacket
@Override
public void write()
{
final long currentTime = System.currentTimeMillis();
ServerPackets.SKILL_COOL_TIME.writeId(this);
writeInt(_reuseTimestamps.size());
for (TimeStamp ts : _reuseTimestamps)
@@ -54,7 +53,7 @@ public class SkillCoolTime extends ServerPacket
writeInt(ts.getSkillId());
writeInt(ts.getSkillLevel());
writeInt((int) ts.getReuse() / 1000);
writeInt((int) Math.max(ts.getStamp() - currentTime, 0) / 1000);
writeInt((int) ts.getRemaining() / 1000);
}
}
}

View File

@@ -46,7 +46,6 @@ public class SkillCoolTime extends ServerPacket
@Override
public void write()
{
final long currentTime = System.currentTimeMillis();
ServerPackets.SKILL_COOL_TIME.writeId(this);
writeInt(_reuseTimestamps.size());
for (TimeStamp ts : _reuseTimestamps)
@@ -54,7 +53,7 @@ public class SkillCoolTime extends ServerPacket
writeInt(ts.getSkillId());
writeInt(ts.getSkillLevel());
writeInt((int) ts.getReuse() / 1000);
writeInt((int) Math.max(ts.getStamp() - currentTime, 0) / 1000);
writeInt((int) ts.getRemaining() / 1000);
}
}
}

View File

@@ -46,7 +46,6 @@ public class SkillCoolTime extends ServerPacket
@Override
public void write()
{
final long currentTime = System.currentTimeMillis();
ServerPackets.SKILL_COOL_TIME.writeId(this);
writeInt(_reuseTimestamps.size());
for (TimeStamp ts : _reuseTimestamps)
@@ -54,7 +53,7 @@ public class SkillCoolTime extends ServerPacket
writeInt(ts.getSkillId());
writeInt(ts.getSkillLevel());
writeInt((int) ts.getReuse() / 1000);
writeInt((int) Math.max(ts.getStamp() - currentTime, 0) / 1000);
writeInt((int) ts.getRemaining() / 1000);
}
}
}

View File

@@ -46,7 +46,6 @@ public class SkillCoolTime extends ServerPacket
@Override
public void write()
{
final long currentTime = System.currentTimeMillis();
ServerPackets.SKILL_COOL_TIME.writeId(this);
writeInt(_reuseTimestamps.size());
for (TimeStamp ts : _reuseTimestamps)
@@ -54,7 +53,7 @@ public class SkillCoolTime extends ServerPacket
writeInt(ts.getSkillId());
writeInt(ts.getSkillLevel());
writeInt((int) ts.getReuse() / 1000);
writeInt((int) Math.max(ts.getStamp() - currentTime, 0) / 1000);
writeInt((int) ts.getRemaining() / 1000);
}
}
}

View File

@@ -46,7 +46,6 @@ public class SkillCoolTime extends ServerPacket
@Override
public void write()
{
final long currentTime = System.currentTimeMillis();
ServerPackets.SKILL_COOL_TIME.writeId(this);
writeInt(_reuseTimestamps.size());
for (TimeStamp ts : _reuseTimestamps)
@@ -54,7 +53,7 @@ public class SkillCoolTime extends ServerPacket
writeInt(ts.getSkillId());
writeInt(ts.getSkillLevel());
writeInt((int) ts.getReuse() / 1000);
writeInt((int) Math.max(ts.getStamp() - currentTime, 0) / 1000);
writeInt((int) ts.getRemaining() / 1000);
}
}
}

View File

@@ -46,7 +46,6 @@ public class SkillCoolTime extends ServerPacket
@Override
public void write()
{
final long currentTime = System.currentTimeMillis();
ServerPackets.SKILL_COOL_TIME.writeId(this);
writeInt(_reuseTimestamps.size());
for (TimeStamp ts : _reuseTimestamps)
@@ -54,7 +53,7 @@ public class SkillCoolTime extends ServerPacket
writeInt(ts.getSkillId());
writeInt(ts.getSkillLevel());
writeInt((int) ts.getReuse() / 1000);
writeInt((int) Math.max(ts.getStamp() - currentTime, 0) / 1000);
writeInt((int) ts.getRemaining() / 1000);
}
}
}

View File

@@ -46,7 +46,6 @@ public class SkillCoolTime extends ServerPacket
@Override
public void write()
{
final long currentTime = System.currentTimeMillis();
ServerPackets.SKILL_COOL_TIME.writeId(this);
writeInt(_reuseTimestamps.size());
for (TimeStamp ts : _reuseTimestamps)
@@ -54,7 +53,7 @@ public class SkillCoolTime extends ServerPacket
writeInt(ts.getSkillId());
writeInt(ts.getSkillLevel());
writeInt((int) ts.getReuse() / 1000);
writeInt((int) Math.max(ts.getStamp() - currentTime, 0) / 1000);
writeInt((int) ts.getRemaining() / 1000);
}
}
}

View File

@@ -46,7 +46,6 @@ public class SkillCoolTime extends ServerPacket
@Override
public void write()
{
final long currentTime = System.currentTimeMillis();
ServerPackets.SKILL_COOL_TIME.writeId(this);
writeInt(_reuseTimestamps.size());
for (TimeStamp ts : _reuseTimestamps)
@@ -54,7 +53,7 @@ public class SkillCoolTime extends ServerPacket
writeInt(ts.getSkillId());
writeInt(ts.getSkillLevel());
writeInt((int) ts.getReuse() / 1000);
writeInt((int) Math.max(ts.getStamp() - currentTime, 0) / 1000);
writeInt((int) ts.getRemaining() / 1000);
}
}
}

View File

@@ -46,7 +46,6 @@ public class SkillCoolTime extends ServerPacket
@Override
public void write()
{
final long currentTime = System.currentTimeMillis();
ServerPackets.SKILL_COOL_TIME.writeId(this);
writeInt(_reuseTimestamps.size());
for (TimeStamp ts : _reuseTimestamps)
@@ -54,7 +53,7 @@ public class SkillCoolTime extends ServerPacket
writeInt(ts.getSkillId());
writeInt(ts.getSkillLevel());
writeInt((int) ts.getReuse() / 1000);
writeInt((int) Math.max(ts.getStamp() - currentTime, 0) / 1000);
writeInt((int) ts.getRemaining() / 1000);
}
}
}

View File

@@ -46,7 +46,6 @@ public class SkillCoolTime extends ServerPacket
@Override
public void write()
{
final long currentTime = System.currentTimeMillis();
ServerPackets.SKILL_COOL_TIME.writeId(this);
writeInt(_reuseTimestamps.size());
for (TimeStamp ts : _reuseTimestamps)
@@ -54,7 +53,7 @@ public class SkillCoolTime extends ServerPacket
writeInt(ts.getSkillId());
writeInt(ts.getSkillLevel());
writeInt((int) ts.getReuse() / 1000);
writeInt((int) Math.max(ts.getStamp() - currentTime, 0) / 1000);
writeInt((int) ts.getRemaining() / 1000);
}
}
}

View File

@@ -46,7 +46,6 @@ public class SkillCoolTime extends ServerPacket
@Override
public void write()
{
final long currentTime = System.currentTimeMillis();
ServerPackets.SKILL_COOL_TIME.writeId(this);
writeInt(_reuseTimestamps.size());
for (TimeStamp ts : _reuseTimestamps)
@@ -54,7 +53,7 @@ public class SkillCoolTime extends ServerPacket
writeInt(ts.getSkillId());
writeInt(ts.getSkillLevel());
writeInt((int) ts.getReuse() / 1000);
writeInt((int) Math.max(ts.getStamp() - currentTime, 0) / 1000);
writeInt((int) ts.getRemaining() / 1000);
}
}
}