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

Support for SkillCoolTime reuse delay groups.

Browse Source 
Thanks to Fakee.
This commit is contained in:
MobiusDevelopment
2022-12-14 22:11:24 +00:00
parent e7fb57065d
commit 6066031563
52 changed files with 182 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/TimeStamp.java
View File

@@ -53,7 +53,7 @@ public class TimeStamp
_id3 = skill.getSubLevel(); _id3 = skill.getSubLevel();
_reuse = reuse; _reuse = reuse;
_stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0; _stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0;
_group = -1; _group = skill.getReuseDelayGroup();
} }
/** /**

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

@@ -50,10 +50,13 @@ public class SkillCoolTime extends ServerPacket
writeInt(_reuseTimestamps.size()); writeInt(_reuseTimestamps.size());
for (TimeStamp ts : _reuseTimestamps) for (TimeStamp ts : _reuseTimestamps)
{ {
writeInt(ts.getSkillId()); final long reuse = ts.getReuse();
final long remaining = ts.getRemaining();
final int sharedReuseGroup = ts.getSharedReuseGroup();
writeInt(sharedReuseGroup > 0 ? sharedReuseGroup : ts.getSkillId());
writeInt(ts.getSkillLevel()); writeInt(ts.getSkillLevel());
writeInt((int) ts.getReuse() / 1000); writeInt((int) (reuse > 0 ? reuse : remaining) / 1000);
writeInt((int) ts.getRemaining() / 1000); writeInt((int) remaining / 1000);
} }
} }
} }

2
L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/TimeStamp.java
View File

@@ -53,7 +53,7 @@ public class TimeStamp
_id3 = skill.getSubLevel(); _id3 = skill.getSubLevel();
_reuse = reuse; _reuse = reuse;
_stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0; _stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0;
_group = -1; _group = skill.getReuseDelayGroup();
} }
/** /**

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

@@ -50,10 +50,13 @@ public class SkillCoolTime extends ServerPacket
writeInt(_reuseTimestamps.size()); writeInt(_reuseTimestamps.size());
for (TimeStamp ts : _reuseTimestamps) for (TimeStamp ts : _reuseTimestamps)
{ {
writeInt(ts.getSkillId()); final long reuse = ts.getReuse();
final long remaining = ts.getRemaining();
final int sharedReuseGroup = ts.getSharedReuseGroup();
writeInt(sharedReuseGroup > 0 ? sharedReuseGroup : ts.getSkillId());
writeInt(ts.getSkillLevel()); writeInt(ts.getSkillLevel());
writeInt((int) ts.getReuse() / 1000); writeInt((int) (reuse > 0 ? reuse : remaining) / 1000);
writeInt((int) ts.getRemaining() / 1000); writeInt((int) remaining / 1000);
} }
} }
} }

2
L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/TimeStamp.java
View File

@@ -53,7 +53,7 @@ public class TimeStamp
_id3 = skill.getSubLevel(); _id3 = skill.getSubLevel();
_reuse = reuse; _reuse = reuse;
_stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0; _stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0;
_group = -1; _group = skill.getReuseDelayGroup();
} }
/** /**

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

@@ -50,10 +50,13 @@ public class SkillCoolTime extends ServerPacket
writeInt(_reuseTimestamps.size()); writeInt(_reuseTimestamps.size());
for (TimeStamp ts : _reuseTimestamps) for (TimeStamp ts : _reuseTimestamps)
{ {
writeInt(ts.getSkillId()); final long reuse = ts.getReuse();
final long remaining = ts.getRemaining();
final int sharedReuseGroup = ts.getSharedReuseGroup();
writeInt(sharedReuseGroup > 0 ? sharedReuseGroup : ts.getSkillId());
writeInt(ts.getSkillLevel()); writeInt(ts.getSkillLevel());
writeInt((int) ts.getReuse() / 1000); writeInt((int) (reuse > 0 ? reuse : remaining) / 1000);
writeInt((int) ts.getRemaining() / 1000); writeInt((int) remaining / 1000);
} }
} }
} }

2
L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/TimeStamp.java
View File

@@ -53,7 +53,7 @@ public class TimeStamp
_id3 = skill.getSubLevel(); _id3 = skill.getSubLevel();
_reuse = reuse; _reuse = reuse;
_stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0; _stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0;
_group = -1; _group = skill.getReuseDelayGroup();
} }
/** /**

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

@@ -50,10 +50,13 @@ public class SkillCoolTime extends ServerPacket
writeInt(_reuseTimestamps.size()); writeInt(_reuseTimestamps.size());
for (TimeStamp ts : _reuseTimestamps) for (TimeStamp ts : _reuseTimestamps)
{ {
writeInt(ts.getSkillId()); final long reuse = ts.getReuse();
final long remaining = ts.getRemaining();
final int sharedReuseGroup = ts.getSharedReuseGroup();
writeInt(sharedReuseGroup > 0 ? sharedReuseGroup : ts.getSkillId());
writeInt(ts.getSkillLevel()); writeInt(ts.getSkillLevel());
writeInt((int) ts.getReuse() / 1000); writeInt((int) (reuse > 0 ? reuse : remaining) / 1000);
writeInt((int) ts.getRemaining() / 1000); writeInt((int) remaining / 1000);
} }
} }
} }

2
L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/TimeStamp.java
View File

@@ -53,7 +53,7 @@ public class TimeStamp
_id3 = skill.getSubLevel(); _id3 = skill.getSubLevel();
_reuse = reuse; _reuse = reuse;
_stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0; _stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0;
_group = -1; _group = skill.getReuseDelayGroup();
} }
/** /**

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

@@ -50,10 +50,13 @@ public class SkillCoolTime extends ServerPacket
writeInt(_reuseTimestamps.size()); writeInt(_reuseTimestamps.size());
for (TimeStamp ts : _reuseTimestamps) for (TimeStamp ts : _reuseTimestamps)
{ {
writeInt(ts.getSkillId()); final long reuse = ts.getReuse();
final long remaining = ts.getRemaining();
final int sharedReuseGroup = ts.getSharedReuseGroup();
writeInt(sharedReuseGroup > 0 ? sharedReuseGroup : ts.getSkillId());
writeInt(ts.getSkillLevel()); writeInt(ts.getSkillLevel());
writeInt((int) ts.getReuse() / 1000); writeInt((int) (reuse > 0 ? reuse : remaining) / 1000);
writeInt((int) ts.getRemaining() / 1000); writeInt((int) remaining / 1000);
} }
} }
} }

2
L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/TimeStamp.java
View File

@@ -53,7 +53,7 @@ public class TimeStamp
_id3 = skill.getSubLevel(); _id3 = skill.getSubLevel();
_reuse = reuse; _reuse = reuse;
_stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0; _stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0;
_group = -1; _group = skill.getReuseDelayGroup();
} }
/** /**

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

@@ -50,10 +50,13 @@ public class SkillCoolTime extends ServerPacket
writeInt(_reuseTimestamps.size()); writeInt(_reuseTimestamps.size());
for (TimeStamp ts : _reuseTimestamps) for (TimeStamp ts : _reuseTimestamps)
{ {
writeInt(ts.getSkillId()); final long reuse = ts.getReuse();
final long remaining = ts.getRemaining();
final int sharedReuseGroup = ts.getSharedReuseGroup();
writeInt(sharedReuseGroup > 0 ? sharedReuseGroup : ts.getSkillId());
writeInt(ts.getSkillLevel()); writeInt(ts.getSkillLevel());
writeInt((int) ts.getReuse() / 1000); writeInt((int) (reuse > 0 ? reuse : remaining) / 1000);
writeInt((int) ts.getRemaining() / 1000); writeInt((int) remaining / 1000);
} }
} }
} }

2
L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/TimeStamp.java
View File

@@ -53,7 +53,7 @@ public class TimeStamp
_id3 = skill.getSubLevel(); _id3 = skill.getSubLevel();
_reuse = reuse; _reuse = reuse;
_stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0; _stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0;
_group = -1; _group = skill.getReuseDelayGroup();
} }
/** /**

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

@@ -50,10 +50,13 @@ public class SkillCoolTime extends ServerPacket
writeInt(_reuseTimestamps.size()); writeInt(_reuseTimestamps.size());
for (TimeStamp ts : _reuseTimestamps) for (TimeStamp ts : _reuseTimestamps)
{ {
writeInt(ts.getSkillId()); final long reuse = ts.getReuse();
final long remaining = ts.getRemaining();
final int sharedReuseGroup = ts.getSharedReuseGroup();
writeInt(sharedReuseGroup > 0 ? sharedReuseGroup : ts.getSkillId());
writeInt(ts.getSkillLevel()); writeInt(ts.getSkillLevel());
writeInt((int) ts.getReuse() / 1000); writeInt((int) (reuse > 0 ? reuse : remaining) / 1000);
writeInt((int) ts.getRemaining() / 1000); writeInt((int) remaining / 1000);
} }
} }
} }

2
L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/TimeStamp.java
View File

@@ -53,7 +53,7 @@ public class TimeStamp
_id3 = skill.getSubLevel(); _id3 = skill.getSubLevel();
_reuse = reuse; _reuse = reuse;
_stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0; _stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0;
_group = -1; _group = skill.getReuseDelayGroup();
} }
/** /**

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

@@ -50,10 +50,13 @@ public class SkillCoolTime extends ServerPacket
writeInt(_reuseTimestamps.size()); writeInt(_reuseTimestamps.size());
for (TimeStamp ts : _reuseTimestamps) for (TimeStamp ts : _reuseTimestamps)
{ {
writeInt(ts.getSkillId()); final long reuse = ts.getReuse();
final long remaining = ts.getRemaining();
final int sharedReuseGroup = ts.getSharedReuseGroup();
writeInt(sharedReuseGroup > 0 ? sharedReuseGroup : ts.getSkillId());
writeInt(ts.getSkillLevel()); writeInt(ts.getSkillLevel());
writeInt((int) ts.getReuse() / 1000); writeInt((int) (reuse > 0 ? reuse : remaining) / 1000);
writeInt((int) ts.getRemaining() / 1000); writeInt((int) remaining / 1000);
} }
} }
} }

2
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/TimeStamp.java
View File

@@ -53,7 +53,7 @@ public class TimeStamp
_id3 = skill.getSubLevel(); _id3 = skill.getSubLevel();
_reuse = reuse; _reuse = reuse;
_stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0; _stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0;
_group = -1; _group = skill.getReuseDelayGroup();
} }
/** /**

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

@@ -50,10 +50,13 @@ public class SkillCoolTime extends ServerPacket
writeInt(_reuseTimestamps.size()); writeInt(_reuseTimestamps.size());
for (TimeStamp ts : _reuseTimestamps) for (TimeStamp ts : _reuseTimestamps)
{ {
writeInt(ts.getSkillId()); final long reuse = ts.getReuse();
final long remaining = ts.getRemaining();
final int sharedReuseGroup = ts.getSharedReuseGroup();
writeInt(sharedReuseGroup > 0 ? sharedReuseGroup : ts.getSkillId());
writeInt(ts.getSkillLevel()); writeInt(ts.getSkillLevel());
writeInt((int) ts.getReuse() / 1000); writeInt((int) (reuse > 0 ? reuse : remaining) / 1000);
writeInt((int) ts.getRemaining() / 1000); writeInt((int) remaining / 1000);
} }
} }
} }

2
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/TimeStamp.java
View File

@@ -53,7 +53,7 @@ public class TimeStamp
_id3 = skill.getSubLevel(); _id3 = skill.getSubLevel();
_reuse = reuse; _reuse = reuse;
_stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0; _stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0;
_group = -1; _group = skill.getReuseDelayGroup();
} }
/** /**

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

@@ -50,10 +50,13 @@ public class SkillCoolTime extends ServerPacket
writeInt(_reuseTimestamps.size()); writeInt(_reuseTimestamps.size());
for (TimeStamp ts : _reuseTimestamps) for (TimeStamp ts : _reuseTimestamps)
{ {
writeInt(ts.getSkillId()); final long reuse = ts.getReuse();
final long remaining = ts.getRemaining();
final int sharedReuseGroup = ts.getSharedReuseGroup();
writeInt(sharedReuseGroup > 0 ? sharedReuseGroup : ts.getSkillId());
writeInt(ts.getSkillLevel()); writeInt(ts.getSkillLevel());
writeInt((int) ts.getReuse() / 1000); writeInt((int) (reuse > 0 ? reuse : remaining) / 1000);
writeInt((int) ts.getRemaining() / 1000); writeInt((int) remaining / 1000);
} }
} }
} }

2
L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/TimeStamp.java
View File

@@ -53,7 +53,7 @@ public class TimeStamp
_id3 = skill.getSubLevel(); _id3 = skill.getSubLevel();
_reuse = reuse; _reuse = reuse;
_stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0; _stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0;
_group = -1; _group = skill.getReuseDelayGroup();
} }
/** /**

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

@@ -50,10 +50,13 @@ public class SkillCoolTime extends ServerPacket
writeInt(_reuseTimestamps.size()); writeInt(_reuseTimestamps.size());
for (TimeStamp ts : _reuseTimestamps) for (TimeStamp ts : _reuseTimestamps)
{ {
writeInt(ts.getSkillId()); final long reuse = ts.getReuse();
final long remaining = ts.getRemaining();
final int sharedReuseGroup = ts.getSharedReuseGroup();
writeInt(sharedReuseGroup > 0 ? sharedReuseGroup : ts.getSkillId());
writeInt(ts.getSkillLevel()); writeInt(ts.getSkillLevel());
writeInt((int) ts.getReuse() / 1000); writeInt((int) (reuse > 0 ? reuse : remaining) / 1000);
writeInt((int) ts.getRemaining() / 1000); writeInt((int) remaining / 1000);
} }
} }
} }

2
L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/TimeStamp.java
View File

@@ -53,7 +53,7 @@ public class TimeStamp
_id3 = skill.getSubLevel(); _id3 = skill.getSubLevel();
_reuse = reuse; _reuse = reuse;
_stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0; _stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0;
_group = -1; _group = skill.getReuseDelayGroup();
} }
/** /**

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

@@ -50,10 +50,13 @@ public class SkillCoolTime extends ServerPacket
writeInt(_reuseTimestamps.size()); writeInt(_reuseTimestamps.size());
for (TimeStamp ts : _reuseTimestamps) for (TimeStamp ts : _reuseTimestamps)
{ {
writeInt(ts.getSkillId()); final long reuse = ts.getReuse();
final long remaining = ts.getRemaining();
final int sharedReuseGroup = ts.getSharedReuseGroup();
writeInt(sharedReuseGroup > 0 ? sharedReuseGroup : ts.getSkillId());
writeInt(ts.getSkillLevel()); writeInt(ts.getSkillLevel());
writeInt((int) ts.getReuse() / 1000); writeInt((int) (reuse > 0 ? reuse : remaining) / 1000);
writeInt((int) ts.getRemaining() / 1000); writeInt((int) remaining / 1000);
} }
} }
} }

2
L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/TimeStamp.java
View File

@@ -53,7 +53,7 @@ public class TimeStamp
_id3 = skill.getSubLevel(); _id3 = skill.getSubLevel();
_reuse = reuse; _reuse = reuse;
_stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0; _stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0;
_group = -1; _group = skill.getReuseDelayGroup();
} }
/** /**

9
L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java
View File

@@ -50,10 +50,13 @@ public class SkillCoolTime extends ServerPacket
writeInt(_reuseTimestamps.size()); writeInt(_reuseTimestamps.size());
for (TimeStamp ts : _reuseTimestamps) for (TimeStamp ts : _reuseTimestamps)
{ {
writeInt(ts.getSkillId()); final long reuse = ts.getReuse();
final long remaining = ts.getRemaining();
final int sharedReuseGroup = ts.getSharedReuseGroup();
writeInt(sharedReuseGroup > 0 ? sharedReuseGroup : ts.getSkillId());
writeInt(ts.getSkillLevel()); writeInt(ts.getSkillLevel());
writeInt((int) ts.getReuse() / 1000); writeInt((int) (reuse > 0 ? reuse : remaining) / 1000);
writeInt((int) ts.getRemaining() / 1000); writeInt((int) remaining / 1000);
} }
} }
} }

2
L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/TimeStamp.java
View File

@@ -53,7 +53,7 @@ public class TimeStamp
_id3 = skill.getSubLevel(); _id3 = skill.getSubLevel();
_reuse = reuse; _reuse = reuse;
_stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0; _stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0;
_group = -1; _group = skill.getReuseDelayGroup();
} }
/** /**

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

@@ -50,10 +50,13 @@ public class SkillCoolTime extends ServerPacket
writeInt(_reuseTimestamps.size()); writeInt(_reuseTimestamps.size());
for (TimeStamp ts : _reuseTimestamps) for (TimeStamp ts : _reuseTimestamps)
{ {
writeInt(ts.getSkillId()); final long reuse = ts.getReuse();
final long remaining = ts.getRemaining();
final int sharedReuseGroup = ts.getSharedReuseGroup();
writeInt(sharedReuseGroup > 0 ? sharedReuseGroup : ts.getSkillId());
writeInt(ts.getSkillLevel()); writeInt(ts.getSkillLevel());
writeInt((int) ts.getReuse() / 1000); writeInt((int) (reuse > 0 ? reuse : remaining) / 1000);
writeInt((int) ts.getRemaining() / 1000); writeInt((int) remaining / 1000);
} }
} }
} }

2
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/TimeStamp.java
View File

@@ -53,7 +53,7 @@ public class TimeStamp
_id3 = skill.getSubLevel(); _id3 = skill.getSubLevel();
_reuse = reuse; _reuse = reuse;
_stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0; _stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0;
_group = -1; _group = skill.getReuseDelayGroup();
} }
/** /**

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

@@ -50,10 +50,13 @@ public class SkillCoolTime extends ServerPacket
writeInt(_reuseTimestamps.size()); writeInt(_reuseTimestamps.size());
for (TimeStamp ts : _reuseTimestamps) for (TimeStamp ts : _reuseTimestamps)
{ {
writeInt(ts.getSkillId()); final long reuse = ts.getReuse();
final long remaining = ts.getRemaining();
final int sharedReuseGroup = ts.getSharedReuseGroup();
writeInt(sharedReuseGroup > 0 ? sharedReuseGroup : ts.getSkillId());
writeInt(ts.getSkillLevel()); writeInt(ts.getSkillLevel());
writeInt((int) ts.getReuse() / 1000); writeInt((int) (reuse > 0 ? reuse : remaining) / 1000);
writeInt((int) ts.getRemaining() / 1000); writeInt((int) remaining / 1000);
} }
} }
} }

2
L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/TimeStamp.java
View File

@@ -53,7 +53,7 @@ public class TimeStamp
_id3 = skill.getSubLevel(); _id3 = skill.getSubLevel();
_reuse = reuse; _reuse = reuse;
_stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0; _stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0;
_group = -1; _group = skill.getReuseDelayGroup();
} }
/** /**

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

@@ -50,10 +50,13 @@ public class SkillCoolTime extends ServerPacket
writeInt(_reuseTimestamps.size()); writeInt(_reuseTimestamps.size());
for (TimeStamp ts : _reuseTimestamps) for (TimeStamp ts : _reuseTimestamps)
{ {
writeInt(ts.getSkillId()); final long reuse = ts.getReuse();
final long remaining = ts.getRemaining();
final int sharedReuseGroup = ts.getSharedReuseGroup();
writeInt(sharedReuseGroup > 0 ? sharedReuseGroup : ts.getSkillId());
writeInt(ts.getSkillLevel()); writeInt(ts.getSkillLevel());
writeInt((int) ts.getReuse() / 1000); writeInt((int) (reuse > 0 ? reuse : remaining) / 1000);
writeInt((int) ts.getRemaining() / 1000); writeInt((int) remaining / 1000);
} }
} }
} }

2
L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/TimeStamp.java
View File

@@ -53,7 +53,7 @@ public class TimeStamp
_id3 = skill.getSubLevel(); _id3 = skill.getSubLevel();
_reuse = reuse; _reuse = reuse;
_stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0; _stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0;
_group = -1; _group = skill.getReuseDelayGroup();
} }
/** /**

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

@@ -50,10 +50,13 @@ public class SkillCoolTime extends ServerPacket
writeInt(_reuseTimestamps.size()); writeInt(_reuseTimestamps.size());
for (TimeStamp ts : _reuseTimestamps) for (TimeStamp ts : _reuseTimestamps)
{ {
writeInt(ts.getSkillId()); final long reuse = ts.getReuse();
final long remaining = ts.getRemaining();
final int sharedReuseGroup = ts.getSharedReuseGroup();
writeInt(sharedReuseGroup > 0 ? sharedReuseGroup : ts.getSkillId());
writeInt(ts.getSkillLevel()); writeInt(ts.getSkillLevel());
writeInt((int) ts.getReuse() / 1000); writeInt((int) (reuse > 0 ? reuse : remaining) / 1000);
writeInt((int) ts.getRemaining() / 1000); writeInt((int) remaining / 1000);
} }
} }
} }

2
L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/TimeStamp.java
View File

@@ -53,7 +53,7 @@ public class TimeStamp
_id3 = skill.getSubLevel(); _id3 = skill.getSubLevel();
_reuse = reuse; _reuse = reuse;
_stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0; _stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0;
_group = -1; _group = skill.getReuseDelayGroup();
} }
/** /**

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

@@ -50,10 +50,13 @@ public class SkillCoolTime extends ServerPacket
writeInt(_reuseTimestamps.size()); writeInt(_reuseTimestamps.size());
for (TimeStamp ts : _reuseTimestamps) for (TimeStamp ts : _reuseTimestamps)
{ {
writeInt(ts.getSkillId()); final long reuse = ts.getReuse();
final long remaining = ts.getRemaining();
final int sharedReuseGroup = ts.getSharedReuseGroup();
writeInt(sharedReuseGroup > 0 ? sharedReuseGroup : ts.getSkillId());
writeInt(ts.getSkillLevel()); writeInt(ts.getSkillLevel());
writeInt((int) ts.getReuse() / 1000); writeInt((int) (reuse > 0 ? reuse : remaining) / 1000);
writeInt((int) ts.getRemaining() / 1000); writeInt((int) remaining / 1000);
} }
} }
} }

2
L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/TimeStamp.java
View File

@@ -53,7 +53,7 @@ public class TimeStamp
_id3 = skill.getSubLevel(); _id3 = skill.getSubLevel();
_reuse = reuse; _reuse = reuse;
_stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0; _stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0;
_group = -1; _group = skill.getReuseDelayGroup();
} }
/** /**

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

@@ -50,10 +50,13 @@ public class SkillCoolTime extends ServerPacket
writeInt(_reuseTimestamps.size()); writeInt(_reuseTimestamps.size());
for (TimeStamp ts : _reuseTimestamps) for (TimeStamp ts : _reuseTimestamps)
{ {
writeInt(ts.getSkillId()); final long reuse = ts.getReuse();
final long remaining = ts.getRemaining();
final int sharedReuseGroup = ts.getSharedReuseGroup();
writeInt(sharedReuseGroup > 0 ? sharedReuseGroup : ts.getSkillId());
writeInt(ts.getSkillLevel()); writeInt(ts.getSkillLevel());
writeInt((int) ts.getReuse() / 1000); writeInt((int) (reuse > 0 ? reuse : remaining) / 1000);
writeInt((int) ts.getRemaining() / 1000); writeInt((int) remaining / 1000);
} }
} }
} }

2
L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/TimeStamp.java
View File

@@ -53,7 +53,7 @@ public class TimeStamp
_id3 = skill.getSubLevel(); _id3 = skill.getSubLevel();
_reuse = reuse; _reuse = reuse;
_stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0; _stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0;
_group = -1; _group = skill.getReuseDelayGroup();
} }
/** /**

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

@@ -50,10 +50,13 @@ public class SkillCoolTime extends ServerPacket
writeInt(_reuseTimestamps.size()); writeInt(_reuseTimestamps.size());
for (TimeStamp ts : _reuseTimestamps) for (TimeStamp ts : _reuseTimestamps)
{ {
writeInt(ts.getSkillId()); final long reuse = ts.getReuse();
final long remaining = ts.getRemaining();
final int sharedReuseGroup = ts.getSharedReuseGroup();
writeInt(sharedReuseGroup > 0 ? sharedReuseGroup : ts.getSkillId());
writeInt(ts.getSkillLevel()); writeInt(ts.getSkillLevel());
writeInt((int) ts.getReuse() / 1000); writeInt((int) (reuse > 0 ? reuse : remaining) / 1000);
writeInt((int) ts.getRemaining() / 1000); writeInt((int) remaining / 1000);
} }
} }
} }

2
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/TimeStamp.java
View File

@@ -53,7 +53,7 @@ public class TimeStamp
_id3 = skill.getSubLevel(); _id3 = skill.getSubLevel();
_reuse = reuse; _reuse = reuse;
_stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0; _stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0;
_group = -1; _group = skill.getReuseDelayGroup();
} }
/** /**

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

@@ -50,10 +50,13 @@ public class SkillCoolTime extends ServerPacket
writeInt(_reuseTimestamps.size()); writeInt(_reuseTimestamps.size());
for (TimeStamp ts : _reuseTimestamps) for (TimeStamp ts : _reuseTimestamps)
{ {
writeInt(ts.getSkillId()); final long reuse = ts.getReuse();
final long remaining = ts.getRemaining();
final int sharedReuseGroup = ts.getSharedReuseGroup();
writeInt(sharedReuseGroup > 0 ? sharedReuseGroup : ts.getSkillId());
writeInt(ts.getSkillLevel()); writeInt(ts.getSkillLevel());
writeInt((int) ts.getReuse() / 1000); writeInt((int) (reuse > 0 ? reuse : remaining) / 1000);
writeInt((int) ts.getRemaining() / 1000); writeInt((int) remaining / 1000);
} }
} }
} }

2
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/TimeStamp.java
View File

@@ -53,7 +53,7 @@ public class TimeStamp
_id3 = skill.getSubLevel(); _id3 = skill.getSubLevel();
_reuse = reuse; _reuse = reuse;
_stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0; _stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0;
_group = -1; _group = skill.getReuseDelayGroup();
} }
/** /**

9
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java
View File

@@ -50,10 +50,13 @@ public class SkillCoolTime extends ServerPacket
writeInt(_reuseTimestamps.size()); writeInt(_reuseTimestamps.size());
for (TimeStamp ts : _reuseTimestamps) for (TimeStamp ts : _reuseTimestamps)
{ {
writeInt(ts.getSkillId()); final long reuse = ts.getReuse();
final long remaining = ts.getRemaining();
final int sharedReuseGroup = ts.getSharedReuseGroup();
writeInt(sharedReuseGroup > 0 ? sharedReuseGroup : ts.getSkillId());
writeInt(ts.getSkillLevel()); writeInt(ts.getSkillLevel());
writeInt((int) ts.getReuse() / 1000); writeInt((int) (reuse > 0 ? reuse : remaining) / 1000);
writeInt((int) ts.getRemaining() / 1000); writeInt((int) remaining / 1000);
} }
} }
} }

2
L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/TimeStamp.java
View File

@@ -53,7 +53,7 @@ public class TimeStamp
_id3 = skill.getSubLevel(); _id3 = skill.getSubLevel();
_reuse = reuse; _reuse = reuse;
_stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0; _stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0;
_group = -1; _group = skill.getReuseDelayGroup();
} }
/** /**

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

@@ -50,10 +50,13 @@ public class SkillCoolTime extends ServerPacket
writeInt(_reuseTimestamps.size()); writeInt(_reuseTimestamps.size());
for (TimeStamp ts : _reuseTimestamps) for (TimeStamp ts : _reuseTimestamps)
{ {
writeInt(ts.getSkillId()); final long reuse = ts.getReuse();
final long remaining = ts.getRemaining();
final int sharedReuseGroup = ts.getSharedReuseGroup();
writeInt(sharedReuseGroup > 0 ? sharedReuseGroup : ts.getSkillId());
writeInt(ts.getSkillLevel()); writeInt(ts.getSkillLevel());
writeInt((int) ts.getReuse() / 1000); writeInt((int) (reuse > 0 ? reuse : remaining) / 1000);
writeInt((int) ts.getRemaining() / 1000); writeInt((int) remaining / 1000);
} }
} }
} }

2
L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/TimeStamp.java
View File

@@ -53,7 +53,7 @@ public class TimeStamp
_id3 = skill.getSubLevel(); _id3 = skill.getSubLevel();
_reuse = reuse; _reuse = reuse;
_stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0; _stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0;
_group = -1; _group = skill.getReuseDelayGroup();
} }
/** /**

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

@@ -50,10 +50,13 @@ public class SkillCoolTime extends ServerPacket
writeInt(_reuseTimestamps.size()); writeInt(_reuseTimestamps.size());
for (TimeStamp ts : _reuseTimestamps) for (TimeStamp ts : _reuseTimestamps)
{ {
writeInt(ts.getSkillId()); final long reuse = ts.getReuse();
final long remaining = ts.getRemaining();
final int sharedReuseGroup = ts.getSharedReuseGroup();
writeInt(sharedReuseGroup > 0 ? sharedReuseGroup : ts.getSkillId());
writeInt(ts.getSkillLevel()); writeInt(ts.getSkillLevel());
writeInt((int) ts.getReuse() / 1000); writeInt((int) (reuse > 0 ? reuse : remaining) / 1000);
writeInt((int) ts.getRemaining() / 1000); writeInt((int) remaining / 1000);
} }
} }
} }

2
L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/TimeStamp.java
View File

@@ -53,7 +53,7 @@ public class TimeStamp
_id3 = skill.getSubLevel(); _id3 = skill.getSubLevel();
_reuse = reuse; _reuse = reuse;
_stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0; _stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0;
_group = -1; _group = skill.getReuseDelayGroup();
} }
/** /**

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

@@ -50,10 +50,13 @@ public class SkillCoolTime extends ServerPacket
writeInt(_reuseTimestamps.size()); writeInt(_reuseTimestamps.size());
for (TimeStamp ts : _reuseTimestamps) for (TimeStamp ts : _reuseTimestamps)
{ {
writeInt(ts.getSkillId()); final long reuse = ts.getReuse();
final long remaining = ts.getRemaining();
final int sharedReuseGroup = ts.getSharedReuseGroup();
writeInt(sharedReuseGroup > 0 ? sharedReuseGroup : ts.getSkillId());
writeInt(ts.getSkillLevel()); writeInt(ts.getSkillLevel());
writeInt((int) ts.getReuse() / 1000); writeInt((int) (reuse > 0 ? reuse : remaining) / 1000);
writeInt((int) ts.getRemaining() / 1000); writeInt((int) remaining / 1000);
} }
} }
} }

2
L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/TimeStamp.java
View File

@@ -53,7 +53,7 @@ public class TimeStamp
_id3 = skill.getSubLevel(); _id3 = skill.getSubLevel();
_reuse = reuse; _reuse = reuse;
_stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0; _stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0;
_group = -1; _group = skill.getReuseDelayGroup();
} }
/** /**

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

@@ -50,10 +50,13 @@ public class SkillCoolTime extends ServerPacket
writeInt(_reuseTimestamps.size()); writeInt(_reuseTimestamps.size());
for (TimeStamp ts : _reuseTimestamps) for (TimeStamp ts : _reuseTimestamps)
{ {
writeInt(ts.getSkillId()); final long reuse = ts.getReuse();
final long remaining = ts.getRemaining();
final int sharedReuseGroup = ts.getSharedReuseGroup();
writeInt(sharedReuseGroup > 0 ? sharedReuseGroup : ts.getSkillId());
writeInt(ts.getSkillLevel()); writeInt(ts.getSkillLevel());
writeInt((int) ts.getReuse() / 1000); writeInt((int) (reuse > 0 ? reuse : remaining) / 1000);
writeInt((int) ts.getRemaining() / 1000); writeInt((int) remaining / 1000);
} }
} }
} }