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

Proper fix for henna duration display.

Browse Source
This commit is contained in:
MobiusDevelopment
2019-05-01 16:31:41 +00:00
parent de41d03599
commit 04ed73da50
7 changed files with 91 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java
View File

@@ -66,11 +66,20 @@ public final class HennaInfo implements IClientOutgoingPacket
packet.writeD(henna.getDyeId()); packet.writeD(henna.getDyeId());
packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00);
} }
if (_player.getHenna(4) != null)
final Henna premium = _player.getHenna(4);
if (premium != null)
{ {
packet.writeD(_player.getHenna(4).getDyeId()); int duration = premium.getDuration();
packet.writeD(_player.getHenna(4).getDuration()); // Premium Slot Dye Time Left if (duration > 0)
packet.writeD(_player.getHenna(4).isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); {
final long currentTime = System.currentTimeMillis();
duration = (int) Math.max(0, _player.getVariables().getLong("HennaDuration4", currentTime) - currentTime) / 1000;
}
packet.writeD(premium.getDyeId());
packet.writeD(duration); // Premium Slot Dye Time Left
packet.writeD(premium.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00);
} }
else else
{ {

17
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java
View File

@@ -66,11 +66,20 @@ public final class HennaInfo implements IClientOutgoingPacket
packet.writeD(henna.getDyeId()); packet.writeD(henna.getDyeId());
packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00);
} }
if (_player.getHenna(4) != null)
final Henna premium = _player.getHenna(4);
if (premium != null)
{ {
packet.writeD(_player.getHenna(4).getDyeId()); int duration = premium.getDuration();
packet.writeD(_player.getHenna(4).getDuration()); // Premium Slot Dye Time Left if (duration > 0)
packet.writeD(_player.getHenna(4).isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); {
final long currentTime = System.currentTimeMillis();
duration = (int) Math.max(0, _player.getVariables().getLong("HennaDuration4", currentTime) - currentTime) / 1000;
}
packet.writeD(premium.getDyeId());
packet.writeD(duration); // Premium Slot Dye Time Left
packet.writeD(premium.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00);
} }
else else
{ {

17
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java
View File

@@ -66,11 +66,20 @@ public final class HennaInfo implements IClientOutgoingPacket
packet.writeD(henna.getDyeId()); packet.writeD(henna.getDyeId());
packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00);
} }
if (_player.getHenna(4) != null)
final Henna premium = _player.getHenna(4);
if (premium != null)
{ {
packet.writeD(_player.getHenna(4).getDyeId()); int duration = premium.getDuration();
packet.writeD(_player.getHenna(4).getDuration()); // Premium Slot Dye Time Left if (duration > 0)
packet.writeD(_player.getHenna(4).isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); {
final long currentTime = System.currentTimeMillis();
duration = (int) Math.max(0, _player.getVariables().getLong("HennaDuration4", currentTime) - currentTime) / 1000;
}
packet.writeD(premium.getDyeId());
packet.writeD(duration); // Premium Slot Dye Time Left
packet.writeD(premium.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00);
} }
else else
{ {

17
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java
View File

@@ -66,11 +66,20 @@ public final class HennaInfo implements IClientOutgoingPacket
packet.writeD(henna.getDyeId()); packet.writeD(henna.getDyeId());
packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00);
} }
if (_player.getHenna(4) != null)
final Henna premium = _player.getHenna(4);
if (premium != null)
{ {
packet.writeD(_player.getHenna(4).getDyeId()); int duration = premium.getDuration();
packet.writeD(_player.getHenna(4).getDuration()); // Premium Slot Dye Time Left if (duration > 0)
packet.writeD(_player.getHenna(4).isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); {
final long currentTime = System.currentTimeMillis();
duration = (int) Math.max(0, _player.getVariables().getLong("HennaDuration4", currentTime) - currentTime) / 1000;
}
packet.writeD(premium.getDyeId());
packet.writeD(duration); // Premium Slot Dye Time Left
packet.writeD(premium.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00);
} }
else else
{ {

17
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java
View File

@@ -66,11 +66,20 @@ public final class HennaInfo implements IClientOutgoingPacket
packet.writeD(henna.getDyeId()); packet.writeD(henna.getDyeId());
packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00);
} }
if (_player.getHenna(4) != null)
final Henna premium = _player.getHenna(4);
if (premium != null)
{ {
packet.writeD(_player.getHenna(4).getDyeId()); int duration = premium.getDuration();
packet.writeD(_player.getHenna(4).getDuration()); // Premium Slot Dye Time Left if (duration > 0)
packet.writeD(_player.getHenna(4).isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); {
final long currentTime = System.currentTimeMillis();
duration = (int) Math.max(0, _player.getVariables().getLong("HennaDuration4", currentTime) - currentTime) / 1000;
}
packet.writeD(premium.getDyeId());
packet.writeD(duration); // Premium Slot Dye Time Left
packet.writeD(premium.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00);
} }
else else
{ {

17
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java
View File

@@ -66,11 +66,20 @@ public final class HennaInfo implements IClientOutgoingPacket
packet.writeD(henna.getDyeId()); packet.writeD(henna.getDyeId());
packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00);
} }
if (_player.getHenna(4) != null)
final Henna premium = _player.getHenna(4);
if (premium != null)
{ {
packet.writeD(_player.getHenna(4).getDyeId()); int duration = premium.getDuration();
packet.writeD(_player.getHenna(4).getDuration()); // Premium Slot Dye Time Left if (duration > 0)
packet.writeD(_player.getHenna(4).isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); {
final long currentTime = System.currentTimeMillis();
duration = (int) Math.max(0, _player.getVariables().getLong("HennaDuration4", currentTime) - currentTime) / 1000;
}
packet.writeD(premium.getDyeId());
packet.writeD(duration); // Premium Slot Dye Time Left
packet.writeD(premium.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00);
} }
else else
{ {

17
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java
View File

@@ -66,11 +66,20 @@ public final class HennaInfo implements IClientOutgoingPacket
packet.writeD(henna.getDyeId()); packet.writeD(henna.getDyeId());
packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00);
} }
if (_player.getHenna(4) != null)
final Henna premium = _player.getHenna(4);
if (premium != null)
{ {
packet.writeD(_player.getHenna(4).getDyeId()); int duration = premium.getDuration();
packet.writeD(_player.getHenna(4).getDuration()); // Premium Slot Dye Time Left if (duration > 0)
packet.writeD(_player.getHenna(4).isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); {
final long currentTime = System.currentTimeMillis();
duration = (int) Math.max(0, _player.getVariables().getLong("HennaDuration4", currentTime) - currentTime) / 1000;
}
packet.writeD(premium.getDyeId());
packet.writeD(duration); // Premium Slot Dye Time Left
packet.writeD(premium.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00);
} }
else else
{ {