Make use of existing TimeStamp getRemaining method.

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java

@@ -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);
 		}
 	}
 }

L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java

@@ -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);
 		}
 	}
 }

L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java

@@ -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);
 		}
 	}
 }

L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java

@@ -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);
 		}
 	}
 }

L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java

@@ -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);
 		}
 	}
 }

L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java

@@ -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);
 		}
 	}
 }

L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java

@@ -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);
 		}
 	}
 }

L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java

@@ -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);
 		}
 	}
 }

L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java

@@ -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);
 		}
 	}
 }

L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java

@@ -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);
 		}
 	}
 }

L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java

@@ -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);
 		}
 	}
 }

L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java

@@ -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);
 		}
 	}
 }

L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/Timestamp.java

@@ -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>

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Timestamp.java

@@ -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>

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java

@@ -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);
 		}
 	}
 }

L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java

@@ -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);
 		}
 	}
 }

L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java

@@ -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);
 		}
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java

@@ -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);
 		}
 	}
 }

L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java

@@ -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);
 		}
 	}
 }

L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java

@@ -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);
 		}
 	}
 }

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java

@@ -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);
 		}
 	}
 }

L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java

@@ -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);
 		}
 	}
 }

L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java

@@ -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);
 		}
 	}
 }

L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java

@@ -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);
 		}
 	}
 }

L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java

@@ -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);
 		}
 	}
 }

L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java

@@ -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);
 		}
 	}
 }

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java

@@ -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);
 		}
 	}
 }

L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java

@@ -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);
 		}
 	}
 }

L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java

@@ -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);
 		}
 	}
 }

L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java

@@ -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);
 		}
 	}
 }

L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java

@@ -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);
 		}
 	}
 }

L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java

@@ -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);
 		}
 	}
 }