From a65d9c073f01d0e4f422e1103c2ad6b2349ba61e Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Mon, 29 Aug 2022 13:45:19 +0000 Subject: [PATCH] Tempfix for AddHuntingTime time display. --- .../scripts/handlers/effecthandlers/AddHuntingTime.java | 8 ++++++-- .../scripts/handlers/effecthandlers/AddHuntingTime.java | 8 ++++++-- .../scripts/handlers/effecthandlers/AddHuntingTime.java | 8 ++++++-- .../scripts/handlers/effecthandlers/AddHuntingTime.java | 8 ++++++-- .../scripts/handlers/effecthandlers/AddHuntingTime.java | 8 ++++++-- .../scripts/handlers/effecthandlers/AddHuntingTime.java | 8 ++++++-- .../scripts/handlers/effecthandlers/AddHuntingTime.java | 8 ++++++-- .../scripts/handlers/effecthandlers/AddHuntingTime.java | 8 ++++++-- 8 files changed, 48 insertions(+), 16 deletions(-) diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java index 6270963bd2..c5ea04177c 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java @@ -25,8 +25,9 @@ import org.l2jmobius.gameserver.model.holders.TimedHuntingZoneHolder; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.variables.PlayerVariables; -import org.l2jmobius.gameserver.network.serverpackets.huntingzones.TimedHuntingZoneChargeResult; +import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; import org.l2jmobius.gameserver.network.serverpackets.huntingzones.TimedHuntingZoneEnter; +import org.l2jmobius.gameserver.network.serverpackets.huntingzones.TimedHuntingZoneList; /** * @author Mobius @@ -90,6 +91,9 @@ public class AddHuntingTime extends AbstractEffect player.sendPacket(new TimedHuntingZoneEnter(player, _zoneId)); } - player.sendPacket(new TimedHuntingZoneChargeResult(_zoneId, (int) (remainTime / 1000), (int) (remainRefill - (_time / 1000)))); + player.sendPacket(new TimedHuntingZoneList(player)); + + // TODO: TimedHuntingZoneChargeResult + player.sendPacket(new ExShowScreenMessage("Time of adventure in the " + holder.getZoneName() + " area is extended for " + (_time / 60 / 1000) + " min.", 10000)); } } diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java index 6270963bd2..c5ea04177c 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java @@ -25,8 +25,9 @@ import org.l2jmobius.gameserver.model.holders.TimedHuntingZoneHolder; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.variables.PlayerVariables; -import org.l2jmobius.gameserver.network.serverpackets.huntingzones.TimedHuntingZoneChargeResult; +import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; import org.l2jmobius.gameserver.network.serverpackets.huntingzones.TimedHuntingZoneEnter; +import org.l2jmobius.gameserver.network.serverpackets.huntingzones.TimedHuntingZoneList; /** * @author Mobius @@ -90,6 +91,9 @@ public class AddHuntingTime extends AbstractEffect player.sendPacket(new TimedHuntingZoneEnter(player, _zoneId)); } - player.sendPacket(new TimedHuntingZoneChargeResult(_zoneId, (int) (remainTime / 1000), (int) (remainRefill - (_time / 1000)))); + player.sendPacket(new TimedHuntingZoneList(player)); + + // TODO: TimedHuntingZoneChargeResult + player.sendPacket(new ExShowScreenMessage("Time of adventure in the " + holder.getZoneName() + " area is extended for " + (_time / 60 / 1000) + " min.", 10000)); } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java index 6270963bd2..c5ea04177c 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java @@ -25,8 +25,9 @@ import org.l2jmobius.gameserver.model.holders.TimedHuntingZoneHolder; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.variables.PlayerVariables; -import org.l2jmobius.gameserver.network.serverpackets.huntingzones.TimedHuntingZoneChargeResult; +import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; import org.l2jmobius.gameserver.network.serverpackets.huntingzones.TimedHuntingZoneEnter; +import org.l2jmobius.gameserver.network.serverpackets.huntingzones.TimedHuntingZoneList; /** * @author Mobius @@ -90,6 +91,9 @@ public class AddHuntingTime extends AbstractEffect player.sendPacket(new TimedHuntingZoneEnter(player, _zoneId)); } - player.sendPacket(new TimedHuntingZoneChargeResult(_zoneId, (int) (remainTime / 1000), (int) (remainRefill - (_time / 1000)))); + player.sendPacket(new TimedHuntingZoneList(player)); + + // TODO: TimedHuntingZoneChargeResult + player.sendPacket(new ExShowScreenMessage("Time of adventure in the " + holder.getZoneName() + " area is extended for " + (_time / 60 / 1000) + " min.", 10000)); } } diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java index 6270963bd2..c5ea04177c 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java @@ -25,8 +25,9 @@ import org.l2jmobius.gameserver.model.holders.TimedHuntingZoneHolder; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.variables.PlayerVariables; -import org.l2jmobius.gameserver.network.serverpackets.huntingzones.TimedHuntingZoneChargeResult; +import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; import org.l2jmobius.gameserver.network.serverpackets.huntingzones.TimedHuntingZoneEnter; +import org.l2jmobius.gameserver.network.serverpackets.huntingzones.TimedHuntingZoneList; /** * @author Mobius @@ -90,6 +91,9 @@ public class AddHuntingTime extends AbstractEffect player.sendPacket(new TimedHuntingZoneEnter(player, _zoneId)); } - player.sendPacket(new TimedHuntingZoneChargeResult(_zoneId, (int) (remainTime / 1000), (int) (remainRefill - (_time / 1000)))); + player.sendPacket(new TimedHuntingZoneList(player)); + + // TODO: TimedHuntingZoneChargeResult + player.sendPacket(new ExShowScreenMessage("Time of adventure in the " + holder.getZoneName() + " area is extended for " + (_time / 60 / 1000) + " min.", 10000)); } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java index 6270963bd2..c5ea04177c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java @@ -25,8 +25,9 @@ import org.l2jmobius.gameserver.model.holders.TimedHuntingZoneHolder; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.variables.PlayerVariables; -import org.l2jmobius.gameserver.network.serverpackets.huntingzones.TimedHuntingZoneChargeResult; +import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; import org.l2jmobius.gameserver.network.serverpackets.huntingzones.TimedHuntingZoneEnter; +import org.l2jmobius.gameserver.network.serverpackets.huntingzones.TimedHuntingZoneList; /** * @author Mobius @@ -90,6 +91,9 @@ public class AddHuntingTime extends AbstractEffect player.sendPacket(new TimedHuntingZoneEnter(player, _zoneId)); } - player.sendPacket(new TimedHuntingZoneChargeResult(_zoneId, (int) (remainTime / 1000), (int) (remainRefill - (_time / 1000)))); + player.sendPacket(new TimedHuntingZoneList(player)); + + // TODO: TimedHuntingZoneChargeResult + player.sendPacket(new ExShowScreenMessage("Time of adventure in the " + holder.getZoneName() + " area is extended for " + (_time / 60 / 1000) + " min.", 10000)); } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java index 6270963bd2..c5ea04177c 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java @@ -25,8 +25,9 @@ import org.l2jmobius.gameserver.model.holders.TimedHuntingZoneHolder; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.variables.PlayerVariables; -import org.l2jmobius.gameserver.network.serverpackets.huntingzones.TimedHuntingZoneChargeResult; +import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; import org.l2jmobius.gameserver.network.serverpackets.huntingzones.TimedHuntingZoneEnter; +import org.l2jmobius.gameserver.network.serverpackets.huntingzones.TimedHuntingZoneList; /** * @author Mobius @@ -90,6 +91,9 @@ public class AddHuntingTime extends AbstractEffect player.sendPacket(new TimedHuntingZoneEnter(player, _zoneId)); } - player.sendPacket(new TimedHuntingZoneChargeResult(_zoneId, (int) (remainTime / 1000), (int) (remainRefill - (_time / 1000)))); + player.sendPacket(new TimedHuntingZoneList(player)); + + // TODO: TimedHuntingZoneChargeResult + player.sendPacket(new ExShowScreenMessage("Time of adventure in the " + holder.getZoneName() + " area is extended for " + (_time / 60 / 1000) + " min.", 10000)); } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java index 6270963bd2..c5ea04177c 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java @@ -25,8 +25,9 @@ import org.l2jmobius.gameserver.model.holders.TimedHuntingZoneHolder; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.variables.PlayerVariables; -import org.l2jmobius.gameserver.network.serverpackets.huntingzones.TimedHuntingZoneChargeResult; +import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; import org.l2jmobius.gameserver.network.serverpackets.huntingzones.TimedHuntingZoneEnter; +import org.l2jmobius.gameserver.network.serverpackets.huntingzones.TimedHuntingZoneList; /** * @author Mobius @@ -90,6 +91,9 @@ public class AddHuntingTime extends AbstractEffect player.sendPacket(new TimedHuntingZoneEnter(player, _zoneId)); } - player.sendPacket(new TimedHuntingZoneChargeResult(_zoneId, (int) (remainTime / 1000), (int) (remainRefill - (_time / 1000)))); + player.sendPacket(new TimedHuntingZoneList(player)); + + // TODO: TimedHuntingZoneChargeResult + player.sendPacket(new ExShowScreenMessage("Time of adventure in the " + holder.getZoneName() + " area is extended for " + (_time / 60 / 1000) + " min.", 10000)); } } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java index 6270963bd2..c5ea04177c 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java @@ -25,8 +25,9 @@ import org.l2jmobius.gameserver.model.holders.TimedHuntingZoneHolder; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.variables.PlayerVariables; -import org.l2jmobius.gameserver.network.serverpackets.huntingzones.TimedHuntingZoneChargeResult; +import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; import org.l2jmobius.gameserver.network.serverpackets.huntingzones.TimedHuntingZoneEnter; +import org.l2jmobius.gameserver.network.serverpackets.huntingzones.TimedHuntingZoneList; /** * @author Mobius @@ -90,6 +91,9 @@ public class AddHuntingTime extends AbstractEffect player.sendPacket(new TimedHuntingZoneEnter(player, _zoneId)); } - player.sendPacket(new TimedHuntingZoneChargeResult(_zoneId, (int) (remainTime / 1000), (int) (remainRefill - (_time / 1000)))); + player.sendPacket(new TimedHuntingZoneList(player)); + + // TODO: TimedHuntingZoneChargeResult + player.sendPacket(new ExShowScreenMessage("Time of adventure in the " + holder.getZoneName() + " area is extended for " + (_time / 60 / 1000) + " min.", 10000)); } }